This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 610e1d6 Camel-google-pubsub: Polished
610e1d6 is described below
commit 610e1d6cb41332b8c1ebca12352722d0fa34a6ca
Author: Andrea Cosentino <[email protected]>
AuthorDate: Fri Mar 29 10:25:19 2019 +0100
Camel-google-pubsub: Polished
---
.../component/google/pubsub/integration/AckModeNoneTest.java | 6 +++---
.../google/pubsub/integration/AcknowledgementTest.java | 10 +++++-----
.../component/google/pubsub/integration/BodyTypesTest.java | 12 ++++++------
.../pubsub/integration/GroupedExchangeRoundtripTest.java | 10 +++++-----
.../pubsub/integration/SingleExchangeRoundtripTest.java | 12 ++++++------
.../component/google/pubsub/unit/PubsubProducerTest.java | 4 ++--
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java
index 2722e0d..3e5f134 100644
---
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java
+++
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java
@@ -35,13 +35,13 @@ public class AckModeNoneTest extends PubsubTestSupport {
private static final String TOPIC_NAME = "ackNoneTopic";
private static final String SUBSCRIPTION_NAME = "ackNoneSub";
- @EndpointInject(uri = "direct:in")
+ @EndpointInject("direct:in")
private Endpoint directIn;
- @EndpointInject(uri = "google-pubsub:{{project.id}}:" + TOPIC_NAME)
+ @EndpointInject("google-pubsub:{{project.id}}:" + TOPIC_NAME)
private Endpoint pubsubTopic;
- @EndpointInject(uri = "google-pubsub:{{project.id}}:"
+ @EndpointInject("google-pubsub:{{project.id}}:"
+ SUBSCRIPTION_NAME
+ "?ackMode=NONE")
private Endpoint pubsubSub;
diff --git
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java
index 8ef3d00..ef60839 100644
---
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java
+++
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java
@@ -34,19 +34,19 @@ public class AcknowledgementTest extends PubsubTestSupport {
private static final String SUBSCRIPTION_NAME = "failureSub";
private static Boolean fail = false;
- @EndpointInject(uri = "direct:in")
+ @EndpointInject("direct:in")
private Endpoint directIn;
- @EndpointInject(uri = "google-pubsub:{{project.id}}:" + TOPIC_NAME)
+ @EndpointInject("google-pubsub:{{project.id}}:" + TOPIC_NAME)
private Endpoint pubsubTopic;
- @EndpointInject(uri = "google-pubsub:{{project.id}}:" + SUBSCRIPTION_NAME)
+ @EndpointInject("google-pubsub:{{project.id}}:" + SUBSCRIPTION_NAME)
private Endpoint pubsubSubscription;
- @EndpointInject(uri = "mock:receiveResult")
+ @EndpointInject("mock:receiveResult")
private MockEndpoint receiveResult;
- @Produce(uri = "direct:in")
+ @Produce("direct:in")
private ProducerTemplate producer;
@BeforeClass
diff --git
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/BodyTypesTest.java
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/BodyTypesTest.java
index 1e61bb6..60144ce 100644
---
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/BodyTypesTest.java
+++
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/BodyTypesTest.java
@@ -40,22 +40,22 @@ public class BodyTypesTest extends PubsubTestSupport {
private static final String TOPIC_NAME = "typesSend";
private static final String SUBSCRIPTION_NAME = "TypesReceive";
- @EndpointInject(uri = "direct:from")
+ @EndpointInject("direct:from")
private Endpoint directIn;
- @EndpointInject(uri = "google-pubsub:{{project.id}}:" + TOPIC_NAME)
+ @EndpointInject("google-pubsub:{{project.id}}:" + TOPIC_NAME)
private Endpoint pubsubTopic;
- @EndpointInject(uri = "mock:sendResult")
+ @EndpointInject("mock:sendResult")
private MockEndpoint sendResult;
- @EndpointInject(uri = "google-pubsub:{{project.id}}:" + SUBSCRIPTION_NAME)
+ @EndpointInject("google-pubsub:{{project.id}}:" + SUBSCRIPTION_NAME)
private Endpoint pubsubSubscription;
- @EndpointInject(uri = "mock:receiveResult")
+ @EndpointInject("mock:receiveResult")
private MockEndpoint receiveResult;
- @Produce(uri = "direct:from")
+ @Produce("direct:from")
private ProducerTemplate producer;
@BeforeClass
diff --git
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java
index 8ed34e5..b0e6a0d 100644
---
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java
+++
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java
@@ -35,19 +35,19 @@ public class GroupedExchangeRoundtripTest extends
PubsubTestSupport {
private static final String TOPIC_NAME = "groupTopic";
private static final String SUBSCRIPTION_NAME = "groupSubscription";
- @EndpointInject(uri = "direct:aggregator")
+ @EndpointInject("direct:aggregator")
private Endpoint aggregator;
- @EndpointInject(uri = "google-pubsub:{{project.id}}:" + TOPIC_NAME)
+ @EndpointInject("google-pubsub:{{project.id}}:" + TOPIC_NAME)
private Endpoint topic;
- @EndpointInject(uri = "mock:sendResult")
+ @EndpointInject("mock:sendResult")
private MockEndpoint sendResult;
- @EndpointInject(uri = "google-pubsub:{{project.id}}:" + SUBSCRIPTION_NAME)
+ @EndpointInject("google-pubsub:{{project.id}}:" + SUBSCRIPTION_NAME)
private Endpoint pubsubSubscription;
- @EndpointInject(uri = "mock:receiveResult")
+ @EndpointInject("mock:receiveResult")
private MockEndpoint receiveResult;
@Produce(uri = "direct:aggregator")
diff --git
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java
index a6419ba..adaa9ee 100644
---
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java
+++
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java
@@ -37,22 +37,22 @@ public class SingleExchangeRoundtripTest extends
PubsubTestSupport {
private static final String TOPIC_NAME = "singleSend";
private static final String SUBSCRIPTION_NAME = "singleReceive";
- @EndpointInject(uri = "direct:from")
+ @EndpointInject("direct:from")
private Endpoint directIn;
- @EndpointInject(uri = "google-pubsub:{{project.id}}:" + TOPIC_NAME)
+ @EndpointInject("google-pubsub:{{project.id}}:" + TOPIC_NAME)
private Endpoint pubsubTopic;
- @EndpointInject(uri = "mock:sendResult")
+ @EndpointInject("mock:sendResult")
private MockEndpoint sendResult;
- @EndpointInject(uri = "google-pubsub:{{project.id}}:" + SUBSCRIPTION_NAME)
+ @EndpointInject("google-pubsub:{{project.id}}:" + SUBSCRIPTION_NAME)
private Endpoint pubsubSubscription;
- @EndpointInject(uri = "mock:receiveResult")
+ @EndpointInject("mock:receiveResult")
private MockEndpoint receiveResult;
- @Produce(uri = "direct:from")
+ @Produce("direct:from")
private ProducerTemplate producer;
@BeforeClass
diff --git
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/unit/PubsubProducerTest.java
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/unit/PubsubProducerTest.java
index a08e5fa..cc0eb7e 100644
---
a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/unit/PubsubProducerTest.java
+++
b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/unit/PubsubProducerTest.java
@@ -28,10 +28,10 @@ public class PubsubProducerTest extends PubsubTestSupport {
private static final String TEST_TOPIC_NAME = "test-topic-name";
- @EndpointInject(uri = "google-pubsub:{{project.id}}:" + TEST_TOPIC_NAME)
+ @EndpointInject("google-pubsub:{{project.id}}:" + TEST_TOPIC_NAME)
private Endpoint to;
- @EndpointInject(uri = "direct:from")
+ @EndpointInject("direct:from")
private Endpoint from;
@Test