You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2017/05/09 04:21:22 UTC
[02/13] beam git commit: Remove en/decodeOuter and default
encode/decode methods.
Remove en/decodeOuter and default encode/decode methods.
Now only the context-free encode() and decode() methods are abstract.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/44867300
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/44867300
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/44867300
Branch: refs/heads/master
Commit: 44867300cb36dcad1cdfba70dbe093ec50a14388
Parents: 45e09b2
Author: Robert Bradshaw <ro...@gmail.com>
Authored: Fri May 5 17:35:35 2017 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Mon May 8 20:17:56 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/beam/sdk/coders/Coder.java | 35 ++++-----------
.../org/apache/beam/sdk/coders/CustomCoder.java | 47 --------------------
.../apache/beam/sdk/coders/StructuredCoder.java | 47 --------------------
3 files changed, 8 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/44867300/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
index d140e89..ec8a72d 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
@@ -127,18 +127,6 @@ public abstract class Coder<T> implements Serializable {
/**
* Encodes the given value of type {@code T} onto the given output stream
- * in the outer context.
- *
- * @throws IOException if writing to the {@code OutputStream} fails
- * for some reason
- * @throws CoderException if the value could not be encoded for some reason
- */
- @Deprecated
- public abstract void encodeOuter(T value, OutputStream outStream)
- throws CoderException, IOException;
-
- /**
- * Encodes the given value of type {@code T} onto the given output stream
* in the given context.
*
* @throws IOException if writing to the {@code OutputStream} fails
@@ -146,8 +134,10 @@ public abstract class Coder<T> implements Serializable {
* @throws CoderException if the value could not be encoded for some reason
*/
@Deprecated
- public abstract void encode(T value, OutputStream outStream, Context context)
- throws CoderException, IOException;
+ public void encode(T value, OutputStream outStream, Context context)
+ throws CoderException, IOException {
+ encode(value, outStream);
+ }
/**
* Decodes a value of type {@code T} from the given input stream in
@@ -161,17 +151,6 @@ public abstract class Coder<T> implements Serializable {
/**
* Decodes a value of type {@code T} from the given input stream in
- * the outer context. Returns the decoded value.
- *
- * @throws IOException if reading from the {@code InputStream} fails
- * for some reason
- * @throws CoderException if the value could not be decoded for some reason
- */
- @Deprecated
- public abstract T decodeOuter(InputStream inStream) throws CoderException, IOException;
-
- /**
- * Decodes a value of type {@code T} from the given input stream in
* the given context. Returns the decoded value.
*
* @throws IOException if reading from the {@code InputStream} fails
@@ -179,8 +158,10 @@ public abstract class Coder<T> implements Serializable {
* @throws CoderException if the value could not be decoded for some reason
*/
@Deprecated
- public abstract T decode(InputStream inStream, Context context)
- throws CoderException, IOException;
+ public T decode(InputStream inStream, Context context)
+ throws CoderException, IOException {
+ return decode(inStream);
+ }
/**
* If this is a {@code Coder} for a parameterized type, returns the
http://git-wip-us.apache.org/repos/asf/beam/blob/44867300/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 edbaa7f..c581923 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,9 +17,6 @@
*/
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;
@@ -39,50 +36,6 @@ import java.util.List;
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}.
*
http://git-wip-us.apache.org/repos/asf/beam/blob/44867300/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 437f10d..42c0598 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
@@ -18,9 +18,6 @@
package org.apache.beam.sdk.coders;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -101,50 +98,6 @@ public abstract class StructuredCoder<T> extends Coder<T> {
return builder.toString();
}
- @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);
- }
- }
-
protected void verifyDeterministic(String message, Iterable<Coder<?>> coders)
throws NonDeterministicException {
for (Coder<?> coder : coders) {