Repository: incubator-beam Updated Branches: refs/heads/master 493c04faa -> b29bb1b80
BEAM-651: Rename setTypeDescriptorInternal to setTypeDescriptor Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/a37068dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/a37068dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/a37068dd Branch: refs/heads/master Commit: a37068dd96aaf2f8b8aa8e86f802dd5da8ee8381 Parents: 493c04f Author: Neelesh Srinivas Salian <[email protected]> Authored: Tue Dec 6 03:58:01 2016 -0800 Committer: Kenneth Knowles <[email protected]> Committed: Tue Dec 6 08:34:48 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/beam/runners/core/SplittableParDo.java | 2 +- .../beam/runners/direct/ParDoSingleViaMultiOverrideFactory.java | 2 +- .../beam/runners/dataflow/transforms/DataflowGroupByKeyTest.java | 2 +- .../beam/runners/dataflow/transforms/DataflowViewTest.java | 2 +- .../core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java | 4 ++-- .../src/main/java/org/apache/beam/sdk/values/PCollection.java | 4 ++-- .../main/java/org/apache/beam/sdk/values/PCollectionTuple.java | 2 +- .../src/main/java/org/apache/beam/sdk/values/TypedPValue.java | 2 +- .../test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java | 2 +- .../src/test/java/org/apache/beam/sdk/transforms/ViewTest.java | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a37068dd/runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDo.java ---------------------------------------------------------------------- diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDo.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDo.java index a633111..78f373b 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDo.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDo.java @@ -259,7 +259,7 @@ public class SplittableParDo<InputT, OutputT, RestrictionT> input.isBounded().and(signature.isBoundedPerElement())); // Set output type descriptor similarly to how ParDo.BoundMulti does it. - outputs.get(mainOutputTag).setTypeDescriptorInternal(fn.getOutputTypeDescriptor()); + outputs.get(mainOutputTag).setTypeDescriptor(fn.getOutputTypeDescriptor()); return outputs; } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a37068dd/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoSingleViaMultiOverrideFactory.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoSingleViaMultiOverrideFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoSingleViaMultiOverrideFactory.java index f220a46..7f2de66 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoSingleViaMultiOverrideFactory.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoSingleViaMultiOverrideFactory.java @@ -61,7 +61,7 @@ class ParDoSingleViaMultiOverrideFactory<InputT, OutputT> .withOutputTags(mainOutputTag, TupleTagList.empty())); PCollection<OutputT> output = outputs.get(mainOutputTag); - output.setTypeDescriptorInternal(underlyingParDo.getNewFn().getOutputTypeDescriptor()); + output.setTypeDescriptor(underlyingParDo.getNewFn().getOutputTypeDescriptor()); return output; } } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a37068dd/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/transforms/DataflowGroupByKeyTest.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/transforms/DataflowGroupByKeyTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/transforms/DataflowGroupByKeyTest.java index 6d5a63a..bb84d98 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/transforms/DataflowGroupByKeyTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/transforms/DataflowGroupByKeyTest.java @@ -97,7 +97,7 @@ public class DataflowGroupByKeyTest { input.getPipeline(), WindowingStrategy.globalDefault(), PCollection.IsBounded.UNBOUNDED) - .setTypeDescriptorInternal(new TypeDescriptor<KV<String, Integer>>() {}); + .setTypeDescriptor(new TypeDescriptor<KV<String, Integer>>() {}); } }); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a37068dd/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/transforms/DataflowViewTest.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/transforms/DataflowViewTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/transforms/DataflowViewTest.java index 2eddcf7..ed3f2cd 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/transforms/DataflowViewTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/transforms/DataflowViewTest.java @@ -86,7 +86,7 @@ public class DataflowViewTest { input.getPipeline(), WindowingStrategy.globalDefault(), PCollection.IsBounded.UNBOUNDED) - .setTypeDescriptorInternal(new TypeDescriptor<KV<String, Integer>>() {}); + .setTypeDescriptor(new TypeDescriptor<KV<String, Integer>>() {}); } }) .apply(view); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a37068dd/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java index 9453294..ba6e644 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java @@ -803,7 +803,7 @@ public class ParDo { input.getPipeline(), input.getWindowingStrategy(), input.isBounded()) - .setTypeDescriptorInternal(getOldFn().getOutputTypeDescriptor()); + .setTypeDescriptor(getOldFn().getOutputTypeDescriptor()); } @Override @@ -1065,7 +1065,7 @@ public class ParDo { // The fn will likely be an instance of an anonymous subclass // such as DoFn<Integer, String> { }, thus will have a high-fidelity // TypeDescriptor for the output type. - outputs.get(mainOutputTag).setTypeDescriptorInternal(getOldFn().getOutputTypeDescriptor()); + outputs.get(mainOutputTag).setTypeDescriptor(getOldFn().getOutputTypeDescriptor()); return outputs; } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a37068dd/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollection.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollection.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollection.java index ca3f0ba..b69185b 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollection.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollection.java @@ -202,8 +202,8 @@ public class PCollection<T> extends TypedPValue<T> { * etc., to provide more detailed reflective information. */ @Override - public PCollection<T> setTypeDescriptorInternal(TypeDescriptor<T> typeDescriptor) { - super.setTypeDescriptorInternal(typeDescriptor); + public PCollection<T> setTypeDescriptor(TypeDescriptor<T> typeDescriptor) { + super.setTypeDescriptor(typeDescriptor); return this; } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a37068dd/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionTuple.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionTuple.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionTuple.java index f6776f0..727d882 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionTuple.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionTuple.java @@ -219,7 +219,7 @@ public class PCollectionTuple implements PInput, POutput { TypeDescriptor<Object> token = (TypeDescriptor<Object>) outputTag.getTypeDescriptor(); PCollection<Object> outputCollection = PCollection .createPrimitiveOutputInternal(pipeline, windowingStrategy, isBounded) - .setTypeDescriptorInternal(token); + .setTypeDescriptor(token); pcollectionMap.put(outputTag, outputCollection); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a37068dd/sdks/java/core/src/main/java/org/apache/beam/sdk/values/TypedPValue.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/TypedPValue.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/TypedPValue.java index 0387f0a..7afd0a1 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/TypedPValue.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/TypedPValue.java @@ -119,7 +119,7 @@ public abstract class TypedPValue<T> extends PValueBase implements PValue { * reflective type information will lead to better {@link Coder} * inference. */ - public TypedPValue<T> setTypeDescriptorInternal(TypeDescriptor<T> typeDescriptor) { + public TypedPValue<T> setTypeDescriptor(TypeDescriptor<T> typeDescriptor) { this.typeDescriptor = typeDescriptor; return this; } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a37068dd/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java index bea0e2d..535ffec 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/GroupByKeyTest.java @@ -311,7 +311,7 @@ public class GroupByKeyTest { input.getPipeline(), WindowingStrategy.globalDefault(), PCollection.IsBounded.UNBOUNDED) - .setTypeDescriptorInternal(new TypeDescriptor<KV<String, Integer>>() {}); + .setTypeDescriptor(new TypeDescriptor<KV<String, Integer>>() {}); } }); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a37068dd/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ViewTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ViewTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ViewTest.java index 69b6186..fe2d125 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ViewTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ViewTest.java @@ -1365,7 +1365,7 @@ public class ViewTest implements Serializable { input.getPipeline(), WindowingStrategy.globalDefault(), PCollection.IsBounded.UNBOUNDED) - .setTypeDescriptorInternal(new TypeDescriptor<KV<String, Integer>>() {}); + .setTypeDescriptor(new TypeDescriptor<KV<String, Integer>>() {}); } }) .apply(view);
