fixes

google · Apr 5, 2024 · cdf0cf9 · cdf0cf9
1 parent d0cc20a
commit cdf0cf9
Show file tree

Hide file tree

Showing 11 changed files with 184 additions and 274 deletions.
diff --git a/extras/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java b/extras/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java
@@ -312,7 +312,7 @@ public void write(JsonWriter out, R value) throws IOException {
 
         JsonObject clone = new JsonObject();
 
-        if (jsonObject.has(typeFieldName)) {
+        if (jsonObject.hasMember(typeFieldName)) {
           throw new JsonParseException(
               "cannot serialize "
                   + srcType.getName()

diff --git a/gson/src/main/java/com/google/gson/JsonArray.java b/gson/src/main/java/com/google/gson/JsonArray.java
@@ -419,4 +419,4 @@ public boolean equals(Object o) {
   public int hashCode() {
     return elements.hashCode();
   }
-}
+}
diff --git a/gson/src/main/java/com/google/gson/JsonObject.java b/gson/src/main/java/com/google/gson/JsonObject.java
@@ -170,7 +170,7 @@ public boolean isEmpty() {
    * @param memberName name of the member that is being checked for presence.
    * @return true if there is a member with the specified name, false otherwise.
    */
-  public boolean has(String memberName) {
+  public boolean hasMember(String memberName) {
     return members.containsKey(memberName);
   }
 

diff --git a/gson/src/test/java/com/google/gson/DefaultMapJsonSerializerTest.java b/gson/src/test/java/com/google/gson/DefaultMapJsonSerializerTest.java
@@ -64,6 +64,6 @@ public void testNonEmptyMapSerialization() {
 
     assertThat(element.isJsonObject()).isTrue();
     JsonObject mapJsonObject = element.getAsJsonObject();
-    assertThat(mapJsonObject.has(key)).isTrue();
+    assertThat(mapJsonObject.hasMember(key)).isTrue();
   }
 }
diff --git a/gson/src/test/java/com/google/gson/JsonObjectTest.java b/gson/src/test/java/com/google/gson/JsonObjectTest.java
@@ -44,7 +44,7 @@ public class JsonObjectTest {
   public void testAddingAndRemovingObjectProperties() {
     JsonObject jsonObj = new JsonObject();
     String propertyName = "property";
-    assertThat(jsonObj.has(propertyName)).isFalse();
+    assertThat(jsonObj.hasMember(propertyName)).isFalse();
     assertThat(jsonObj.get(propertyName)).isNull();
 
     JsonPrimitive value = new JsonPrimitive("blah");
@@ -53,7 +53,7 @@ public void testAddingAndRemovingObjectProperties() {
 
     JsonElement removedElement = jsonObj.remove(propertyName);
     assertThat(removedElement).isEqualTo(value);
-    assertThat(jsonObj.has(propertyName)).isFalse();
+    assertThat(jsonObj.hasMember(propertyName)).isFalse();
     assertThat(jsonObj.get(propertyName)).isNull();
 
     assertThat(jsonObj.remove(propertyName)).isNull();
@@ -65,7 +65,7 @@ public void testAddingNullPropertyValue() {
     JsonObject jsonObj = new JsonObject();
     jsonObj.add(propertyName, null);
 
-    assertThat(jsonObj.has(propertyName)).isTrue();
+    assertThat(jsonObj.hasMember(propertyName)).isTrue();
 
     JsonElement jsonElement = jsonObj.get(propertyName);
     assertThat(jsonElement).isNotNull();
@@ -91,7 +91,7 @@ public void testAddingBooleanProperties() {
     JsonObject jsonObj = new JsonObject();
     jsonObj.addProperty(propertyName, true);
 
-    assertThat(jsonObj.has(propertyName)).isTrue();
+    assertThat(jsonObj.hasMember(propertyName)).isTrue();
 
     JsonElement jsonElement = jsonObj.get(propertyName);
     assertThat(jsonElement).isNotNull();
@@ -106,7 +106,7 @@ public void testAddingStringProperties() {
     JsonObject jsonObj = new JsonObject();
     jsonObj.addProperty(propertyName, value);
 
-    assertThat(jsonObj.has(propertyName)).isTrue();
+    assertThat(jsonObj.hasMember(propertyName)).isTrue();
 
     JsonElement jsonElement = jsonObj.get(propertyName);
     assertThat(jsonElement).isNotNull();
@@ -121,7 +121,7 @@ public void testAddingCharacterProperties() {
     JsonObject jsonObj = new JsonObject();
     jsonObj.addProperty(propertyName, value);
 
-    assertThat(jsonObj.has(propertyName)).isTrue();
+    assertThat(jsonObj.hasMember(propertyName)).isTrue();
 
     JsonElement jsonElement = jsonObj.get(propertyName);
     assertThat(jsonElement).isNotNull();
@@ -344,4 +344,4 @@ public void testEntrySet() {
       assertThat(new ArrayList<>(o.entrySet())).isEqualTo(new ArrayList<>(expectedEntriesQueue));
     }
   }
-}
+}
diff --git a/gson/src/test/java/com/google/gson/functional/JsonTreeTest.java b/gson/src/test/java/com/google/gson/functional/JsonTreeTest.java
@@ -86,7 +86,7 @@ public void testJsonTreeToString() {
   public void testJsonTreeNull() {
     BagOfPrimitives bag = new BagOfPrimitives(10L, 5, false, null);
     JsonObject jsonElement = (JsonObject) gson.toJsonTree(bag, BagOfPrimitives.class);
-    assertThat(jsonElement.has("stringValue")).isFalse();
+    assertThat(jsonElement.hasMember("stringValue")).isFalse();
   }
 
   private static void assertContains(JsonObject json, JsonPrimitive child) {

diff --git a/gson/src/test/java/com/google/gson/functional/RuntimeTypeAdapterFactoryFunctionalTest.java b/gson/src/test/java/com/google/gson/functional/RuntimeTypeAdapterFactoryFunctionalTest.java
@@ -213,7 +213,7 @@ public void write(JsonWriter out, R value) throws IOException {
                     + "; did you forget to register a subtype?");
           }
           JsonObject jsonObject = delegate.toJsonTree(value).getAsJsonObject();
-          if (!jsonObject.has(typeFieldName)) {
+          if (!jsonObject.hasMember(typeFieldName)) {
             JsonObject clone = new JsonObject();
             clone.add(typeFieldName, new JsonPrimitive(label));
             for (Map.Entry<String, JsonElement> e : jsonObject.entrySet()) {

diff --git a/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitivesDeserializationBenchmark.java b/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitivesDeserializationBenchmark.java
diff --git a/metrics/src/main/java/com/google/gson/metrics/CollectionsDeserializationBenchmark.java b/metrics/src/main/java/com/google/gson/metrics/CollectionsDeserializationBenchmark.java