You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/12/12 13:57:53 UTC
[camel] branch sandbox/camel-3.x updated (40dcb32 -> 1cc299a)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 40dcb32 CAMEL-12935:Deprecated isCreateCamelContextPerClass not supported / in-use for blueprint (#2663)
new 755b639 Fixed typo in docs
new 62bffc7 Added a little test for redelivery in NatsConsumer
new 1cc299a Fixed CS in NATS test
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-core/src/main/docs/rest-dsl.adoc | 4 +--
...st.java => NatsConsumerWithRedeliveryTest.java} | 40 +++++++++++++++++++---
2 files changed, 38 insertions(+), 6 deletions(-)
copy components/camel-nats/src/test/java/org/apache/camel/component/nats/{NatsConsumerTest.java => NatsConsumerWithRedeliveryTest.java} (50%)
[camel] 02/03: Added a little test for redelivery in NatsConsumer
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 62bffc7e12e796ea77a1f1f05f4b73ed095b0ccc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 12 14:39:03 2018 +0100
Added a little test for redelivery in NatsConsumer
---
.../nats/NatsConsumerWithRedeliveryTest.java | 80 ++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
new file mode 100644
index 0000000..cac5149
--- /dev/null
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.nats;
+
+import java.io.IOException;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.Predicate;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+import io.nats.client.Message;
+
+public class NatsConsumerWithRedeliveryTest extends NatsTestSupport {
+
+ private static final int REDELIVERY_COUNT = 2;
+
+ @EndpointInject(uri = "mock:result")
+ protected MockEndpoint mockResultEndpoint;
+
+ @EndpointInject(uri = "mock:exception")
+ private MockEndpoint exception;
+
+ @Test
+ public void testConsumer() throws InterruptedException, IOException {
+ mockResultEndpoint.setExpectedMessageCount(1);
+ mockResultEndpoint.setAssertPeriod(1000);
+
+ template.requestBody("direct:send", "test");
+ template.requestBody("direct:send", "golang");
+
+ exception.setExpectedMessageCount(1);
+
+ exception.assertIsSatisfied();
+
+ mockResultEndpoint.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(Exception.class).maximumRedeliveries(REDELIVERY_COUNT).retryAttemptedLogLevel(LoggingLevel.INFO).retriesExhaustedLogLevel(LoggingLevel.ERROR)
+ .redeliveryDelay(10).to("mock:exception").handled(true);
+
+ from("direct:send").to("nats://" + getNatsUrl() + "?topic=test&flushConnection=true");
+ from("nats://" + getNatsUrl() + "?topic=test&flushConnection=true").choice().when(new Predicate() {
+
+ @Override
+ public boolean matches(Exchange exchange) {
+ Message g = exchange.getIn().getBody(Message.class);
+ String s = new String(g.getData());
+ if (s.contains("test"))
+ return true;
+ return false;
+ }
+ }).throwException(RuntimeCamelException.class, "Test for this").end().to(mockResultEndpoint);
+ }
+ };
+ }
+}
[camel] 03/03: Fixed CS in NATS test
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1cc299a6b17d8393063a9fccea34d0238f59f7ee
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 12 14:48:39 2018 +0100
Fixed CS in NATS test
---
.../camel/component/nats/NatsConsumerWithRedeliveryTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
index cac5149..0c8cf88 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.nats;
import java.io.IOException;
+import io.nats.client.Message;
+
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
@@ -27,8 +29,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-import io.nats.client.Message;
-
public class NatsConsumerWithRedeliveryTest extends NatsTestSupport {
private static final int REDELIVERY_COUNT = 2;
@@ -69,8 +69,9 @@ public class NatsConsumerWithRedeliveryTest extends NatsTestSupport {
public boolean matches(Exchange exchange) {
Message g = exchange.getIn().getBody(Message.class);
String s = new String(g.getData());
- if (s.contains("test"))
+ if (s.contains("test")) {
return true;
+ }
return false;
}
}).throwException(RuntimeCamelException.class, "Test for this").end().to(mockResultEndpoint);
[camel] 01/03: Fixed typo in docs
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 755b639606872f72fbf6ee48ecf900b47205a528
Author: Bilgin Ibryam <bi...@gmail.com>
AuthorDate: Wed Dec 12 12:53:17 2018 +0000
Fixed typo in docs
---
camel-core/src/main/docs/rest-dsl.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-core/src/main/docs/rest-dsl.adoc b/camel-core/src/main/docs/rest-dsl.adoc
index b5e4fce..5d552aa 100644
--- a/camel-core/src/main/docs/rest-dsl.adoc
+++ b/camel-core/src/main/docs/rest-dsl.adoc
@@ -207,7 +207,7 @@ the <<simple-language,Simple>> language, but it has more power than so.
=== Embedding Camel routes
-Each of the rest service becomes a Camel route, so in the first example
+Each of the rest services becomes a Camel route, so in the first example
we have 2 x get and 1 x post REST service, which each become a Camel
route. And we have 2 regular Camel routes, meaning we have 3 + 2 = 5
routes in total.
@@ -258,7 +258,7 @@ today.
=== Managing Rest services
-Each of the rest service becomes a Camel route, so in the first example
+Each of the rest services becomes a Camel route, so in the first example
we have 2 x get and 1 x post REST service, which each become a Camel
route. This makes it _the same_ from Camel to manage and run these
services - as they are just Camel routes. This means any tooling and API