AVRO-3956: [Java] Fix NPE in Protocol#equals (#2791)

* Fix NPE in Protocol#equals * Better Protocol#hashCode
apache · Mar 19, 2024 · dad0d20 · dad0d20
1 parent 828b600
commit dad0d20
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lang/java/avro/src/main/java/org/apache/avro/JsonProperties.java b/lang/java/avro/src/main/java/org/apache/avro/JsonProperties.java
@@ -24,6 +24,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Queue;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -334,7 +335,7 @@ int propsHashCode() {
   }
 
   boolean propsEqual(JsonProperties np) {
-    return props.equals(np.props);
+    return Objects.equals(props, np.props);
   }
 
   public boolean hasProps() {

diff --git a/lang/java/avro/src/main/java/org/apache/avro/Protocol.java b/lang/java/avro/src/main/java/org/apache/avro/Protocol.java
@@ -39,6 +39,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -390,13 +391,14 @@ public boolean equals(Object o) {
     if (!(o instanceof Protocol))
       return false;
     Protocol that = (Protocol) o;
-    return this.name.equals(that.name) && this.namespace.equals(that.namespace) && this.types.equals(that.types)
-        && this.messages.equals(that.messages) && this.propsEqual(that);
+    return Objects.equals(this.name, that.name) && Objects.equals(this.namespace, that.namespace)
+        && Objects.equals(this.types, that.types) && Objects.equals(this.messages, that.messages)
+        && this.propsEqual(that);
   }
 
   @Override
   public int hashCode() {
-    return name.hashCode() + namespace.hashCode() + types.hashCode() + messages.hashCode() + propsHashCode();
+    return 31 * Objects.hash(name, namespace, types, messages) + propsHashCode();
   }
 
   /** Render this as <a href="https://json.org/">JSON</a>. */