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 <[email protected]> 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 {
