Skip to content

Commit 94604dc

Browse files
committed
Change 'ignoreNulls' to 'ignoreNullValues'
1 parent c21ccae commit 94604dc

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

encoders/firebase-encoders-json/src/json/java/com/google/firebase/encoders/json/JsonDataEncoderBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public final class JsonDataEncoderBuilder implements EncoderConfig<JsonDataEncod
4444
private final Map<Class<?>, ObjectEncoder<?>> objectEncoders = new HashMap<>();
4545
private final Map<Class<?>, ValueEncoder<?>> valueEncoders = new HashMap<>();
4646
private ObjectEncoder<Object> fallbackEncoder = DEFAULT_FALLBACK_ENCODER;
47-
private boolean ignoreNulls = false;
47+
private boolean ignoreNullValues = false;
4848

4949
private static final class TimestampEncoder implements ValueEncoder<Date> {
5050
private static final DateFormat rfc339;
@@ -106,8 +106,8 @@ public JsonDataEncoderBuilder configureWith(@NonNull Configurator config) {
106106
}
107107

108108
@NonNull
109-
public JsonDataEncoderBuilder ignoreNulls(boolean ignore) {
110-
this.ignoreNulls = ignore;
109+
public JsonDataEncoderBuilder ignoreNullValues(boolean ignore) {
110+
this.ignoreNullValues = ignore;
111111
return this;
112112
}
113113

@@ -119,7 +119,7 @@ public void encode(@NonNull Object o, @NonNull Writer writer)
119119
throws IOException, EncodingException {
120120
JsonValueObjectEncoderContext encoderContext =
121121
new JsonValueObjectEncoderContext(
122-
writer, objectEncoders, valueEncoders, fallbackEncoder, ignoreNulls);
122+
writer, objectEncoders, valueEncoders, fallbackEncoder, ignoreNullValues);
123123
encoderContext.add(o, false);
124124
encoderContext.close();
125125
}

encoders/firebase-encoders-json/src/json/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContext.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ JsonValueObjectEncoderContext invoke(@NonNull String name, @Nullable Object o)
4949
@NonNull Map<Class<?>, ObjectEncoder<?>> objectEncoders,
5050
@NonNull Map<Class<?>, ValueEncoder<?>> valueEncoders,
5151
ObjectEncoder<Object> fallbackEncoder,
52-
boolean ignoreNulls) {
52+
boolean ignoreNullValues) {
5353
this.jsonWriter = new JsonWriter(writer);
5454
this.objectEncoders = objectEncoders;
5555
this.valueEncoders = valueEncoders;
5656
this.fallbackEncoder = fallbackEncoder;
57-
this.addMethod = ignoreNulls ? this::internalAddIgnoreNulls : this::internalAdd;
57+
this.addMethod = ignoreNullValues ? this::internalAddIgnoreNullValues : this::internalAdd;
5858
}
5959

6060
private JsonValueObjectEncoderContext(JsonValueObjectEncoderContext anotherContext) {
@@ -326,7 +326,7 @@ private JsonValueObjectEncoderContext internalAdd(@NonNull String name, @Nullabl
326326
return add(o, false);
327327
}
328328

329-
private JsonValueObjectEncoderContext internalAddIgnoreNulls(
329+
private JsonValueObjectEncoderContext internalAddIgnoreNullValues(
330330
@NonNull String name, @Nullable Object o) throws IOException, EncodingException {
331331
if (o == null) {
332332
return this;

encoders/firebase-encoders-json/src/test/java/com/google/firebase/encoders/json/JsonDataEncoderBuilderTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void configureWith_shouldCorrectlyRegisterValueEncoder() throws EncodingE
6464
}
6565

6666
@Test
67-
public void ignoreNulls_shouldCorrectlyEncodeObjectIgnoringNullObjects()
67+
public void ignoreNullValues_shouldCorrectlyEncodeObjectIgnoringNullObjects()
6868
throws EncodingException {
6969
DataEncoder encoder =
7070
new JsonDataEncoderBuilder()
@@ -76,14 +76,15 @@ public void ignoreNulls_shouldCorrectlyEncodeObjectIgnoringNullObjects()
7676
ctx.add("foo", "value");
7777
ctx.add("bar", null);
7878
}))
79-
.ignoreNulls(true)
79+
.ignoreNullValues(true)
8080
.build();
8181

8282
assertThat(encoder.encode(new Foo())).isEqualTo("{\"foo\":\"value\"}");
8383
}
8484

8585
@Test
86-
public void ignoreNulls_shouldCorrectlyEncodeValueIgnoringNullObjects() throws EncodingException {
86+
public void ignoreNullValues_shouldCorrectlyEncodeValueIgnoringNullObjects()
87+
throws EncodingException {
8788
DataEncoder encoder =
8889
new JsonDataEncoderBuilder()
8990
.configureWith(
@@ -93,7 +94,7 @@ public void ignoreNulls_shouldCorrectlyEncodeValueIgnoringNullObjects() throws E
9394
(Foo s, ValueEncoderContext ctx) -> {
9495
ctx.add("value");
9596
}))
96-
.ignoreNulls(true)
97+
.ignoreNullValues(true)
9798
.build();
9899

99100
HashMap<String, Foo> fooMap = new HashMap<>();

0 commit comments

Comments
 (0)