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 2016/12/12 21:24:05 UTC
[1/2] incubator-beam git commit: This closes #1568
Repository: incubator-beam
Updated Branches:
refs/heads/master 98543e96f -> 5d619e8e3
This closes #1568
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/5d619e8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/5d619e8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/5d619e8e
Branch: refs/heads/master
Commit: 5d619e8e305f5da259ab128d67a06e59ea618145
Parents: 98543e9 8f52b5e
Author: Thomas Groh <tg...@google.com>
Authored: Mon Dec 12 13:23:52 2016 -0800
Committer: Thomas Groh <tg...@google.com>
Committed: Mon Dec 12 13:23:52 2016 -0800
----------------------------------------------------------------------
.../beam/sdk/transforms/AppliedPTransform.java | 75 ++++----------------
1 file changed, 15 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-beam git commit: Migrate AppliedPTransform to use
AutoValue
Posted by tg...@apache.org.
Migrate AppliedPTransform to use AutoValue
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/8f52b5e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/8f52b5e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/8f52b5e1
Branch: refs/heads/master
Commit: 8f52b5e1214061a9cbd2bd2c44f68c22102d9737
Parents: 98543e9
Author: Thomas Groh <tg...@google.com>
Authored: Fri Dec 9 15:34:25 2016 -0800
Committer: Thomas Groh <tg...@google.com>
Committed: Mon Dec 12 13:23:52 2016 -0800
----------------------------------------------------------------------
.../beam/sdk/transforms/AppliedPTransform.java | 75 ++++----------------
1 file changed, 15 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8f52b5e1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/AppliedPTransform.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/AppliedPTransform.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/AppliedPTransform.java
index d80c116..77de54a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/AppliedPTransform.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/AppliedPTransform.java
@@ -17,8 +17,7 @@
*/
package org.apache.beam.sdk.transforms;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
+import com.google.auto.value.AutoValue;
import org.apache.beam.sdk.values.PInput;
import org.apache.beam.sdk.values.POutput;
@@ -32,70 +31,26 @@ import org.apache.beam.sdk.values.POutput;
* @param <OutputT> transform output type
* @param <TransformT> transform type
*/
-public class AppliedPTransform
+@AutoValue
+public abstract class AppliedPTransform
<InputT extends PInput, OutputT extends POutput,
TransformT extends PTransform<? super InputT, OutputT>> {
- private final String fullName;
- private final InputT input;
- private final OutputT output;
- private final TransformT transform;
-
- private AppliedPTransform(String fullName, InputT input, OutputT output, TransformT transform) {
- this.input = input;
- this.output = output;
- this.transform = transform;
- this.fullName = fullName;
+ public static <
+ InputT extends PInput,
+ OutputT extends POutput,
+ TransformT extends PTransform<? super InputT, OutputT>>
+ AppliedPTransform<InputT, OutputT, TransformT> of(
+ String fullName, InputT input, OutputT output, TransformT transform) {
+ return new AutoValue_AppliedPTransform<InputT, OutputT, TransformT>(
+ fullName, input, output, transform);
}
- public static <InputT extends PInput, OutputT extends POutput,
- TransformT extends PTransform<? super InputT, OutputT>>
- AppliedPTransform<InputT, OutputT, TransformT> of(
- String fullName, InputT input, OutputT output, TransformT transform) {
- return new AppliedPTransform<InputT, OutputT, TransformT>(fullName, input, output, transform);
- }
+ public abstract String getFullName();
- public String getFullName() {
- return fullName;
- }
+ public abstract InputT getInput();
- public InputT getInput() {
- return input;
- }
+ public abstract OutputT getOutput();
- public OutputT getOutput() {
- return output;
- }
-
- public TransformT getTransform() {
- return transform;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(getFullName(), getInput(), getOutput(), getTransform());
- }
-
- @Override
- public boolean equals(Object other) {
- if (other instanceof AppliedPTransform) {
- AppliedPTransform<?, ?, ?> that = (AppliedPTransform<?, ?, ?>) other;
- return Objects.equal(this.getFullName(), that.getFullName())
- && Objects.equal(this.getInput(), that.getInput())
- && Objects.equal(this.getOutput(), that.getOutput())
- && Objects.equal(this.getTransform(), that.getTransform());
- } else {
- return false;
- }
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("fullName", getFullName())
- .add("input", getInput())
- .add("output", getOutput())
- .add("transform", getTransform())
- .toString();
- }
+ public abstract TransformT getTransform();
}