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 2019/08/02 08:12:15 UTC
[camel] branch master updated (acabd92 -> 22fd657)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from acabd92 Removed unused imports
new b18db26 CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Undertow
new 6dfd3cf CAMEL-13801 - Fixed CS for Camel-Undertow
new b6c4233 Removed unused imports
new 22fd657 Camel-Undertow: Added camel-mock as test dependency
The 4 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:
components/camel-undertow/pom.xml | 5 +++
.../camel/component/undertow/BaseUndertowTest.java | 10 ++---
.../undertow/UndertowHttpProducerSessionTest.java | 16 ++++----
.../undertow/rest/RestUndertowHttpGetTest.java | 12 ++----
.../rest/RestUndertowHttpGetWildcardsTest.java | 43 ++++++++--------------
5 files changed, 35 insertions(+), 51 deletions(-)
[camel] 03/04: Removed unused imports
Posted by ac...@apache.org.
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
commit b6c42338a8dc023907f15606941a4a7bc3b342dc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 09:47:25 2019 +0200
Removed unused imports
---
.../test/java/org/apache/camel/component/undertow/BaseUndertowTest.java | 1 -
.../apache/camel/component/undertow/UndertowHttpProducerSessionTest.java | 1 -
.../apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java | 1 -
.../camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java | 1 -
4 files changed, 4 deletions(-)
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
index e754612..d689037 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.BeforeClass;
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
index 34c6b78..00a4b10 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.http.common.cookie.ExchangeCookieHandler;
import org.apache.camel.http.common.cookie.InstanceCookieHandler;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.BeforeClass;
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java
index 98087e5..01a403b 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.component.undertow.DefaultUndertowHttpBinding;
import org.apache.camel.component.undertow.UndertowHttpBinding;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
public class RestUndertowHttpGetTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
index 4676ec1..148b66e 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.component.undertow.DefaultUndertowHttpBinding;
import org.apache.camel.component.undertow.UndertowHttpBinding;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
public class RestUndertowHttpGetWildcardsTest extends BaseUndertowTest {
[camel] 02/04: CAMEL-13801 - Fixed CS for Camel-Undertow
Posted by ac...@apache.org.
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
commit 6dfd3cfb281bad79f9f19d1f311c468e42864a24
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 09:38:37 2019 +0200
CAMEL-13801 - Fixed CS for Camel-Undertow
---
.../rest/RestUndertowHttpGetWildcardsTest.java | 36 +++++++++-------------
1 file changed, 14 insertions(+), 22 deletions(-)
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
index 61857b8..4676ec1 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
@@ -27,9 +27,9 @@ import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
public class RestUndertowHttpGetWildcardsTest extends BaseUndertowTest {
-
- @BindToRegistry("mybinding")
- private UndertowHttpBinding binding = new DefaultUndertowHttpBinding();
+
+ @BindToRegistry("mybinding")
+ private UndertowHttpBinding binding = new DefaultUndertowHttpBinding();
@Test
public void testProducerGet() throws Exception {
@@ -52,25 +52,17 @@ public class RestUndertowHttpGetWildcardsTest extends BaseUndertowTest {
restConfiguration().component("undertow").host("localhost").port(getPort()).endpointProperty("undertowHttpBinding", "#mybinding");
// use the rest DSL to define the rest services
- rest("/users/")
- .get("{id}/{query}")
- .route()
- .to("log:query")
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- String id = exchange.getIn().getHeader("id", String.class);
- exchange.getOut().setBody(id + ";Goofy");
- }
- }).endRest()
- .get("{id}/basic")
- .route()
- .to("log:input")
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- String id = exchange.getIn().getHeader("id", String.class);
- exchange.getOut().setBody(id + ";Donald Duck");
- }
- }).endRest();
+ rest("/users/").get("{id}/{query}").route().to("log:query").process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ String id = exchange.getIn().getHeader("id", String.class);
+ exchange.getOut().setBody(id + ";Goofy");
+ }
+ }).endRest().get("{id}/basic").route().to("log:input").process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ String id = exchange.getIn().getHeader("id", String.class);
+ exchange.getOut().setBody(id + ";Donald Duck");
+ }
+ }).endRest();
}
};
}
[camel] 01/04: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-Undertow
Posted by ac...@apache.org.
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
commit b18db26c165d3e33b834c089e3f7ed0cfe7c02a2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 09:37:23 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Undertow
---
.../apache/camel/component/undertow/BaseUndertowTest.java | 9 ++++-----
.../undertow/UndertowHttpProducerSessionTest.java | 15 +++++++--------
.../component/undertow/rest/RestUndertowHttpGetTest.java | 11 ++++-------
.../undertow/rest/RestUndertowHttpGetWildcardsTest.java | 10 +++-------
4 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
index bc1e245..e754612 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.undertow;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.impl.JndiRegistry;
@@ -55,15 +56,13 @@ public class BaseUndertowTest extends CamelTestSupport {
return context;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("prop")
+ public Properties loadProperties() throws Exception {
Properties prop = new Properties();
prop.setProperty("port", "" + getPort());
prop.setProperty("port2", "" + getPort2());
- jndi.bind("prop", prop);
- return jndi;
+ return prop;
}
protected int getNextPort() {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
index 0a96806..34c6b78 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.component.undertow;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -29,6 +30,12 @@ import org.junit.Test;
public class UndertowHttpProducerSessionTest extends CamelTestSupport {
private static volatile int port;
+
+ @BindToRegistry("instanceCookieHandler")
+ private InstanceCookieHandler instanceCookieHandler = new InstanceCookieHandler();
+
+ @BindToRegistry("exchangeCookieHandler")
+ private ExchangeCookieHandler exchangeCookieHandler = new ExchangeCookieHandler();
@BeforeClass
public static void initPort() throws Exception {
@@ -59,14 +66,6 @@ public class UndertowHttpProducerSessionTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndiRegistry = super.createRegistry();
- jndiRegistry.bind("instanceCookieHandler", new InstanceCookieHandler());
- jndiRegistry.bind("exchangeCookieHandler", new ExchangeCookieHandler());
- return jndiRegistry;
- }
-
private String getTestServerEndpointSessionUrl() {
// session handling will not work for localhost
return "http://127.0.0.1:" + port + "/session";
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java
index d11a08b..98087e5 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.undertow.rest;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -27,13 +28,9 @@ import org.junit.Test;
public class RestUndertowHttpGetTest extends BaseUndertowTest {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- UndertowHttpBinding binding = new DefaultUndertowHttpBinding();
- jndi.bind("mybinding", binding);
- return jndi;
- }
+ @BindToRegistry("mybinding")
+ private UndertowHttpBinding binding = new DefaultUndertowHttpBinding();
+
@Test
public void testProducerGet() throws Exception {
String out = template.requestBody("undertow:http://localhost:{{port}}/users/123/basic", null, String.class);
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
index 5334e6f..61857b8 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.undertow.rest;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -27,13 +28,8 @@ import org.junit.Test;
public class RestUndertowHttpGetWildcardsTest extends BaseUndertowTest {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- UndertowHttpBinding binding = new DefaultUndertowHttpBinding();
- jndi.bind("mybinding", binding);
- return jndi;
- }
+ @BindToRegistry("mybinding")
+ private UndertowHttpBinding binding = new DefaultUndertowHttpBinding();
@Test
public void testProducerGet() throws Exception {
[camel] 04/04: Camel-Undertow: Added camel-mock as test dependency
Posted by ac...@apache.org.
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
commit 22fd657281ddf12b1d51c1a671de4ecd4ec040df
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 10:11:43 2019 +0200
Camel-Undertow: Added camel-mock as test dependency
---
components/camel-undertow/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index adf7c10..7b6c959 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -91,6 +91,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-swagger-java</artifactId>
<scope>test</scope>
</dependency>