Repository: beam Updated Branches: refs/heads/master cd2bcaf67 -> a8d76603b
[BEAM-1871] Drop usage of Jackson/CloudObject from CoGbkResultSchema Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/eae58ab1 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/eae58ab1 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/eae58ab1 Branch: refs/heads/master Commit: eae58ab1597f1006c088a4bc74d4df2be0da77aa Parents: cd2bcaf Author: Luke Cwik <[email protected]> Authored: Wed Apr 26 12:41:07 2017 -0700 Committer: Luke Cwik <[email protected]> Committed: Wed Apr 26 14:19:05 2017 -0700 ---------------------------------------------------------------------- .../sdk/transforms/join/CoGbkResultSchema.java | 21 +------------------- 1 file changed, 1 insertion(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/eae58ab1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResultSchema.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResultSchema.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResultSchema.java index 276cccb..b4c7ba0 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResultSchema.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResultSchema.java @@ -17,16 +17,9 @@ */ package org.apache.beam.sdk.transforms.join; -import static org.apache.beam.sdk.util.Structs.addList; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.apache.beam.sdk.util.CloudObject; -import org.apache.beam.sdk.util.PropertyNames; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.TupleTagList; @@ -41,9 +34,7 @@ public class CoGbkResultSchema implements Serializable { private final TupleTagList tupleTagList; - @JsonCreator - public static CoGbkResultSchema of( - @JsonProperty(PropertyNames.TUPLE_TAGS) List<TupleTag<?>> tags) { + public static CoGbkResultSchema of(List<TupleTag<?>> tags) { TupleTagList tupleTags = TupleTagList.empty(); for (TupleTag<?> tag : tags) { tupleTags = tupleTags.and(tag); @@ -99,16 +90,6 @@ public class CoGbkResultSchema implements Serializable { return tupleTagList; } - public CloudObject asCloudObject() { - CloudObject result = CloudObject.forClass(getClass()); - List<CloudObject> serializedTags = new ArrayList<>(tupleTagList.size()); - for (TupleTag<?> tag : tupleTagList.getAll()) { - serializedTags.add(tag.asCloudObject()); - } - addList(result, PropertyNames.TUPLE_TAGS, serializedTags); - return result; - } - @Override public boolean equals(Object obj) { if (obj == this) {
