Skip to content

Commit 82f497f

Browse files
schmidt-sebastianschmidt-sebastian
committed
Renames
1 parent 691b85c commit 82f497f

File tree

3 files changed

+34
-39
lines changed

3 files changed

+34
-39
lines changed

‎firebase-firestore/src/main/java/com/google/firebase/firestore/core/Target.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
package com.google.firebase.firestore.core;
1616

17-
import static com.google.firebase.firestore.model.Values.getLowestValue;
18-
import static com.google.firebase.firestore.model.Values.getNextValue;
1917
import static com.google.firebase.firestore.model.Values.max;
2018
import static com.google.firebase.firestore.model.Values.min;
2119

@@ -142,7 +140,7 @@ public Bound getLowerBound(FieldIndex fieldIndex) {
142140
switch (fieldFilter.getOperator()) {
143141
case LESS_THAN:
144142
case LESS_THAN_OR_EQUAL:
145-
filterValue = getLowestValue(fieldFilter.getValue().getValueTypeCase());
143+
filterValue = Values.getLowerBound(fieldFilter.getValue().getValueTypeCase());
146144
break;
147145
case NOT_EQUAL:
148146
filterValue = Values.NULL_VALUE;
@@ -226,7 +224,7 @@ public Bound getLowerBound(FieldIndex fieldIndex) {
226224
break;
227225
case GREATER_THAN_OR_EQUAL:
228226
case GREATER_THAN:
229-
filterValue = getNextValue(fieldFilter.getValue().getValueTypeCase());
227+
filterValue = Values.getUpperBound(fieldFilter.getValue().getValueTypeCase());
230228
filterInclusive = false;
231229
break;
232230
case EQUAL:

‎firebase-firestore/src/main/java/com/google/firebase/firestore/model/Values.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ public static Value refValue(DatabaseId databaseId, DocumentKey key) {
459459
}
460460

461461
/** Returns the lowest value for the given value type (inclusive). */
462-
public static Value getLowestValue(Value.ValueTypeCase valueTypeCase) {
462+
public static Value getLowerBound(Value.ValueTypeCase valueTypeCase) {
463463
switch (valueTypeCase) {
464464
case NULL_VALUE:
465465
return Values.NULL_VALUE;
@@ -494,27 +494,27 @@ public static Value getLowestValue(Value.ValueTypeCase valueTypeCase) {
494494
/**
495495
* Returns the largest value for the given value type (exclusive). Returns {@code null} for maps.
496496
*/
497-
public static @Nullable Value getNextValue(Value.ValueTypeCase valueTypeCase) {
497+
public static @Nullable Value getUpperBound(Value.ValueTypeCase valueTypeCase) {
498498
switch (valueTypeCase) {
499499
case NULL_VALUE:
500-
return getLowestValue(Value.ValueTypeCase.BOOLEAN_VALUE);
500+
return getLowerBound(Value.ValueTypeCase.BOOLEAN_VALUE);
501501
case BOOLEAN_VALUE:
502-
return getLowestValue(Value.ValueTypeCase.INTEGER_VALUE);
502+
return getLowerBound(Value.ValueTypeCase.INTEGER_VALUE);
503503
case INTEGER_VALUE:
504504
case DOUBLE_VALUE:
505-
return getLowestValue(Value.ValueTypeCase.TIMESTAMP_VALUE);
505+
return getLowerBound(Value.ValueTypeCase.TIMESTAMP_VALUE);
506506
case TIMESTAMP_VALUE:
507-
return getLowestValue(Value.ValueTypeCase.STRING_VALUE);
507+
return getLowerBound(Value.ValueTypeCase.STRING_VALUE);
508508
case STRING_VALUE:
509-
return getLowestValue(Value.ValueTypeCase.BYTES_VALUE);
509+
return getLowerBound(Value.ValueTypeCase.BYTES_VALUE);
510510
case BYTES_VALUE:
511-
return getLowestValue(Value.ValueTypeCase.REFERENCE_VALUE);
511+
return getLowerBound(Value.ValueTypeCase.REFERENCE_VALUE);
512512
case REFERENCE_VALUE:
513-
return getLowestValue(Value.ValueTypeCase.GEO_POINT_VALUE);
513+
return getLowerBound(Value.ValueTypeCase.GEO_POINT_VALUE);
514514
case GEO_POINT_VALUE:
515-
return getLowestValue(Value.ValueTypeCase.ARRAY_VALUE);
515+
return getLowerBound(Value.ValueTypeCase.ARRAY_VALUE);
516516
case ARRAY_VALUE:
517-
return getLowestValue(Value.ValueTypeCase.MAP_VALUE);
517+
return getLowerBound(Value.ValueTypeCase.MAP_VALUE);
518518
case MAP_VALUE:
519519
// There is no type that sorts higher than a map.
520520
return null;

‎firebase-firestore/src/test/java/com/google/firebase/firestore/model/ValuesTest.java

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
package com.google.firebase.firestore.model;
1616

17-
import static com.google.firebase.firestore.model.Values.getLowestValue;
18-
import static com.google.firebase.firestore.model.Values.getNextValue;
17+
import static com.google.firebase.firestore.model.Values.getLowerBound;
18+
import static com.google.firebase.firestore.model.Values.getUpperBound;
1919
import static com.google.firebase.firestore.testutil.TestUtil.blob;
2020
import static com.google.firebase.firestore.testutil.TestUtil.dbId;
2121
import static com.google.firebase.firestore.testutil.TestUtil.key;
@@ -208,93 +208,90 @@ public void testValueOrdering() {
208208
@Test
209209
public void testLowerBound() {
210210
new ComparatorTester()
211-
212211
// null first
213-
.addEqualityGroup(wrap(getLowestValue(Value.ValueTypeCase.NULL_VALUE)), wrap((Object) null))
212+
.addEqualityGroup(wrap(getLowerBound(Value.ValueTypeCase.NULL_VALUE)), wrap((Object) null))
214213

215214
// booleans
216-
.addEqualityGroup(wrap(false), wrap(getLowestValue(Value.ValueTypeCase.BOOLEAN_VALUE)))
215+
.addEqualityGroup(wrap(false), wrap(getLowerBound(Value.ValueTypeCase.BOOLEAN_VALUE)))
217216
.addEqualityGroup(wrap(true))
218217

219218
// numbers
220-
.addEqualityGroup(wrap(getLowestValue(Value.ValueTypeCase.DOUBLE_VALUE)), wrap(Double.NaN))
219+
.addEqualityGroup(wrap(getLowerBound(Value.ValueTypeCase.DOUBLE_VALUE)), wrap(Double.NaN))
221220
.addEqualityGroup(wrap(Double.NEGATIVE_INFINITY))
222221
.addEqualityGroup(wrap(Long.MIN_VALUE))
223222

224223
// dates
225-
.addEqualityGroup(wrap(getLowestValue(Value.ValueTypeCase.TIMESTAMP_VALUE)))
224+
.addEqualityGroup(wrap(getLowerBound(Value.ValueTypeCase.TIMESTAMP_VALUE)))
226225
.addEqualityGroup(wrap(date1))
227226

228227
// strings
229-
.addEqualityGroup(wrap(getLowestValue(Value.ValueTypeCase.STRING_VALUE)), wrap(""))
228+
.addEqualityGroup(wrap(getLowerBound(Value.ValueTypeCase.STRING_VALUE)), wrap(""))
230229
.addEqualityGroup(wrap("\000"))
231230

232231
// blobs
233-
.addEqualityGroup(wrap(getLowestValue(Value.ValueTypeCase.BYTES_VALUE)), wrap(blob()))
232+
.addEqualityGroup(wrap(getLowerBound(Value.ValueTypeCase.BYTES_VALUE)), wrap(blob()))
234233
.addEqualityGroup(wrap(blob(0)))
235234

236235
// resource names
237236
.addEqualityGroup(
238-
wrap(getLowestValue(Value.ValueTypeCase.REFERENCE_VALUE)),
237+
wrap(getLowerBound(Value.ValueTypeCase.REFERENCE_VALUE)),
239238
wrap(wrapRef(dbId("", ""), key(""))))
240239
.addEqualityGroup(wrap(wrapRef(dbId("", ""), key("a/a"))))
241240

242241
// geo points
243242
.addEqualityGroup(
244-
wrap(getLowestValue(Value.ValueTypeCase.GEO_POINT_VALUE)),
245-
wrap(new GeoPoint(-90, -180)))
243+
wrap(getLowerBound(Value.ValueTypeCase.GEO_POINT_VALUE)), wrap(new GeoPoint(-90, -180)))
246244
.addEqualityGroup(wrap(new GeoPoint(-90, 0)))
247245

248246
// arrays
249247
.addEqualityGroup(
250-
wrap(getLowestValue(Value.ValueTypeCase.ARRAY_VALUE)), wrap(Collections.emptyList()))
248+
wrap(getLowerBound(Value.ValueTypeCase.ARRAY_VALUE)), wrap(Collections.emptyList()))
251249
.addEqualityGroup(wrap(Collections.singletonList(false)))
252250

253251
// objects
254-
.addEqualityGroup(wrap(getLowestValue(Value.ValueTypeCase.MAP_VALUE)), wrap(map()))
252+
.addEqualityGroup(wrap(getLowerBound(Value.ValueTypeCase.MAP_VALUE)), wrap(map()))
255253
.testCompare();
256254
}
257255

258256
@Test
259257
public void testNextValue() {
260258
new ComparatorTester()
261-
262259
// null first
263260
.addEqualityGroup(wrap((Object) null))
264-
.addEqualityGroup(wrap(getNextValue(Value.ValueTypeCase.NULL_VALUE)))
261+
.addEqualityGroup(wrap(getUpperBound(Value.ValueTypeCase.NULL_VALUE)))
265262

266263
// booleans
267264
.addEqualityGroup(wrap(true))
268-
.addEqualityGroup(wrap(getNextValue(Value.ValueTypeCase.BOOLEAN_VALUE)))
265+
.addEqualityGroup(wrap(getUpperBound(Value.ValueTypeCase.BOOLEAN_VALUE)))
269266

270267
// numbers
271268
.addEqualityGroup(wrap(Long.MAX_VALUE))
272269
.addEqualityGroup(wrap(Double.POSITIVE_INFINITY))
273-
.addEqualityGroup(wrap(getNextValue(Value.ValueTypeCase.DOUBLE_VALUE)))
270+
.addEqualityGroup(wrap(getUpperBound(Value.ValueTypeCase.DOUBLE_VALUE)))
274271

275272
// dates
276273
.addEqualityGroup(wrap(date1))
277-
.addEqualityGroup(wrap(getNextValue(Value.ValueTypeCase.TIMESTAMP_VALUE)))
274+
.addEqualityGroup(wrap(getUpperBound(Value.ValueTypeCase.TIMESTAMP_VALUE)))
278275

279276
// strings
280277
.addEqualityGroup(wrap("\000"))
281-
.addEqualityGroup(wrap(getNextValue(Value.ValueTypeCase.STRING_VALUE)))
278+
.addEqualityGroup(wrap(getUpperBound(Value.ValueTypeCase.STRING_VALUE)))
282279

283280
// blobs
284281
.addEqualityGroup(wrap(blob(255)))
285-
.addEqualityGroup(wrap(getNextValue(Value.ValueTypeCase.BYTES_VALUE)))
282+
.addEqualityGroup(wrap(getUpperBound(Value.ValueTypeCase.BYTES_VALUE)))
286283

287284
// resource names
288285
.addEqualityGroup(wrap(wrapRef(dbId("", ""), key("a/a"))))
289-
.addEqualityGroup(wrap(getNextValue(Value.ValueTypeCase.REFERENCE_VALUE)))
286+
.addEqualityGroup(wrap(getUpperBound(Value.ValueTypeCase.REFERENCE_VALUE)))
290287

291288
// geo points
292289
.addEqualityGroup(wrap(new GeoPoint(90, 180)))
293-
.addEqualityGroup(wrap(getNextValue(Value.ValueTypeCase.GEO_POINT_VALUE)))
290+
.addEqualityGroup(wrap(getUpperBound(Value.ValueTypeCase.GEO_POINT_VALUE)))
294291

295292
// arrays
296293
.addEqualityGroup(wrap(Collections.singletonList(false)))
297-
.addEqualityGroup(wrap(getNextValue(Value.ValueTypeCase.ARRAY_VALUE)))
294+
.addEqualityGroup(wrap(getUpperBound(Value.ValueTypeCase.ARRAY_VALUE)))
298295

299296
// objects
300297
.addEqualityGroup(wrap(map("a", "b")))

0 commit comments

Comments
 (0)