You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tg...@apache.org on 2017/05/05 20:35:25 UTC
[5/6] beam git commit: Make CustomCoder extend Coder directly
Make CustomCoder extend Coder directly
CustomCoder in general consists of configuration beyond component
coders, and should not extend, for example, equality methods of
StrucutredCoder.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c7f3e3c3
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c7f3e3c3
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c7f3e3c3
Branch: refs/heads/master
Commit: c7f3e3c3a00423dfcaca6e5b53ad4f84533a56f6
Parents: 987c2cb
Author: Thomas Groh <tg...@google.com>
Authored: Fri May 5 10:13:41 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Fri May 5 13:30:51 2017 -0700
----------------------------------------------------------------------
.../org/apache/beam/sdk/coders/CustomCoder.java | 50 +++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/c7f3e3c3/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CustomCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CustomCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CustomCoder.java
index 87bd531..f33e210 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CustomCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CustomCoder.java
@@ -17,6 +17,9 @@
*/
package org.apache.beam.sdk.coders;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
@@ -33,8 +36,53 @@ import java.util.List;
*
* @param <T> the type of elements handled by this coder
*/
-public abstract class CustomCoder<T> extends StructuredCoder<T>
+public abstract class CustomCoder<T> extends Coder<T>
implements Serializable {
+
+ @Override
+ public void encode(T value, OutputStream outStream)
+ throws CoderException, IOException {
+ encode(value, outStream, Coder.Context.NESTED);
+ }
+
+ @Deprecated
+ @Override
+ public void encodeOuter(T value, OutputStream outStream)
+ throws CoderException, IOException {
+ encode(value, outStream, Coder.Context.OUTER);
+ }
+
+ @Deprecated
+ public void encode(T value, OutputStream outStream, Coder.Context context)
+ throws CoderException, IOException {
+ if (context == Coder.Context.NESTED) {
+ encode(value, outStream);
+ } else {
+ encodeOuter(value, outStream);
+ }
+ }
+
+ @Override
+ public T decode(InputStream inStream) throws CoderException, IOException {
+ return decode(inStream, Coder.Context.NESTED);
+ }
+
+ @Deprecated
+ @Override
+ public T decodeOuter(InputStream inStream) throws CoderException, IOException {
+ return decode(inStream, Coder.Context.OUTER);
+ }
+
+ @Deprecated
+ public T decode(InputStream inStream, Coder.Context context)
+ throws CoderException, IOException {
+ if (context == Coder.Context.NESTED) {
+ return decode(inStream);
+ } else {
+ return decodeOuter(inStream);
+ }
+ }
+
/**
* {@inheritDoc}.
*