You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ie...@apache.org on 2017/10/05 10:20:46 UTC

[1/2] beam git commit: [BEAM-3018] Remove duplicated methods in StructuredCoder

Repository: beam
Updated Branches:
  refs/heads/master afe8da8bc -> 12e79d0a0


[BEAM-3018] Remove duplicated methods in StructuredCoder


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/8d8a213f
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/8d8a213f
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/8d8a213f

Branch: refs/heads/master
Commit: 8d8a213f0ba2f1cceec8e53bba01c8d2a55c8863
Parents: afe8da8
Author: Cao Manh Dat <da...@apache.org>
Authored: Thu Oct 5 11:28:35 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Thu Oct 5 11:28:35 2017 +0700

----------------------------------------------------------------------
 .../apache/beam/sdk/coders/StructuredCoder.java | 34 --------------------
 1 file changed, 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/8d8a213f/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StructuredCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StructuredCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StructuredCoder.java
index 2eb662b..bd964f4 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StructuredCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StructuredCoder.java
@@ -17,10 +17,8 @@
  */
 package org.apache.beam.sdk.coders;
 
-import java.io.ByteArrayOutputStream;
 import java.util.Collections;
 import java.util.List;
-import org.apache.beam.sdk.values.TypeDescriptor;
 
 /**
  * An abstract base class to implement a {@link Coder} that defines equality, hashing, and printing
@@ -99,36 +97,4 @@ public abstract class StructuredCoder<T> extends Coder<T> {
     return builder.toString();
   }
 
-  /**
-   * {@inheritDoc}
-   *
-   * @return {@code false} for {@link StructuredCoder} unless overridden.
-   */
-  @Override
-  public boolean consistentWithEquals() {
-    return false;
-  }
-
-  @Override
-  public Object structuralValue(T value) {
-    if (value != null && consistentWithEquals()) {
-      return value;
-    } else {
-      try {
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        encode(value, os, Context.OUTER);
-        return new StructuralByteArray(os.toByteArray());
-      } catch (Exception exn) {
-        throw new IllegalArgumentException(
-            "Unable to encode element '" + value + "' with coder '" + this + "'.", exn);
-      }
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public TypeDescriptor<T> getEncodedTypeDescriptor() {
-    return (TypeDescriptor<T>)
-        TypeDescriptor.of(getClass()).resolveType(new TypeDescriptor<T>() {}.getType());
-  }
 }


[2/2] beam git commit: This closes #3947

Posted by ie...@apache.org.
This closes #3947


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/12e79d0a
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/12e79d0a
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/12e79d0a

Branch: refs/heads/master
Commit: 12e79d0a0dd417b9b09c44d042ce765a90cdc57b
Parents: afe8da8 8d8a213
Author: Ismaël Mejía <ie...@gmail.com>
Authored: Thu Oct 5 12:20:13 2017 +0200
Committer: Ismaël Mejía <ie...@gmail.com>
Committed: Thu Oct 5 12:20:13 2017 +0200

----------------------------------------------------------------------
 .../apache/beam/sdk/coders/StructuredCoder.java | 34 --------------------
 1 file changed, 34 deletions(-)
----------------------------------------------------------------------