Repository: camel Updated Branches: refs/heads/master dcd99d14c -> 7ef6217df
Fix Producer to return correct response Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ef6217d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ef6217d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ef6217d Branch: refs/heads/master Commit: 7ef6217dfd51e08b957679f00a42b1900be2411c Parents: dcd99d1 Author: David Simansky <dsima...@redhat.com> Authored: Wed Jul 15 15:41:00 2015 +0200 Committer: David Simansky <dsima...@redhat.com> Committed: Thu Jul 16 13:22:10 2015 +0200 ---------------------------------------------------------------------- .../camel/component/undertow/UndertowProducer.java | 3 ++- .../component/undertow/UndertowComponentTest.java | 6 +++--- .../component/undertow/UndertowSharedPortTest.java | 16 +++++++--------- 3 files changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7ef6217d/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java index e1330d7..d139ce4 100644 --- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java +++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java @@ -43,7 +43,7 @@ import org.xnio.XnioWorker; /** * The Undertow producer. - * <p/> + * * The implementation of Producer is considered as experimental. The Undertow client classes are not thread safe, * their purpose is for the reverse proxy usage inside Undertow itself. This may change in the future versions and * general purpose HTTP client wrapper will be added. Therefore this Producer may be changed too. @@ -72,6 +72,7 @@ public class UndertowProducer extends DefaultAsyncProducer { ClientRequest request = new ClientRequest(); request.setProtocol(Protocols.HTTP_1_1); + request.setPath(endpoint.getHttpURI().getPath()); Object body = getRequestBody(request, exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/7ef6217d/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java index 1262a38..99f35c1 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java @@ -29,8 +29,8 @@ public class UndertowComponentTest extends BaseUndertowTest { @Test public void testUndertow() throws Exception { MockEndpoint mockEndpoint = getMockEndpoint("mock:myapp"); - mockEndpoint.expectedHeaderReceived(Exchange.HTTP_METHOD, "GET"); - LOG.debug("Number of exchanges in mock:myapp" + mockEndpoint.getExchanges().size()); + mockEndpoint.expectedHeaderReceived(Exchange.HTTP_METHOD, "POST"); + LOG.debug("Number of exchanges in mock:myapp " + mockEndpoint.getExchanges().size()); String response = template.requestBody("undertow:http://localhost:{{port}}/myapp";, "Hello Camel!", String.class); assertNotNull(response); @@ -39,7 +39,7 @@ public class UndertowComponentTest extends BaseUndertowTest { mockEndpoint.assertIsSatisfied(); for (Exchange exchange : mockEndpoint.getExchanges()) { - assertEquals("Hello Camel! Bye Camel!", exchange.getIn().getBody(String.class)); + assertEquals("Bye Camel!", exchange.getIn().getBody(String.class)); } } http://git-wip-us.apache.org/repos/asf/camel/blob/7ef6217d/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java ---------------------------------------------------------------------- diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java index 1ffdb9e..22165fa 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java @@ -37,21 +37,19 @@ public class UndertowSharedPortTest extends BaseUndertowTest { } private void testPath(String pathSuffix) throws InterruptedException { - String response = template.requestBody("undertow://http://localhost:{{port}}/"; + pathSuffix, "Hello Camel!", String.class); + MockEndpoint mockEndpoint = getMockEndpoint("mock:" + pathSuffix); + mockEndpoint.expectedHeaderReceived(Exchange.HTTP_METHOD, "POST"); + LOG.debug("Number of exchanges in mock:myapp " + mockEndpoint.getExchanges().size()); + String response = template.requestBody("undertow:http://localhost:{{port}}/"; + pathSuffix, "Hello Camel!", String.class); assertNotNull(response); + assertEquals("Bye Camel! " + pathSuffix, response); - assertEquals("Hello Camel!", response); - - MockEndpoint mockEndpoint = getMockEndpoint("mock:" + pathSuffix); - mockEndpoint.expectedHeaderReceived(Exchange.HTTP_METHOD, "GET"); - LOG.debug("Number of exchanges in mock:" + pathSuffix + mockEndpoint.getExchanges().size()); + mockEndpoint.assertIsSatisfied(); for (Exchange exchange : mockEndpoint.getExchanges()) { - assertEquals("Hello Camel! Bye Camel! " + pathSuffix, exchange.getIn().getBody(String.class)); + assertEquals("Bye Camel! " + pathSuffix, exchange.getIn().getBody(String.class)); } - - mockEndpoint.assertIsSatisfied(); } @Override
