You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/07/12 00:49:50 UTC
[1/2] incubator-beam git commit: Closes #627
Repository: incubator-beam
Updated Branches:
refs/heads/master c5744ccf2 -> 3653c5c0b
Closes #627
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/3653c5c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/3653c5c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/3653c5c0
Branch: refs/heads/master
Commit: 3653c5c0b3a93a1086097aced1dc050b2f46d4b3
Parents: c5744cc 732e8bf
Author: Dan Halperin <dh...@google.com>
Authored: Mon Jul 11 17:49:44 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Mon Jul 11 17:49:44 2016 -0700
----------------------------------------------------------------------
.../build-tools/src/main/resources/beam/findbugs-filter.xml | 6 ------
.../java/org/apache/beam/sdk/coders/SerializableCoder.java | 6 ++----
.../java/org/apache/beam/sdk/coders/SerializableCoderTest.java | 6 ++++++
3 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-beam git commit: Fixed equals method to handle null
and added respective test.
Posted by dh...@apache.org.
Fixed equals method to handle null and added respective test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/732e8bf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/732e8bf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/732e8bf7
Branch: refs/heads/master
Commit: 732e8bf7eb205429d4313c0620bb3fb82ade5b3b
Parents: c5744cc
Author: Ilya Ganelin <il...@capitalone.com>
Authored: Mon Jul 11 16:05:51 2016 -0400
Committer: Dan Halperin <dh...@google.com>
Committed: Mon Jul 11 17:49:44 2016 -0700
----------------------------------------------------------------------
.../build-tools/src/main/resources/beam/findbugs-filter.xml | 6 ------
.../java/org/apache/beam/sdk/coders/SerializableCoder.java | 6 ++----
.../java/org/apache/beam/sdk/coders/SerializableCoderTest.java | 6 ++++++
3 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/732e8bf7/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
----------------------------------------------------------------------
diff --git a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
index 1226cd1..e15cf7b 100644
--- a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
@@ -83,12 +83,6 @@
<!--[BEAM-398] Inconsistent synchronization-->
</Match>
<Match>
- <Class name="org.apache.beam.sdk.coders.SerializableCoder"/>
- <Method name="equals"/>
- <Bug pattern="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT"/>
- <!--[BEAM-399] equals() method does not check for null argument-->
- </Match>
- <Match>
<Class name="org.apache.beam.sdk.coders.StandardCoder"/>
<Method name="toString"/>
<Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION"/>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/732e8bf7/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/SerializableCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/SerializableCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/SerializableCoder.java
index 310ecb7..0995bdc 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/SerializableCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/SerializableCoder.java
@@ -166,10 +166,8 @@ public class SerializableCoder<T extends Serializable> extends AtomicCoder<T> {
@Override
public boolean equals(Object other) {
- if (getClass() != other.getClass()) {
- return false;
- }
- return type == ((SerializableCoder<?>) other).type;
+ return !(other == null || getClass() != other.getClass())
+ && type == ((SerializableCoder<?>) other).type;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/732e8bf7/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SerializableCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SerializableCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SerializableCoderTest.java
index f79f243..d6423e5 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SerializableCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SerializableCoderTest.java
@@ -130,6 +130,12 @@ public class SerializableCoderTest implements Serializable {
}
@Test
+ public void testNullEquals() {
+ SerializableCoder<MyRecord> coder = SerializableCoder.of(MyRecord.class);
+ Assert.assertFalse(coder.equals(null));
+ }
+
+ @Test
@Category(NeedsRunner.class)
public void testDefaultCoder() throws Exception {
Pipeline p = TestPipeline.create();