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/04/27 22:23:05 UTC
[1/2] beam git commit: This closes #2717
Repository: beam
Updated Branches:
refs/heads/master 14a90d7c5 -> c49369588
This closes #2717
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c4936958
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c4936958
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c4936958
Branch: refs/heads/master
Commit: c4936958834aa55f0f1fcb73fe9b8419c4c9eb9b
Parents: 14a90d7 d3b399f
Author: Thomas Groh <tg...@google.com>
Authored: Thu Apr 27 15:22:55 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Thu Apr 27 15:22:55 2017 -0700
----------------------------------------------------------------------
.../runners/dataflow/internal/IsmFormat.java | 15 -------
.../runners/dataflow/util/RandomAccessData.java | 5 ---
.../org/apache/beam/sdk/coders/AvroCoder.java | 33 --------------
.../apache/beam/sdk/coders/BigDecimalCoder.java | 5 ---
.../beam/sdk/coders/BigEndianIntegerCoder.java | 5 ---
.../beam/sdk/coders/BigEndianLongCoder.java | 5 ---
.../apache/beam/sdk/coders/BigIntegerCoder.java | 5 ---
.../org/apache/beam/sdk/coders/ByteCoder.java | 5 ---
.../java/org/apache/beam/sdk/coders/Coder.java | 34 ---------------
.../org/apache/beam/sdk/coders/CustomCoder.java | 25 +----------
.../apache/beam/sdk/coders/DelegateCoder.java | 31 -------------
.../org/apache/beam/sdk/coders/DoubleCoder.java | 5 ---
.../apache/beam/sdk/coders/InstantCoder.java | 5 ---
.../org/apache/beam/sdk/coders/MapCoder.java | 11 -----
.../apache/beam/sdk/coders/NullableCoder.java | 12 -----
.../beam/sdk/coders/SerializableCoder.java | 8 ----
.../apache/beam/sdk/coders/StandardCoder.java | 34 ---------------
.../beam/sdk/coders/StringDelegateCoder.java | 14 ------
.../beam/sdk/coders/TextualIntegerCoder.java | 5 ---
.../org/apache/beam/sdk/coders/VarIntCoder.java | 5 ---
.../beam/sdk/testing/CoderProperties.java | 42 ++----------------
.../org/apache/beam/sdk/transforms/Count.java | 5 ---
.../apache/beam/sdk/coders/AvroCoderTest.java | 6 ---
.../beam/sdk/coders/BigDecimalCoderTest.java | 18 --------
.../sdk/coders/BigEndianIntegerCoderTest.java | 8 ----
.../beam/sdk/coders/BigEndianLongCoderTest.java | 8 ----
.../beam/sdk/coders/BigIntegerCoderTest.java | 18 --------
.../beam/sdk/coders/ByteArrayCoderTest.java | 8 ----
.../apache/beam/sdk/coders/ByteCoderTest.java | 8 ----
.../beam/sdk/coders/CoderRegistryTest.java | 11 -----
.../beam/sdk/coders/CollectionCoderTest.java | 8 ----
.../apache/beam/sdk/coders/CustomCoderTest.java | 46 --------------------
.../beam/sdk/coders/DelegateCoderTest.java | 36 ---------------
.../apache/beam/sdk/coders/DoubleCoderTest.java | 8 ----
.../beam/sdk/coders/InstantCoderTest.java | 8 ----
.../beam/sdk/coders/IterableCoderTest.java | 8 ----
.../org/apache/beam/sdk/coders/KvCoderTest.java | 9 ----
.../beam/sdk/coders/LengthPrefixCoderTest.java | 8 ----
.../apache/beam/sdk/coders/ListCoderTest.java | 8 ----
.../apache/beam/sdk/coders/MapCoderTest.java | 8 ----
.../beam/sdk/coders/NullableCoderTest.java | 8 ----
.../beam/sdk/coders/SerializableCoderTest.java | 8 ----
.../apache/beam/sdk/coders/SetCoderTest.java | 8 ----
.../sdk/coders/StringDelegateCoderTest.java | 6 ---
.../sdk/coders/TextualIntegerCoderTest.java | 8 ----
.../apache/beam/sdk/coders/VarIntCoderTest.java | 8 ----
.../beam/sdk/coders/VarLongCoderTest.java | 8 ----
.../apache/beam/sdk/transforms/CombineTest.java | 5 ---
.../sdk/extensions/protobuf/ProtoCoder.java | 34 ---------------
.../sdk/extensions/protobuf/ProtoCoderTest.java | 12 -----
.../sdk/io/gcp/bigquery/TableRowJsonCoder.java | 6 ---
.../io/gcp/bigquery/TableRowJsonCoderTest.java | 8 ----
.../org/apache/beam/sdk/io/xml/JAXBCoder.java | 5 ---
.../apache/beam/sdk/io/xml/JAXBCoderTest.java | 7 ---
54 files changed, 6 insertions(+), 671 deletions(-)
----------------------------------------------------------------------
[2/2] beam git commit: Remove Coder Encoding IDs
Posted by tg...@apache.org.
Remove Coder Encoding IDs
These were never safe to use, and will not be used once Coders have been
migrated to the Runner API representation.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/d3b399fa
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/d3b399fa
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/d3b399fa
Branch: refs/heads/master
Commit: d3b399fa84bff45b0960368d32d4c69e433f4c94
Parents: 14a90d7
Author: Thomas Groh <tg...@google.com>
Authored: Wed Apr 26 15:12:54 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Thu Apr 27 15:22:55 2017 -0700
----------------------------------------------------------------------
.../runners/dataflow/internal/IsmFormat.java | 15 -------
.../runners/dataflow/util/RandomAccessData.java | 5 ---
.../org/apache/beam/sdk/coders/AvroCoder.java | 33 --------------
.../apache/beam/sdk/coders/BigDecimalCoder.java | 5 ---
.../beam/sdk/coders/BigEndianIntegerCoder.java | 5 ---
.../beam/sdk/coders/BigEndianLongCoder.java | 5 ---
.../apache/beam/sdk/coders/BigIntegerCoder.java | 5 ---
.../org/apache/beam/sdk/coders/ByteCoder.java | 5 ---
.../java/org/apache/beam/sdk/coders/Coder.java | 34 ---------------
.../org/apache/beam/sdk/coders/CustomCoder.java | 25 +----------
.../apache/beam/sdk/coders/DelegateCoder.java | 31 -------------
.../org/apache/beam/sdk/coders/DoubleCoder.java | 5 ---
.../apache/beam/sdk/coders/InstantCoder.java | 5 ---
.../org/apache/beam/sdk/coders/MapCoder.java | 11 -----
.../apache/beam/sdk/coders/NullableCoder.java | 12 -----
.../beam/sdk/coders/SerializableCoder.java | 8 ----
.../apache/beam/sdk/coders/StandardCoder.java | 34 ---------------
.../beam/sdk/coders/StringDelegateCoder.java | 14 ------
.../beam/sdk/coders/TextualIntegerCoder.java | 5 ---
.../org/apache/beam/sdk/coders/VarIntCoder.java | 5 ---
.../beam/sdk/testing/CoderProperties.java | 42 ++----------------
.../org/apache/beam/sdk/transforms/Count.java | 5 ---
.../apache/beam/sdk/coders/AvroCoderTest.java | 6 ---
.../beam/sdk/coders/BigDecimalCoderTest.java | 18 --------
.../sdk/coders/BigEndianIntegerCoderTest.java | 8 ----
.../beam/sdk/coders/BigEndianLongCoderTest.java | 8 ----
.../beam/sdk/coders/BigIntegerCoderTest.java | 18 --------
.../beam/sdk/coders/ByteArrayCoderTest.java | 8 ----
.../apache/beam/sdk/coders/ByteCoderTest.java | 8 ----
.../beam/sdk/coders/CoderRegistryTest.java | 11 -----
.../beam/sdk/coders/CollectionCoderTest.java | 8 ----
.../apache/beam/sdk/coders/CustomCoderTest.java | 46 --------------------
.../beam/sdk/coders/DelegateCoderTest.java | 36 ---------------
.../apache/beam/sdk/coders/DoubleCoderTest.java | 8 ----
.../beam/sdk/coders/InstantCoderTest.java | 8 ----
.../beam/sdk/coders/IterableCoderTest.java | 8 ----
.../org/apache/beam/sdk/coders/KvCoderTest.java | 9 ----
.../beam/sdk/coders/LengthPrefixCoderTest.java | 8 ----
.../apache/beam/sdk/coders/ListCoderTest.java | 8 ----
.../apache/beam/sdk/coders/MapCoderTest.java | 8 ----
.../beam/sdk/coders/NullableCoderTest.java | 8 ----
.../beam/sdk/coders/SerializableCoderTest.java | 8 ----
.../apache/beam/sdk/coders/SetCoderTest.java | 8 ----
.../sdk/coders/StringDelegateCoderTest.java | 6 ---
.../sdk/coders/TextualIntegerCoderTest.java | 8 ----
.../apache/beam/sdk/coders/VarIntCoderTest.java | 8 ----
.../beam/sdk/coders/VarLongCoderTest.java | 8 ----
.../apache/beam/sdk/transforms/CombineTest.java | 5 ---
.../sdk/extensions/protobuf/ProtoCoder.java | 34 ---------------
.../sdk/extensions/protobuf/ProtoCoderTest.java | 12 -----
.../sdk/io/gcp/bigquery/TableRowJsonCoder.java | 6 ---
.../io/gcp/bigquery/TableRowJsonCoderTest.java | 8 ----
.../org/apache/beam/sdk/io/xml/JAXBCoder.java | 5 ---
.../apache/beam/sdk/io/xml/JAXBCoderTest.java | 7 ---
54 files changed, 6 insertions(+), 671 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/IsmFormat.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/IsmFormat.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/IsmFormat.java
index 8b823bc..fbfe49a 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/IsmFormat.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/IsmFormat.java
@@ -624,11 +624,6 @@ public class IsmFormat {
public boolean consistentWithEquals() {
return true;
}
-
- @Override
- public String getEncodingId() {
- return "";
- }
}
/**
@@ -694,11 +689,6 @@ public class IsmFormat {
return VarInt.getLength(value.getSharedKeySize())
+ VarInt.getLength(value.getUnsharedKeySize());
}
-
- @Override
- public String getEncodingId() {
- return "";
- }
}
/**
@@ -779,10 +769,5 @@ public class IsmFormat {
throws Exception {
return Footer.FIXED_LENGTH;
}
-
- @Override
- public String getEncodingId() {
- return "";
- }
}
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/RandomAccessData.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/RandomAccessData.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/RandomAccessData.java
index 4b07ca2..66548e2 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/RandomAccessData.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/RandomAccessData.java
@@ -113,11 +113,6 @@ public class RandomAccessData {
}
return size + value.size;
}
-
- @Override
- public String getEncodingId() {
- return "";
- }
}
public static final UnsignedLexicographicalComparator UNSIGNED_LEXICOGRAPHICAL_COMPARATOR =
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/AvroCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/AvroCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/AvroCoder.java
index d60a2ca..1d7cce5 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/AvroCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/AvroCoder.java
@@ -240,39 +240,6 @@ public class AvroCoder<T> extends CustomCoder<T> {
}
/**
- * The encoding identifier is designed to support evolution as per the design of Avro
- * In order to use this class effectively, carefully read the Avro
- * documentation at
- * <a href="https://avro.apache.org/docs/1.7.7/spec.html#Schema+Resolution">Schema Resolution</a>
- * to ensure that the old and new schema <i>match</i>.
- *
- * <p>In particular, this encoding identifier is guaranteed to be the same for {@code AvroCoder}
- * instances of the same principal class, and otherwise distinct. The schema is not included
- * in the identifier.
- *
- * <p>When modifying a class to be encoded as Avro, here are some guidelines; see the above link
- * for greater detail.
- *
- * <ul>
- * <li>Avoid changing field names.
- * <li>Never remove a <code>required</code> field.
- * <li>Only add <code>optional</code> fields, with sensible defaults.
- * <li>When changing the type of a field, consult the Avro documentation to ensure the new and
- * old types are interchangeable.
- * </ul>
- *
- * <p>Code consuming this message class should be prepared to support <i>all</i> versions of
- * the class until it is certain that no remaining serialized instances exist.
- *
- * <p>If backwards incompatible changes must be made, the best recourse is to change the name
- * of your class.
- */
- @Override
- public String getEncodingId() {
- return type.getName();
- }
-
- /**
* Returns the type this coder encodes/decodes.
*/
public Class<T> getType() {
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigDecimalCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigDecimalCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigDecimalCoder.java
index 90ace99..d628203 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigDecimalCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigDecimalCoder.java
@@ -79,11 +79,6 @@ public class BigDecimalCoder extends CustomCoder<BigDecimal> {
return true;
}
- @Override
- public String getEncodingId() {
- return "";
- }
-
/**
* {@inheritDoc}
*
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigEndianIntegerCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigEndianIntegerCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigEndianIntegerCoder.java
index 8f45a56..81c5e94 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigEndianIntegerCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigEndianIntegerCoder.java
@@ -76,11 +76,6 @@ public class BigEndianIntegerCoder extends CustomCoder<Integer> {
return true;
}
- @Override
- public String getEncodingId() {
- return "";
- }
-
/**
* {@inheritDoc}
*
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigEndianLongCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigEndianLongCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigEndianLongCoder.java
index 2d47697..173e910 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigEndianLongCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigEndianLongCoder.java
@@ -78,11 +78,6 @@ public class BigEndianLongCoder extends CustomCoder<Long> {
return true;
}
- @Override
- public String getEncodingId() {
- return "";
- }
-
/**
* {@inheritDoc}
*
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigIntegerCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigIntegerCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigIntegerCoder.java
index 40331b8..a739da7 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigIntegerCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigIntegerCoder.java
@@ -69,11 +69,6 @@ public class BigIntegerCoder extends CustomCoder<BigInteger> {
return true;
}
- @Override
- public String getEncodingId() {
- return "";
- }
-
/**
* {@inheritDoc}
*
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/ByteCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/ByteCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/ByteCoder.java
index 2ef166b..1a1be64 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/ByteCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/ByteCoder.java
@@ -85,11 +85,6 @@ public class ByteCoder extends CustomCoder<Byte> {
return true;
}
- @Override
- public String getEncodingId() {
- return "";
- }
-
/**
* {@inheritDoc}
*
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/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 28d87e3..632cf89 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
@@ -27,7 +27,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
import javax.annotation.Nullable;
import org.apache.beam.sdk.annotations.Experimental;
@@ -55,9 +54,6 @@ import org.apache.beam.sdk.values.TypeDescriptor;
* inferred. See {@link KvCoder} for an example of a simple compound {@link Coder} that supports
* automatic composition in the {@link CoderRegistry}.
*
- * <p>The binary format of a {@link Coder} is identified by {@link #getEncodingId()}; be sure to
- * understand the requirements for evolving coder formats.
- *
* <p>All methods of a {@link Coder} are required to be thread safe.
*
* @param <T> the type of the values being transcoded
@@ -226,36 +222,6 @@ public interface Coder<T> extends Serializable {
throws Exception;
/**
- * An identifier for the binary format written by {@link #encode}.
- *
- * <p>This value, along with the fully qualified class name, forms an identifier for the
- * binary format of this coder. Whenever this value changes, the new encoding is considered
- * incompatible with the prior format: It is presumed that the prior version of the coder will
- * be unable to correctly read the new format and the new version of the coder will be unable to
- * correctly read the old format.
- *
- * <p>If the format is changed in a backwards-compatible way (the Coder can still accept data from
- * the prior format), such as by adding optional fields to a Protocol Buffer or Avro definition,
- * and you want a Beam runner to understand that the new coder is compatible with the prior coder,
- * this value must remain unchanged. It is then the responsibility of {@link #decode} to correctly
- * read data from the prior format.
- */
- @Experimental(Kind.CODER_ENCODING_ID)
- String getEncodingId();
-
- /**
- * A collection of encodings supported by {@link #decode} in addition to the encoding
- * from {@link #getEncodingId()} (which is assumed supported).
- *
- * <p><i>This information is not currently used for any purpose</i>. It is descriptive only,
- * and this method is subject to change.
- *
- * @see #getEncodingId()
- */
- @Experimental(Kind.CODER_ENCODING_ID)
- Collection<String> getAllowedEncodings();
-
- /**
* Returns the {@link TypeDescriptor} for the type encoded.
*/
@Experimental(Kind.CODER_TYPE_ENCODING)
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/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 2262e13..55ec2aa 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
@@ -33,8 +33,7 @@ import org.apache.beam.sdk.util.StringUtils;
* serialization.
*
* <p>To complete an implementation, subclasses must implement {@link Coder#encode}
- * and {@link Coder#decode} methods. Anonymous subclasses must furthermore override
- * {@link #getEncodingId}.
+ * and {@link Coder#decode} methods.
*
* <p>Not to be confused with {@link SerializableCoder} that encodes objects that implement the
* {@link Serializable} interface.
@@ -43,6 +42,7 @@ import org.apache.beam.sdk.util.StringUtils;
*/
public abstract class CustomCoder<T> extends StandardCoder<T>
implements Serializable {
+
@JsonCreator
@Deprecated
public static CustomCoder<?> of(
@@ -114,27 +114,6 @@ public abstract class CustomCoder<T> extends StandardCoder<T>
+ " or they are presumed nondeterministic.");
}
- /**
- * {@inheritDoc}
- *
- * @return The canonical class name for this coder. For stable data formats that are independent
- * of class name, it is recommended to override this method.
- *
- * @throws UnsupportedOperationException when an anonymous class is used, since they do not have
- * a stable canonical class name.
- */
- @Override
- public String getEncodingId() {
- if (getClass().isAnonymousClass()) {
- throw new UnsupportedOperationException(
- String.format("Anonymous CustomCoder subclass %s must override getEncodingId()."
- + " Otherwise, convert to a named class and getEncodingId() will be automatically"
- + " generated from the fully qualified class name.",
- getClass()));
- }
- return getClass().getCanonicalName();
- }
-
// This coder inherits isRegisterByteSizeObserverCheap,
// getEncodedElementByteSize and registerByteSizeObserver
// from StandardCoder. Override if we can do better.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DelegateCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DelegateCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DelegateCoder.java
index 7e1154a..de9659b 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DelegateCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DelegateCoder.java
@@ -19,13 +19,10 @@ package org.apache.beam.sdk.coders;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
import javax.annotation.Nullable;
import org.apache.beam.sdk.values.TypeDescriptor;
@@ -142,34 +139,6 @@ public final class DelegateCoder<T, IntermediateT> extends CustomCoder<T> {
.toString();
}
- /**
- * {@inheritDoc}
- *
- * @return a {@link String} composed from the underlying coder class name and its encoding id.
- * Note that this omits any description of the coding functions. These should be modified
- * with care.
- */
- @Override
- public String getEncodingId() {
- return delegateEncodingId(coder.getClass(), coder.getEncodingId());
- }
-
- /**
- * {@inheritDoc}
- *
- * @return allowed encodings which are composed from the underlying coder class and its allowed
- * encoding ids. Note that this omits any description of the coding functions. These
- * should be modified with care.
- */
- @Override
- public Collection<String> getAllowedEncodings() {
- List<String> allowedEncodings = Lists.newArrayList();
- for (String allowedEncoding : coder.getAllowedEncodings()) {
- allowedEncodings.add(delegateEncodingId(coder.getClass(), allowedEncoding));
- }
- return allowedEncodings;
- }
-
@Override
public TypeDescriptor<T> getEncodedTypeDescriptor() {
if (typeDescriptor == null) {
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DoubleCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DoubleCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DoubleCoder.java
index 8731e5a..06e7dae 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DoubleCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DoubleCoder.java
@@ -87,11 +87,6 @@ public class DoubleCoder extends CustomCoder<Double> {
return true;
}
- @Override
- public String getEncodingId() {
- return "";
- }
-
/**
* {@inheritDoc}
*
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/InstantCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/InstantCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/InstantCoder.java
index 48b7275..cfd1979 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/InstantCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/InstantCoder.java
@@ -97,11 +97,6 @@ public class InstantCoder extends CustomCoder<Instant> {
return true;
}
- @Override
- public String getEncodingId() {
- return "";
- }
-
/**
* {@inheritDoc}
*
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/MapCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/MapCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/MapCoder.java
index 74cd602..e2c4e28 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/MapCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/MapCoder.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -182,14 +181,4 @@ public class MapCoder<K, V> extends CustomCoder<Map<K, V>> {
new TypeParameter<K>() {}, keyCoder.getEncodedTypeDescriptor())
.where(new TypeParameter<V>() {}, valueCoder.getEncodedTypeDescriptor());
}
-
- @Override
- public String getEncodingId() {
- return "";
- }
-
- @Override
- public Collection<String> getAllowedEncodings() {
- return Collections.emptyList();
- }
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/NullableCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/NullableCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/NullableCoder.java
index dba2a8b..1fd9a99 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/NullableCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/NullableCoder.java
@@ -22,8 +22,6 @@ import com.google.common.collect.ImmutableList;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import javax.annotation.Nullable;
import org.apache.beam.sdk.util.common.ElementByteSizeObserver;
@@ -178,14 +176,4 @@ public class NullableCoder<T> extends CustomCoder<T> {
public TypeDescriptor<T> getEncodedTypeDescriptor() {
return valueCoder.getEncodedTypeDescriptor();
}
-
- @Override
- public String getEncodingId() {
- return "";
- }
-
- @Override
- public Collection<String> getAllowedEncodings() {
- return Collections.emptyList();
- }
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/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 d343af1..1a737ab 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
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
import java.io.OutputStream;
import java.io.Serializable;
import org.apache.beam.sdk.values.TypeDescriptor;
@@ -123,13 +122,6 @@ public class SerializableCoder<T extends Serializable> extends CustomCoder<T> {
}
}
- @Override
- public String getEncodingId() {
- return String.format("%s:%s",
- type.getName(),
- ObjectStreamClass.lookup(type).getSerialVersionUID());
- }
-
/**
* {@inheritDoc}
*
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StandardCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StandardCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StandardCoder.java
index c67fe97..f8d82a5 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StandardCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StandardCoder.java
@@ -17,18 +17,13 @@
*/
package org.apache.beam.sdk.coders;
-import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.beam.sdk.util.Structs.addList;
-import static org.apache.beam.sdk.util.Structs.addString;
-import static org.apache.beam.sdk.util.Structs.addStringList;
-import com.google.common.collect.Lists;
import com.google.common.io.ByteStreams;
import com.google.common.io.CountingOutputStream;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.apache.beam.sdk.util.CloudObject;
@@ -48,24 +43,11 @@ import org.apache.beam.sdk.values.TypeDescriptor;
* {@link #isRegisterByteSizeObserverCheap}: the
* default implementation encodes values to bytes and counts the bytes, which is considered
* expensive.</li>
- * <li>{@link #getEncodingId} and {@link #getAllowedEncodings}: by default, the encoding id
- * is the empty string, so only the canonical name of the subclass will be used for
- * compatibility checks, and no other encoding ids are allowed.</li>
* </ul>
*/
public abstract class StandardCoder<T> implements Coder<T> {
protected StandardCoder() {}
- @Override
- public String getEncodingId() {
- return "";
- }
-
- @Override
- public Collection<String> getAllowedEncodings() {
- return Collections.emptyList();
- }
-
/**
* Returns the list of {@link Coder Coders} that are components of this {@link Coder}.
*/
@@ -126,11 +108,6 @@ public abstract class StandardCoder<T> implements Coder<T> {
* <ul>
* <li>component_encodings: A list of coders represented as {@link CloudObject}s
* equivalent to the {@link #getCoderArguments}.</li>
- * <li>encoding_id: An identifier for the binary format written by {@link #encode}. See
- * {@link #getEncodingId} for further details.</li>
- * <li>allowed_encodings: A collection of encodings supported by {@link #decode} in
- * addition to the encoding from {@link #getEncodingId()} (which is assumed supported).
- * See {@link #getAllowedEncodings} for further details.</li>
* </ul>
*
* <p>{@link StandardCoder} implementations should override {@link #initializeCloudObject}
@@ -149,17 +126,6 @@ public abstract class StandardCoder<T> implements Coder<T> {
addList(result, PropertyNames.COMPONENT_ENCODINGS, cloudComponents);
}
- String encodingId = getEncodingId();
- checkNotNull(encodingId, "Coder.getEncodingId() must not return null.");
- if (!encodingId.isEmpty()) {
- addString(result, PropertyNames.ENCODING_ID, encodingId);
- }
-
- Collection<String> allowedEncodings = getAllowedEncodings();
- if (!allowedEncodings.isEmpty()) {
- addStringList(result, PropertyNames.ALLOWED_ENCODINGS, Lists.newArrayList(allowedEncodings));
- }
-
return result;
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StringDelegateCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StringDelegateCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StringDelegateCoder.java
index 51ead3c..39a1658 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StringDelegateCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StringDelegateCoder.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
import org.apache.beam.sdk.coders.DelegateCoder.CodingFunction;
import org.apache.beam.sdk.values.TypeDescriptor;
@@ -121,19 +120,6 @@ public final class StringDelegateCoder<T> extends CustomCoder<T> {
return delegateCoder.structuralValue(value);
}
- /**
- * The encoding id is the fully qualified name of the encoded/decoded class.
- */
- @Override
- public String getEncodingId() {
- return clazz.getName();
- }
-
- @Override
- public Collection<String> getAllowedEncodings() {
- return delegateCoder.getAllowedEncodings();
- }
-
@Override
public TypeDescriptor<T> getEncodedTypeDescriptor() {
return delegateCoder.getEncodedTypeDescriptor();
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/TextualIntegerCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/TextualIntegerCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/TextualIntegerCoder.java
index 817817b..91a46ea 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/TextualIntegerCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/TextualIntegerCoder.java
@@ -65,11 +65,6 @@ public class TextualIntegerCoder extends CustomCoder<Integer> {
}
@Override
- public String getEncodingId() {
- return "";
- }
-
- @Override
public TypeDescriptor<Integer> getEncodedTypeDescriptor() {
return TYPE_DESCRIPTOR;
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/VarIntCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/VarIntCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/VarIntCoder.java
index 9c654a9..fcc0335 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/VarIntCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/VarIntCoder.java
@@ -77,11 +77,6 @@ public class VarIntCoder extends CustomCoder<Integer> {
return true;
}
- @Override
- public String getEncodingId() {
- return "";
- }
-
/**
* {@inheritDoc}
*
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java
index e013c6a..bd6d86a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java
@@ -21,7 +21,6 @@ import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.emptyIterable;
import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
@@ -37,16 +36,13 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.Coder.NonDeterministicException;
import org.apache.beam.sdk.coders.CoderException;
import org.apache.beam.sdk.util.CoderUtils;
-import org.apache.beam.sdk.util.PropertyNames;
import org.apache.beam.sdk.util.SerializableUtils;
import org.apache.beam.sdk.util.Serializer;
-import org.apache.beam.sdk.util.Structs;
import org.apache.beam.sdk.util.UnownedInputStream;
import org.apache.beam.sdk.util.UnownedOutputStream;
import org.apache.beam.sdk.util.common.ElementByteSizeObserver;
@@ -224,32 +220,6 @@ public class CoderProperties {
}
/**
- * Verifies if a {@code Coder<T>}'s encodingId is equal to a given
- * encodingId.
- */
- public static <T> void coderHasEncodingId(Coder<T> coder, String encodingId) throws Exception {
- assertThat(coder.getEncodingId(), equalTo(encodingId));
- assertThat(Structs.getString(coder.asCloudObject(), PropertyNames.ENCODING_ID, ""),
- equalTo(encodingId));
- }
-
- /**
- * Verifies if a {@code Coder<T>} is allowed to encode using the given
- * encodingId.
- */
- public static <T> void coderAllowsEncoding(Coder<T> coder, String encodingId) throws Exception {
- assertThat(coder.getAllowedEncodings(), hasItem(encodingId));
- assertThat(
- String.format("Expected to find \"%s\" in property \"%s\" of %s",
- encodingId, PropertyNames.ALLOWED_ENCODINGS, coder.asCloudObject()),
- Structs.getStrings(
- coder.asCloudObject(),
- PropertyNames.ALLOWED_ENCODINGS,
- Collections.<String>emptyList()),
- hasItem(encodingId));
- }
-
- /**
* Verifies that for the given {@code Coder<T>} and values of
* type {@code T}, the structural values are equal if and only if the
* encoded bytes are equal.
@@ -309,11 +279,9 @@ public class CoderProperties {
private static final String DECODING_WIRE_FORMAT_MESSAGE =
"Decoded value from known wire format does not match expected value."
- + " This probably means that this Coder no longer correctly decodes"
- + " a prior wire format. Changing the wire formats this Coder can read"
- + " should be avoided, as it is likely to cause breakage."
- + " If you truly intend to change the backwards compatibility for this Coder "
- + " then you must remove any now-unsupported encodings from getAllowedEncodings().";
+ + " This probably means that this Coder no longer correctly decodes"
+ + " a prior wire format. Changing the wire formats this Coder can read"
+ + " should be avoided, as it is likely to cause breakage.";
public static <T> void coderDecodesBase64(Coder<T> coder, String base64Encoding, T value)
throws Exception {
@@ -334,9 +302,7 @@ public class CoderProperties {
private static final String ENCODING_WIRE_FORMAT_MESSAGE =
"Encoded value does not match expected wire format."
+ " Changing the wire format should be avoided, as it is likely to cause breakage."
- + " If you truly intend to change the wire format for this Coder "
- + " then you must update getEncodingId() to a new value and add any supported"
- + " prior formats to getAllowedEncodings()."
+ + " If you truly intend to change the wire format for this Coder,"
+ " See org.apache.beam.sdk.coders.PrintBase64Encoding for how to generate"
+ " new test data.";
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Count.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Count.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Count.java
index 34a5c57..78a6cd1 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Count.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Count.java
@@ -193,11 +193,6 @@ public class Count {
protected long getEncodedElementByteSize(long[] value, Context context) {
return VarInt.getLength(value[0]);
}
-
- @Override
- public String getEncodingId() {
- return "VarLongSingletonArray";
- }
};
}
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
index 2a78823..cbc4d24 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
@@ -240,12 +240,6 @@ public class AvroCoderTest {
}
@Test
- public void testPojoEncodingId() throws Exception {
- AvroCoder<Pojo> coder = AvroCoder.of(Pojo.class);
- CoderProperties.coderHasEncodingId(coder, Pojo.class.getName());
- }
-
- @Test
public void testGenericRecordEncoding() throws Exception {
String schemaString =
"{\"namespace\": \"example.avro\",\n"
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigDecimalCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigDecimalCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigDecimalCoderTest.java
index 9db50c8..8aa2604 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigDecimalCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigDecimalCoderTest.java
@@ -61,14 +61,6 @@ public class BigDecimalCoderTest {
}
}
- // This should never change. The definition of big endian encoding is fixed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
@@ -122,14 +114,4 @@ public class BigDecimalCoderTest {
CoderUtils.encodeToBase64(TEST_CODER, null);
}
-
- /**
- * This is a change-detector test. If this test fails, then the encoding id of
- * {@link BigDecimalCoder} must change.
- */
- @Test
- public void testCoderIdDependencies() {
- assertThat(VarIntCoder.of().getEncodingId(), equalTo(""));
- assertThat(BigIntegerCoder.of().getEncodingId(), equalTo(""));
- }
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigEndianIntegerCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigEndianIntegerCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigEndianIntegerCoderTest.java
index 1946f5a..1e98452 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigEndianIntegerCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigEndianIntegerCoderTest.java
@@ -51,14 +51,6 @@ public class BigEndianIntegerCoderTest {
}
}
- // This should never change. The definition of big endian encoding is fixed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigEndianLongCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigEndianLongCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigEndianLongCoderTest.java
index 1654967..50b40f5 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigEndianLongCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigEndianLongCoderTest.java
@@ -53,14 +53,6 @@ public class BigEndianLongCoderTest {
}
}
- // This should never change. The definition of big endian is fixed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigIntegerCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigIntegerCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigIntegerCoderTest.java
index 6ead941..e2fd012 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigIntegerCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/BigIntegerCoderTest.java
@@ -59,14 +59,6 @@ public class BigIntegerCoderTest {
}
}
- // This should never change. The definition of big endian encoding is fixed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
@@ -98,14 +90,4 @@ public class BigIntegerCoderTest {
CoderUtils.encodeToBase64(TEST_CODER, null);
}
-
- /**
- * This is a change-detector test. If this test fails, then the encoding id of
- * {@link BigIntegerCoder} must change.
- */
- @Test
- public void testCoderIdDependencies() {
- assertThat(VarIntCoder.of().getEncodingId(), equalTo(""));
- assertThat(ByteArrayCoder.of().getEncodingId(), equalTo(""));
- }
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ByteArrayCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ByteArrayCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ByteArrayCoderTest.java
index 89487d7..03889ee 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ByteArrayCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ByteArrayCoderTest.java
@@ -107,14 +107,6 @@ public class ByteArrayCoderTest {
return os.toByteArray();
}
- // If this changes, it implies the binary format has changed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ByteCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ByteCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ByteCoderTest.java
index a4ce64c..633ed55 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ByteCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ByteCoderTest.java
@@ -55,14 +55,6 @@ public class ByteCoderTest {
}
}
- // This should never change. The format is fixed by Java.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CoderRegistryTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CoderRegistryTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CoderRegistryTest.java
index 6ec258e..fe21a1c 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CoderRegistryTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CoderRegistryTest.java
@@ -30,7 +30,6 @@ import java.io.OutputStream;
import java.io.Serializable;
import java.lang.reflect.Type;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -494,16 +493,6 @@ public class CoderRegistryTest {
}
@Override
- public String getEncodingId() {
- return getClass().getName();
- }
-
- @Override
- public Collection<String> getAllowedEncodings() {
- return Collections.singletonList(getEncodingId());
- }
-
- @Override
public TypeDescriptor<MyValue> getEncodedTypeDescriptor() {
return TYPE_DESCRIPTOR;
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CollectionCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CollectionCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CollectionCoderTest.java
index d052413..925454e 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CollectionCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CollectionCoderTest.java
@@ -59,14 +59,6 @@ public class CollectionCoderTest {
}
}
- // If this becomes nonempty, it implies the binary format has changed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CustomCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CustomCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CustomCoderTest.java
index 31bbdb9..dfd4ea2 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CustomCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/CustomCoderTest.java
@@ -85,50 +85,4 @@ public class CustomCoderTest {
public void testEncodable() throws Exception {
SerializableUtils.ensureSerializable(new MyCustomCoder("key"));
}
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(new MyCustomCoder("foo"),
- MyCustomCoder.class.getCanonicalName());
- }
-
- @Test
- public void testAnonymousEncodingIdError() throws Exception {
- thrown.expect(UnsupportedOperationException.class);
- thrown.expectMessage("Anonymous CustomCoder subclass");
- thrown.expectMessage("must override getEncodingId()");
- new CustomCoder<Integer>() {
-
- @Override
- public void encode(Integer kv, OutputStream out, Context context) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Integer decode(InputStream inStream, Context context) {
- throw new UnsupportedOperationException();
- }
- }.getEncodingId();
- }
-
- @Test
- public void testAnonymousEncodingIdOk() throws Exception {
- new CustomCoder<Integer>() {
-
- @Override
- public void encode(Integer kv, OutputStream out, Context context) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Integer decode(InputStream inStream, Context context) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String getEncodingId() {
- return "A user must specify this. It can contain any character, including these: !$#%$@.";
- }
- }.getEncodingId();
- }
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/DelegateCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/DelegateCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/DelegateCoderTest.java
index 2ae7dd5..5ff272f 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/DelegateCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/DelegateCoderTest.java
@@ -28,7 +28,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -130,41 +129,6 @@ public class DelegateCoderTest implements Serializable {
public List<? extends Coder<?>> getCoderArguments() {
return Collections.emptyList();
}
-
- @Override
- public String getEncodingId() {
- return TEST_ENCODING_ID;
- }
-
- @Override
- public Collection<String> getAllowedEncodings() {
- return Collections.singletonList(TEST_ALLOWED_ENCODING);
- }
- }
-
- @Test
- public void testEncodingId() throws Exception {
- Coder<Integer> underlyingCoder = new TestAllowedEncodingsCoder();
-
- Coder<Integer> trivialDelegateCoder = DelegateCoder.of(
- underlyingCoder,
- new DelegateCoder.CodingFunction<Integer, Integer>() {
- @Override
- public Integer apply(Integer input) {
- return input;
- }
- },
- new DelegateCoder.CodingFunction<Integer, Integer>() {
- @Override
- public Integer apply(Integer input) {
- return input;
- }
- });
- CoderProperties.coderHasEncodingId(
- trivialDelegateCoder, TestAllowedEncodingsCoder.class.getName() + ":" + TEST_ENCODING_ID);
- CoderProperties.coderAllowsEncoding(
- trivialDelegateCoder,
- TestAllowedEncodingsCoder.class.getName() + ":" + TEST_ALLOWED_ENCODING);
}
@Test
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/DoubleCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/DoubleCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/DoubleCoderTest.java
index 6e21abd..679a1c7 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/DoubleCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/DoubleCoderTest.java
@@ -54,14 +54,6 @@ public class DoubleCoderTest {
}
}
- // This should never change. The format is fixed by Java.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/InstantCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/InstantCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/InstantCoderTest.java
index 8b4bc8b..eb1a898 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/InstantCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/InstantCoderTest.java
@@ -80,14 +80,6 @@ public class InstantCoderTest {
Assert.assertEquals(encodings, sortedEncodings);
}
- // If this changes, it implies that the binary format has changed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/IterableCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/IterableCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/IterableCoderTest.java
index 2eba05b..80c3a25 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/IterableCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/IterableCoderTest.java
@@ -91,14 +91,6 @@ public class IterableCoderTest {
CoderProperties.coderSerializable(TEST_CODER);
}
- // If this changes, it implies that the binary format has changed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/KvCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/KvCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/KvCoderTest.java
index 14c9b06..4aa3d27 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/KvCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/KvCoderTest.java
@@ -97,15 +97,6 @@ public class KvCoderTest {
KvCoder.of(GlobalWindow.Coder.INSTANCE, GlobalWindow.Coder.INSTANCE));
}
- // If this changes, it implies the binary format has changed!
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(
- KvCoder.of(VarIntCoder.of(), VarIntCoder.of()), EXPECTED_ENCODING_ID);
- }
-
/** Homogeneously typed test value for ease of use with the wire format test utility. */
private static final Coder<KV<String, Integer>> TEST_CODER =
KvCoder.of(StringUtf8Coder.of(), VarIntCoder.of());
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/LengthPrefixCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/LengthPrefixCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/LengthPrefixCoderTest.java
index e4564df..27ac48a 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/LengthPrefixCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/LengthPrefixCoderTest.java
@@ -107,14 +107,6 @@ public class LengthPrefixCoderTest {
}
}
- // If this changes, it implies the binary format has changed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
@Test
public void testWireFormatEncode() throws Exception {
CoderProperties.coderEncodesBase64(TEST_CODER, TEST_VALUES, TEST_ENCODINGS);
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ListCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ListCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ListCoderTest.java
index 87906e2..35239d6 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ListCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/ListCoderTest.java
@@ -88,14 +88,6 @@ public class ListCoderTest {
CoderProperties.coderSerializable(TEST_CODER);
}
- // If this changes, it implies the binary format has changed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/MapCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/MapCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/MapCoderTest.java
index 2983ea4..a52e6cb 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/MapCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/MapCoderTest.java
@@ -81,14 +81,6 @@ public class MapCoderTest {
assertNull(components);
}
- // If this changes, it implies the binary format has changed!
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java
index b76c037..894d2d1 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java
@@ -73,14 +73,6 @@ public class NullableCoderTest {
CoderProperties.coderSerializable(NullableCoder.of(GlobalWindow.Coder.INSTANCE));
}
- // If this changes, it implies the binary format has changed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@code PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/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 ec4b74c..ef6df34 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
@@ -225,14 +225,6 @@ public class SerializableCoderTest implements Serializable {
}
@Test
- public void testPojoEncodingId() throws Exception {
- Coder<MyRecord> coder = SerializableCoder.of(MyRecord.class);
- CoderProperties.coderHasEncodingId(
- coder,
- String.format("%s:%s", MyRecord.class.getName(), MyRecord.serialVersionUID));
- }
-
- @Test
public void testEncodedTypeDescriptor() throws Exception {
assertThat(
SerializableCoder.of(MyRecord.class).getEncodedTypeDescriptor(),
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SetCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SetCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SetCoderTest.java
index 7515553..3bf5041 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SetCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/SetCoderTest.java
@@ -60,14 +60,6 @@ public class SetCoderTest {
}
}
- // If this changes, it implies the binary format has changed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StringDelegateCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StringDelegateCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StringDelegateCoderTest.java
index f2d376d..e972f07 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StringDelegateCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StringDelegateCoderTest.java
@@ -68,12 +68,6 @@ public class StringDelegateCoderTest {
}
@Test
- public void testEncodingId() throws Exception {
- StringDelegateCoder<URI> coder = StringDelegateCoder.of(URI.class);
- CoderProperties.coderHasEncodingId(coder, URI.class.getName());
- }
-
- @Test
public void testEncodedTypeDescriptor() throws Exception {
assertThat(
StringDelegateCoder.of(URI.class).getEncodedTypeDescriptor(),
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/TextualIntegerCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/TextualIntegerCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/TextualIntegerCoderTest.java
index 09e1e01..1068c5f 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/TextualIntegerCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/TextualIntegerCoderTest.java
@@ -51,14 +51,6 @@ public class TextualIntegerCoderTest {
}
}
- // This should never change. The textual representation of an integer is fixed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/VarIntCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/VarIntCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/VarIntCoderTest.java
index be134b8..c6d961b 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/VarIntCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/VarIntCoderTest.java
@@ -51,14 +51,6 @@ public class VarIntCoderTest {
}
}
- // If this changes, it implies the binary format has changed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/VarLongCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/VarLongCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/VarLongCoderTest.java
index f4a5280..81e78d9 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/VarLongCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/VarLongCoderTest.java
@@ -53,14 +53,6 @@ public class VarLongCoderTest {
}
}
- // If this changes, it implies the binary format has changed.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
index e51ee16..a5f3df2 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
@@ -937,11 +937,6 @@ public class CombineTest implements Serializable {
throws CoderException, IOException {
return new Accumulator(StringUtf8Coder.of().decode(inStream, context));
}
-
- @Override
- public String getEncodingId() {
- return "CombineTest.TestKeyedCombineFn.getAccumulatorCoder()";
- }
};
}
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoCoder.java b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoCoder.java
index a1841a1..9ec7aec 100644
--- a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoCoder.java
+++ b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoCoder.java
@@ -217,40 +217,6 @@ public class ProtoCoder<T extends Message> extends CustomCoder<T> {
return Objects.hash(protoMessageClass, extensionHostClasses);
}
- /**
- * The encoding identifier is designed to support evolution as per the design of Protocol
- * Buffers. In order to use this class effectively, carefully follow the advice in the Protocol
- * Buffers documentation at
- * <a href="https://developers.google.com/protocol-buffers/docs/proto#updating">Updating
- * A Message Type</a>.
- *
- * <p>In particular, the encoding identifier is guaranteed to be the same for {@link ProtoCoder}
- * instances of the same principal message class, with the same registered extension host classes,
- * and otherwise distinct. Note that the encoding ID does not encode any version of the message
- * or extensions, nor does it include the message schema.
- *
- * <p>When modifying a message class, here are the broadest guidelines; see the above link
- * for greater detail.
- *
- * <ul>
- * <li>Do not change the numeric tags for any fields.
- * <li>Never remove a <code>required</code> field.
- * <li>Only add <code>optional</code> or <code>repeated</code> fields, with sensible defaults.
- * <li>When changing the type of a field, consult the Protocol Buffers documentation to ensure
- * the new and old types are interchangeable.
- * </ul>
- *
- * <p>Code consuming this message class should be prepared to support <i>all</i> versions of
- * the class until it is certain that no remaining serialized instances exist.
- *
- * <p>If backwards incompatible changes must be made, the best recourse is to change the name
- * of your Protocol Buffers message class.
- */
- @Override
- public String getEncodingId() {
- return protoMessageClass.getName() + getSortedExtensionClasses().toString();
- }
-
@Override
public void verifyDeterministic() throws NonDeterministicException {
ProtobufUtil.verifyDeterministic(this);
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ProtoCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ProtoCoderTest.java b/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ProtoCoderTest.java
index a8c6a81..6d00b86 100644
--- a/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ProtoCoderTest.java
+++ b/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ProtoCoderTest.java
@@ -124,18 +124,6 @@ public class ProtoCoderTest {
}
@Test
- public void testEncodingId() throws Exception {
- Coder<MessageA> coderA = ProtoCoder.of(MessageA.class);
- CoderProperties.coderHasEncodingId(coderA, MessageA.class.getName() + "[]");
-
- ProtoCoder<MessageC> coder =
- ProtoCoder.of(MessageC.class).withExtensionsFrom(Proto2CoderTestMessages.class);
- CoderProperties.coderHasEncodingId(
- coder,
- String.format("%s[%s]", MessageC.class.getName(), Proto2CoderTestMessages.class.getName()));
- }
-
- @Test
public void encodeNullThrowsCoderException() throws Exception {
thrown.expect(CoderException.class);
thrown.expectMessage("cannot encode a null MessageA");
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoder.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoder.java
index e5f8591..a1ca41b 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoder.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoder.java
@@ -86,10 +86,4 @@ public class TableRowJsonCoder extends CustomCoder<TableRow> {
public TypeDescriptor<TableRow> getEncodedTypeDescriptor() {
return TYPE_DESCRIPTOR;
}
-
- @Override
- public String getEncodingId() {
- return "";
- }
-
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoderTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoderTest.java
index f6e02dc..1fb97f5 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoderTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowJsonCoderTest.java
@@ -65,14 +65,6 @@ public class TableRowJsonCoderTest {
}
}
- // This identifier should only change if the JSON format of results from the BigQuery API changes.
- private static final String EXPECTED_ENCODING_ID = "";
-
- @Test
- public void testEncodingId() throws Exception {
- CoderProperties.coderHasEncodingId(TEST_CODER, EXPECTED_ENCODING_ID);
- }
-
/**
* Generated data to check that the wire format has not changed. To regenerate, see
* {@link org.apache.beam.sdk.coders.PrintBase64Encodings}.
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/JAXBCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/JAXBCoder.java b/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/JAXBCoder.java
index 1e2e07c..812bc70 100644
--- a/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/JAXBCoder.java
+++ b/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/JAXBCoder.java
@@ -135,11 +135,6 @@ public class JAXBCoder<T> extends CustomCoder<T> {
}
@Override
- public String getEncodingId() {
- return getJAXBClass().getName();
- }
-
- @Override
public TypeDescriptor<T> getEncodedTypeDescriptor() {
return TypeDescriptor.of(jaxbClass);
}
http://git-wip-us.apache.org/repos/asf/beam/blob/d3b399fa/sdks/java/io/xml/src/test/java/org/apache/beam/sdk/io/xml/JAXBCoderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/xml/src/test/java/org/apache/beam/sdk/io/xml/JAXBCoderTest.java b/sdks/java/io/xml/src/test/java/org/apache/beam/sdk/io/xml/JAXBCoderTest.java
index 276c231..940d596 100644
--- a/sdks/java/io/xml/src/test/java/org/apache/beam/sdk/io/xml/JAXBCoderTest.java
+++ b/sdks/java/io/xml/src/test/java/org/apache/beam/sdk/io/xml/JAXBCoderTest.java
@@ -213,13 +213,6 @@ public class JAXBCoderTest {
}
@Test
- public void testEncodingId() throws Exception {
- Coder<TestType> coder = JAXBCoder.of(TestType.class);
- CoderProperties.coderHasEncodingId(
- coder, TestType.class.getName());
- }
-
- @Test
public void testEncodedTypeDescriptor() throws Exception {
assertThat(
JAXBCoder.of(TestType.class).getEncodedTypeDescriptor(),