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/25 22:57:08 UTC
[2/3] beam git commit: Make Most StandardCoders CustomCoders
http://git-wip-us.apache.org/repos/asf/beam/blob/cbcec7c0/sdks/java/io/hadoop-common/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/hadoop-common/pom.xml b/sdks/java/io/hadoop-common/pom.xml
index ad31ded..ebb4b39 100644
--- a/sdks/java/io/hadoop-common/pom.xml
+++ b/sdks/java/io/hadoop-common/pom.xml
@@ -37,11 +37,6 @@
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/beam/blob/cbcec7c0/sdks/java/io/hadoop-common/src/main/java/org/apache/beam/sdk/io/hadoop/WritableCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/hadoop-common/src/main/java/org/apache/beam/sdk/io/hadoop/WritableCoder.java b/sdks/java/io/hadoop-common/src/main/java/org/apache/beam/sdk/io/hadoop/WritableCoder.java
index 0ba367d..9589fb1 100644
--- a/sdks/java/io/hadoop-common/src/main/java/org/apache/beam/sdk/io/hadoop/WritableCoder.java
+++ b/sdks/java/io/hadoop-common/src/main/java/org/apache/beam/sdk/io/hadoop/WritableCoder.java
@@ -17,18 +17,16 @@
*/
package org.apache.beam.sdk.io.hadoop;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.Collections;
import java.util.List;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
-import org.apache.beam.sdk.coders.StandardCoder;
-import org.apache.beam.sdk.util.CloudObject;
+import org.apache.beam.sdk.coders.CustomCoder;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Writable;
@@ -45,7 +43,7 @@ import org.apache.hadoop.io.Writable;
*
* @param <T> the type of elements handled by this coder.
*/
-public class WritableCoder<T extends Writable> extends StandardCoder<T> {
+public class WritableCoder<T extends Writable> extends CustomCoder<T> {
private static final long serialVersionUID = 0L;
/**
@@ -56,18 +54,6 @@ public class WritableCoder<T extends Writable> extends StandardCoder<T> {
return new WritableCoder<>(clazz);
}
- @JsonCreator
- @SuppressWarnings("unchecked")
- public static WritableCoder<?> of(@JsonProperty("type") String classType)
- throws ClassNotFoundException {
- Class<?> clazz = Class.forName(classType);
- if (!Writable.class.isAssignableFrom(clazz)) {
- throw new ClassNotFoundException(
- "Class " + classType + " does not implement Writable");
- }
- return of((Class<? extends Writable>) clazz);
- }
-
private final Class<T> type;
public WritableCoder(Class<T> type) {
@@ -97,14 +83,7 @@ public class WritableCoder<T extends Writable> extends StandardCoder<T> {
@Override
public List<Coder<?>> getCoderArguments() {
- return null;
- }
-
- @Override
- public CloudObject initializeCloudObject() {
- CloudObject result = CloudObject.forClass(getClass());
- result.put("type", type.getName());
- return result;
+ return Collections.emptyList();
}
@Override
http://git-wip-us.apache.org/repos/asf/beam/blob/cbcec7c0/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 5f1330d..276c231 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
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
-import org.apache.beam.sdk.coders.StandardCoder;
+import org.apache.beam.sdk.coders.CustomCoder;
import org.apache.beam.sdk.coders.VarIntCoder;
import org.apache.beam.sdk.coders.VarLongCoder;
import org.apache.beam.sdk.testing.CoderProperties;
@@ -171,7 +171,7 @@ public class JAXBCoderTest {
/**
* A coder that surrounds the value with two values, to demonstrate nesting.
*/
- private static class TestCoder extends StandardCoder<TestType> {
+ private static class TestCoder extends CustomCoder<TestType> {
private final JAXBCoder<TestType> jaxbCoder;
public TestCoder(JAXBCoder<TestType> jaxbCoder) {
this.jaxbCoder = jaxbCoder;