[beam] branch master updated: [BEAM-11864] Use objects.equals instead of raw comparison

[pabloem]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 45b64d3  [BEAM-11864] Use objects.equals instead of raw comparison
     new 6de53b4  Merge pull request #14079 from [BEAM-11864] Use 
objects.equals instead of raw comparison
45b64d3 is described below

commit 45b64d36de9db5868eba9afa5c49344c282584ad
Author: Fokko Driesprong <fdriespr...@ebay.com>
AuthorDate: Thu Feb 25 13:31:41 2021 +0100

    [BEAM-11864] Use objects.equals instead of raw comparison
    
    The left hand side of the comparison can be equal as well
---
 .../src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java | 4 ++--
 .../test/java/org/apache/beam/sdk/schemas/utils/AvroUtilsTest.java | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java 
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java
index 7da4f7c..b3bbba0 100644
--- 
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java
+++ 
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java
@@ -517,7 +517,7 @@ public class AvroUtils {
         return false;
       }
       GenericRecordToRowFn that = (GenericRecordToRowFn) other;
-      return schema.equals(that.schema);
+      return Objects.equals(this.schema, that.schema);
     }
 
     @Override
@@ -556,7 +556,7 @@ public class AvroUtils {
         return false;
       }
       RowToGenericRecordFn that = (RowToGenericRecordFn) other;
-      return avroSchema.equals(that.avroSchema);
+      return Objects.equals(this.avroSchema, that.avroSchema);
     }
 
     @Override
diff --git 
a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/AvroUtilsTest.java
 
b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/AvroUtilsTest.java
index 8b225a2..a00bbd2 100644
--- 
a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/AvroUtilsTest.java
+++ 
b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/AvroUtilsTest.java
@@ -634,4 +634,11 @@ public class AvroUtilsTest {
 
     assertEquals(row, deserializedRow);
   }
+
+  @Test
+  public void testNullSchemas() {
+    assertEquals(
+        AvroUtils.getFromRowFunction(GenericRecord.class),
+        AvroUtils.getFromRowFunction(GenericRecord.class));
+  }
 }