Skip to content

Commit 8c020fb

Browse files
ehsannasehsannas
committed
Fix formatting.
1 parent 06dfc73 commit 8c020fb

File tree

2 files changed

+48
-82
lines changed

2 files changed

+48
-82
lines changed

‎firebase-firestore/src/main/java/com/google/firebase/firestore/util/LogicUtils.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import com.google.firebase.firestore.core.FieldFilter;
2121
import com.google.firebase.firestore.core.Filter;
2222
import com.google.firebase.firestore.core.InFilter;
23-
import com.google.firestore.v1.ArrayValue;
2423
import com.google.firestore.v1.Value;
25-
2624
import java.util.ArrayList;
2725
import java.util.Arrays;
2826
import java.util.Collections;
@@ -291,20 +289,22 @@ protected static Filter computeDistributedNormalForm(Filter filter) {
291289
}
292290

293291
/**
294-
* The `in` filter is only a syntactic sugar over a disjunction of equalities. For instance:
295-
* `a in [1,2,3]` is in fact `a==1 || a==2 || a==3`. This method expands any `in` filter in the
296-
* given input into a disjunction of equality filters and returns the expanded filter.
292+
* The `in` filter is only a syntactic sugar over a disjunction of equalities. For instance: `a in
293+
* [1,2,3]` is in fact `a==1 || a==2 || a==3`. This method expands any `in` filter in the given
294+
* input into a disjunction of equality filters and returns the expanded filter.
297295
*/
298296
protected static Filter computeInExpansion(Filter filter) {
299297
assertFieldFilterOrCompositeFilter(filter);
300298

301299
List<Filter> expandedFilters = new ArrayList<>();
302300

303-
if(filter instanceof FieldFilter) {
304-
if(filter instanceof InFilter) {
301+
if (filter instanceof FieldFilter) {
302+
if (filter instanceof InFilter) {
305303
// We have reached a field filter with `in` operator.
306-
for(Value value : ((InFilter) filter).getValue().getArrayValue().getValuesList()) {
307-
expandedFilters.add(FieldFilter.create(((InFilter) filter).getField(), FieldFilter.Operator.EQUAL, value));
304+
for (Value value : ((InFilter) filter).getValue().getArrayValue().getValuesList()) {
305+
expandedFilters.add(
306+
FieldFilter.create(
307+
((InFilter) filter).getField(), FieldFilter.Operator.EQUAL, value));
308308
}
309309
return new CompositeFilter(expandedFilters, CompositeFilter.Operator.OR);
310310
} else {
@@ -315,7 +315,7 @@ protected static Filter computeInExpansion(Filter filter) {
315315

316316
// We have a composite filter.
317317
CompositeFilter compositeFilter = (CompositeFilter) filter;
318-
for(Filter subfilter : compositeFilter.getFilters()) {
318+
for (Filter subfilter : compositeFilter.getFilters()) {
319319
expandedFilters.add(computeInExpansion(subfilter));
320320
}
321321
return new CompositeFilter(expandedFilters, compositeFilter.getOperator());

‎firebase-firestore/src/test/java/com/google/firebase/firestore/util/LogicUtilsTest.java

Lines changed: 38 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,11 @@ public void testInExpansionForFieldFilters() {
287287
FieldFilter input6 = filter("a", ">", 1);
288288
FieldFilter input7 = filter("a", ">=", 1);
289289
FieldFilter input8 = filter("a", "array-contains", 1);
290-
FieldFilter input9 = filter("a", "array-contains-any", Arrays.asList(1,2));
291-
FieldFilter input10 = filter("a", "not-in", Arrays.asList(1,2));
290+
FieldFilter input9 = filter("a", "array-contains-any", Arrays.asList(1, 2));
291+
FieldFilter input10 = filter("a", "not-in", Arrays.asList(1, 2));
292292

293-
assertThat(computeInExpansion(input1)).isEqualTo(
294-
orFilters(
295-
filter("a", "==", 1),
296-
filter("a", "==", 2),
297-
filter("a", "==", 3)));
293+
assertThat(computeInExpansion(input1))
294+
.isEqualTo(orFilters(filter("a", "==", 1), filter("a", "==", 2), filter("a", "==", 3)));
298295

299296
// Other operators should remain the same
300297
assertThat(computeInExpansion(input2)).isEqualTo(input2);
@@ -307,82 +304,51 @@ public void testInExpansionForFieldFilters() {
307304
assertThat(computeInExpansion(input9)).isEqualTo(input9);
308305
assertThat(computeInExpansion(input10)).isEqualTo(input10);
309306
}
307+
310308
@Test
311309
public void testInExpansionForCompositeFilters() {
312-
CompositeFilter cf1 = andFilters(
313-
filter("a", "==", 1),
314-
filter("b", "in", Arrays.asList(2,3,4))
315-
);
310+
CompositeFilter cf1 =
311+
andFilters(filter("a", "==", 1), filter("b", "in", Arrays.asList(2, 3, 4)));
316312

317-
assertThat(computeInExpansion(cf1)).isEqualTo(
313+
assertThat(computeInExpansion(cf1))
314+
.isEqualTo(
318315
andFilters(
319-
filter("a", "==", 1),
320-
orFilters(
321-
filter("b", "==", 2),
322-
filter("b", "==", 3),
323-
filter("b", "==", 4)
324-
)
325-
)
326-
);
327-
328-
CompositeFilter cf2 = orFilters(
329-
filter("a", "==", 1),
330-
filter("b", "in", Arrays.asList(2,3,4))
331-
);
316+
filter("a", "==", 1),
317+
orFilters(filter("b", "==", 2), filter("b", "==", 3), filter("b", "==", 4))));
332318

333-
assertThat(computeInExpansion(cf2)).isEqualTo(
334-
orFilters(
335-
filter("a", "==", 1),
336-
orFilters(
337-
filter("b", "==", 2),
338-
filter("b", "==", 3),
339-
filter("b", "==", 4)
340-
)
341-
)
342-
);
343-
344-
CompositeFilter cf3 = andFilters(
345-
filter("a", "==", 1),
319+
CompositeFilter cf2 =
320+
orFilters(filter("a", "==", 1), filter("b", "in", Arrays.asList(2, 3, 4)));
321+
322+
assertThat(computeInExpansion(cf2))
323+
.isEqualTo(
346324
orFilters(
347-
filter("b", "==", 2),
348-
filter("c", "in", Arrays.asList(2,3,4))
349-
)
350-
);
325+
filter("a", "==", 1),
326+
orFilters(filter("b", "==", 2), filter("b", "==", 3), filter("b", "==", 4))));
351327

352-
assertThat(computeInExpansion(cf3)).isEqualTo(
353-
andFilters(
354-
filter("a", "==", 1),
355-
orFilters(
356-
filter("b", "==", 2),
357-
orFilters(
358-
filter("c", "==", 2),
359-
filter("c", "==", 3),
360-
filter("c", "==", 4)
361-
)
362-
)
363-
)
364-
);
365-
366-
CompositeFilter cf4 = orFilters(
328+
CompositeFilter cf3 =
329+
andFilters(
367330
filter("a", "==", 1),
331+
orFilters(filter("b", "==", 2), filter("c", "in", Arrays.asList(2, 3, 4))));
332+
333+
assertThat(computeInExpansion(cf3))
334+
.isEqualTo(
368335
andFilters(
336+
filter("a", "==", 1),
337+
orFilters(
369338
filter("b", "==", 2),
370-
filter("c", "in", Arrays.asList(2,3,4))
371-
)
372-
);
339+
orFilters(filter("c", "==", 2), filter("c", "==", 3), filter("c", "==", 4)))));
373340

374-
assertThat(computeInExpansion(cf4)).isEqualTo(
341+
CompositeFilter cf4 =
342+
orFilters(
343+
filter("a", "==", 1),
344+
andFilters(filter("b", "==", 2), filter("c", "in", Arrays.asList(2, 3, 4))));
345+
346+
assertThat(computeInExpansion(cf4))
347+
.isEqualTo(
375348
orFilters(
376-
filter("a", "==", 1),
377-
andFilters(
378-
filter("b", "==", 2),
379-
orFilters(
380-
filter("c", "==", 2),
381-
filter("c", "==", 3),
382-
filter("c", "==", 4)
383-
)
384-
)
385-
)
386-
);
349+
filter("a", "==", 1),
350+
andFilters(
351+
filter("b", "==", 2),
352+
orFilters(filter("c", "==", 2), filter("c", "==", 3), filter("c", "==", 4)))));
387353
}
388354
}

0 commit comments

Comments
 (0)