Skip to content

Commit 13e01c8

Browse files
Review
1 parent 7ea5b37 commit 13e01c8

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/NumericIncrementTransformOperation.java

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

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

17+
import static com.google.firebase.firestore.model.value.ProtoValues.isDouble;
18+
import static com.google.firebase.firestore.model.value.ProtoValues.isInteger;
1719
import static com.google.firebase.firestore.util.Assert.fail;
1820
import static com.google.firebase.firestore.util.Assert.hardAssert;
1921

@@ -121,12 +123,4 @@ private long operandAsLong() {
121123
+ operand.getClass().getCanonicalName());
122124
}
123125
}
124-
125-
private boolean isInteger(@Nullable Value value) {
126-
return value != null && value.getValueTypeCase() == Value.ValueTypeCase.INTEGER_VALUE;
127-
}
128-
129-
private boolean isDouble(@Nullable Value value) {
130-
return value != null && value.getValueTypeCase() == Value.ValueTypeCase.DOUBLE_VALUE;
131-
}
132126
}

firebase-firestore/src/main/java/com/google/firebase/firestore/model/value/ProtoValues.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,11 +391,19 @@ private static void canonifyArray(StringBuilder builder, ArrayValue arrayValue)
391391
builder.append("]");
392392
}
393393

394+
/** Returns true if `value` is either a INTEGER_VALUE. */
395+
public static boolean isInteger(@Nullable Value value) {
396+
return value != null && value.getValueTypeCase() == Value.ValueTypeCase.INTEGER_VALUE;
397+
}
398+
399+
/** Returns true if `value` is either a DOUBLE_VALUE. */
400+
public static boolean isDouble(@Nullable Value value) {
401+
return value != null && value.getValueTypeCase() == Value.ValueTypeCase.DOUBLE_VALUE;
402+
}
403+
394404
/** Returns true if `value` is either a INTEGER_VALUE or a DOUBLE_VALUE. */
395405
public static boolean isNumber(@Nullable Value value) {
396-
return value != null
397-
&& (value.getValueTypeCase() == Value.ValueTypeCase.INTEGER_VALUE
398-
|| value.getValueTypeCase() == Value.ValueTypeCase.DOUBLE_VALUE);
406+
return isInteger(value) || isDouble(value);
399407
}
400408

401409
/** Returns true if `value` is an ARRAY_VALUE. */

0 commit comments

Comments
 (0)