You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by jk...@apache.org on 2017/04/29 22:31:55 UTC
[3/9] beam git commit: Remove override of topic by subscription and
vice versa
Remove override of topic by subscription and vice versa
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/9e815485
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/9e815485
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/9e815485
Branch: refs/heads/master
Commit: 9e815485b979b99b190c4acf1098ab054492ae9e
Parents: 5d8fbc4
Author: Eugene Kirpichov <ki...@google.com>
Authored: Thu Apr 27 17:04:58 2017 -0700
Committer: Eugene Kirpichov <ki...@google.com>
Committed: Sat Apr 29 13:15:48 2017 -0700
----------------------------------------------------------------------
.../org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java | 4 ----
.../apache/beam/sdk/io/gcp/pubsub/PubsubIOTest.java | 13 ++++++++-----
2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/9e815485/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java
index 20aed6d..69a5bd6 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java
@@ -534,8 +534,6 @@ public class PubsubIO {
return toBuilder()
.setSubscriptionProvider(
NestedValueProvider.of(subscription, new SubscriptionTranslator()))
- /* reset topic to null */
- .setTopicProvider(null)
.build();
}
@@ -564,8 +562,6 @@ public class PubsubIO {
}
return toBuilder()
.setTopicProvider(NestedValueProvider.of(topic, new TopicTranslator()))
- /* reset subscription to null */
- .setSubscriptionProvider(null)
.build();
}
http://git-wip-us.apache.org/repos/asf/beam/blob/9e815485/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIOTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIOTest.java
index f44fffc..69d989f 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIOTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIOTest.java
@@ -146,16 +146,19 @@ public class PubsubIOTest {
public void testPrimitiveReadDisplayData() {
DisplayDataEvaluator evaluator = DisplayDataEvaluator.create();
Set<DisplayData> displayData;
- PubsubIO.Read<String> read = PubsubIO.<String>read().withCoder(StringUtf8Coder.of());
+ PubsubIO.Read<String> baseRead = PubsubIO.<String>read().withCoder(StringUtf8Coder.of());
// Reading from a subscription.
- read = read.fromSubscription("projects/project/subscriptions/subscription");
+ PubsubIO.Read<String> read =
+ baseRead.fromSubscription("projects/project/subscriptions/subscription");
displayData = evaluator.displayDataForPrimitiveSourceTransforms(read);
- assertThat("PubsubIO.Read should include the subscription in its primitive display data",
- displayData, hasItem(hasDisplayItem("subscription")));
+ assertThat(
+ "PubsubIO.Read should include the subscription in its primitive display data",
+ displayData,
+ hasItem(hasDisplayItem("subscription")));
// Reading from a topic.
- read = read.fromTopic("projects/project/topics/topic");
+ read = baseRead.fromTopic("projects/project/topics/topic");
displayData = evaluator.displayDataForPrimitiveSourceTransforms(read);
assertThat("PubsubIO.Read should include the topic in its primitive display data",
displayData, hasItem(hasDisplayItem("topic")));