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 4458fd7aa7a557733514a41dd228fec9c0d288cf
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Jul 29 10:22:10 2019 +0200
Camel-Jetty: Use BindToRegistry wherever possible
---
.../org/apache/camel/component/jetty/BaseJettyTest.java | 10 +++++-----
.../apache/camel/component/jetty/CustomFiltersTest.java | 9 ++++-----
.../org/apache/camel/component/jetty/HandlerTest.java | 13 ++++---------
.../camel/component/jetty/HttpAuthMethodPriorityTest.java | 13 +++++--------
.../jetty/HttpBasicAuthComponentConfiguredTest.java | 11 +++--------
.../apache/camel/component/jetty/HttpBasicAuthTest.java | 11 +++--------
.../apache/camel/component/jetty/HttpBindingRefTest.java | 15 +++++++--------
.../camel/component/jetty/HttpFilterCamelHeadersTest.java | 11 ++++-------
.../camel/component/jetty/HttpGZipEncodingTest.java | 3 ++-
.../apache/camel/component/jetty/HttpUrlRewriteTest.java | 11 ++++-------
.../jetty/HttpsRouteSslContextParametersInUriTest.java | 10 ++++------
.../jetty/MultiPartFormWithCustomFilterTest.java | 11 ++++-------
.../component/jetty/rest/RestJettyDefaultValueTest.java | 9 +++------
.../jetty/rest/RestJettyGetCustomHttpBindingTest.java | 12 +++++-------
.../camel/component/jetty/rest/RestJettyGetToDTest.java | 9 +++------
.../component/jetty/rest/RestJettyGetWildcardsTest.java | 11 ++++-------
16 files changed, 64 insertions(+), 105 deletions(-)
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
index 02298a1..b630238 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
@@ -15,9 +15,11 @@
* limitations under the License.
*/
package org.apache.camel.component.jetty;
+
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.http.common.HttpHeaderFilterStrategy;
@@ -50,15 +52,13 @@ public abstract class BaseJettyTest extends
CamelTestSupport {
return context;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("prop")
+ public Properties loadProp() 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-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
index 452d0a8..8d5cdc1 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
@@ -28,6 +28,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -86,13 +87,11 @@ public class CustomFiltersTest extends BaseJettyTest {
sendRequestAndVerify("http://localhost:"; + getPort() + "/testFilters");
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("myFilters")
+ public List<Filter> loadFilter() throws Exception {
List<Filter> filters = new ArrayList<>();
filters.add(new MyTestFilter());
- jndi.bind("myFilters", filters);
- return jndi;
+ return filters;
}
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
index c81aaa8..2e5195a 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
@@ -20,6 +20,7 @@ import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -29,8 +30,11 @@ import org.eclipse.jetty.server.handler.StatisticsHandler;
import org.junit.Test;
public class HandlerTest extends BaseJettyTest {
+ @BindToRegistry("statisticsHandler1")
private StatisticsHandler statisticsHandler1 = new StatisticsHandler();
+ @BindToRegistry("statisticsHandler2")
private StatisticsHandler statisticsHandler2 = new StatisticsHandler();
+ @BindToRegistry("statisticsHandler3")
private StatisticsHandler statisticsHandler3 = new StatisticsHandler();
private String htmlResponse = "<html><body>Book 123 is Camel in
Action</body></html>";
@@ -90,15 +94,6 @@ public class HandlerTest extends BaseJettyTest {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("statisticsHandler1", statisticsHandler1);
- jndi.bind("statisticsHandler2", statisticsHandler2);
- jndi.bind("statisticsHandler3", statisticsHandler3);
- return jndi;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
index 84ef7d1..d3662cb 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
@@ -22,11 +22,13 @@ import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.rest.MyCustomHttpBinding;
import org.apache.camel.http.common.HttpOperationFailedException;
import org.apache.camel.impl.JndiRegistry;
import org.eclipse.jetty.security.ConstraintMapping;
@@ -40,14 +42,9 @@ import org.junit.Test;
@Ignore
public class HttpAuthMethodPriorityTest extends BaseJettyTest {
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myAuthHandler", getSecurityHandler());
- return jndi;
- }
- private SecurityHandler getSecurityHandler() throws IOException {
+
+ @BindToRegistry("myAuthHandler")
+ public SecurityHandler getSecurityHandler() throws IOException {
Constraint constraint = new Constraint(Constraint.__BASIC_AUTH,
"user");
constraint.setAuthenticate(true);
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
index 0281ccd..4f188dc 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -38,14 +39,8 @@ import org.junit.Test;
public class HttpBasicAuthComponentConfiguredTest extends BaseJettyTest {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myAuthHandler", getSecurityHandler());
- return jndi;
- }
-
- private SecurityHandler getSecurityHandler() throws IOException {
+ @BindToRegistry("myAuthHandler")
+ public SecurityHandler getSecurityHandler() throws IOException {
Constraint constraint = new Constraint(Constraint.__BASIC_AUTH,
"user");
constraint.setAuthenticate(true);
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
index afdc7fd..240da90 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
@@ -38,14 +39,8 @@ import org.junit.Test;
public class HttpBasicAuthTest extends BaseJettyTest {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myAuthHandler", getSecurityHandler());
- return jndi;
- }
-
- private SecurityHandler getSecurityHandler() throws IOException {
+ @BindToRegistry("myAuthHandler")
+ public SecurityHandler getSecurityHandler() throws IOException {
Constraint constraint = new Constraint(Constraint.__BASIC_AUTH,
"user");
constraint.setAuthenticate(true);
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
index 089779b..6b162b8 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -32,6 +33,12 @@ import org.junit.Test;
*/
public class HttpBindingRefTest extends BaseJettyTest {
+ @BindToRegistry("default")
+ private DefaultHttpBinding binding = new DefaultHttpBinding();
+
+ @BindToRegistry("myownbinder")
+ private MyHttpBinding bindingHttp = new MyHttpBinding();
+
@Test
public void testDefaultHttpBinding() throws Exception {
Object out =
template.requestBody("http://localhost:{{port}}/myapp/myservice";, "Hello
World");
@@ -45,14 +52,6 @@ public class HttpBindingRefTest extends BaseJettyTest {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("default", new DefaultHttpBinding());
- jndi.bind("myownbinder", new MyHttpBinding());
- return jndi;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java
index 50635cf..c97483a 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jetty;
import java.util.Map;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -26,6 +27,9 @@ import org.junit.Test;
public class HttpFilterCamelHeadersTest extends BaseJettyTest {
+ @BindToRegistry("foo")
+ private MyFooBean bean = new MyFooBean();
+
@Test
public void testFilterCamelHeaders() throws Exception {
Exchange out = template.send("http://localhost:{{port}}/test/filter";,
new Processor() {
@@ -52,13 +56,6 @@ public class HttpFilterCamelHeadersTest extends
BaseJettyTest {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("foo", new MyFooBean());
- return jndi;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
index 35f4d8a..bedf757 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http4.HttpClientConfigurer;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
import org.apache.http.impl.client.HttpClientBuilder;
import org.junit.Ignore;
import org.junit.Test;
@@ -75,7 +76,7 @@ public class HttpGZipEncodingTest extends BaseJettyTest {
errorHandler(noErrorHandler());
- context.getRegistry(JndiRegistry.class).bind("configurer", new
HttpClientConfigurer() {
+ context.getRegistry(Registry.class).bind("configurer", new
HttpClientConfigurer() {
@Override
public void configureHttpClient(HttpClientBuilder
clientBuilder) {
clientBuilder.disableContentCompression();
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpUrlRewriteTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpUrlRewriteTest.java
index e21a7d3..1a0ec13 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpUrlRewriteTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpUrlRewriteTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jetty;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -26,13 +27,9 @@ public class HttpUrlRewriteTest extends BaseJettyTest {
private int port1;
private int port2;
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myRewrite", new MyUrlRewrite());
- return jndi;
- }
+
+ @BindToRegistry("myRewrite")
+ private MyUrlRewrite urlRew = new MyUrlRewrite();
@Test
public void testUrlRewrite() throws Exception {
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java
index ab49896..c0b2a54 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jetty;
import java.net.URISyntaxException;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -28,8 +29,8 @@ import org.apache.camel.support.jsse.SSLContextParameters;
public class HttpsRouteSslContextParametersInUriTest extends HttpsRouteTest {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
+ @BindToRegistry("sslContextParameters")
+ public SSLContextParameters loadSSLParams() throws Exception {
KeyStoreParameters ksp = new KeyStoreParameters();
ksp.setResource(this.getClass().getClassLoader().getResource("jsse/localhost.ks").toString());
ksp.setPassword(pwd);
@@ -41,10 +42,7 @@ public class HttpsRouteSslContextParametersInUriTest extends
HttpsRouteTest {
SSLContextParameters sslContextParameters = new SSLContextParameters();
sslContextParameters.setKeyManagers(kmp);
- JndiRegistry registry = super.createRegistry();
- registry.bind("sslContextParameters", sslContextParameters);
-
- return registry;
+ return sslContextParameters;
}
@Override
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
index 4a5face..fa4cffd 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
@@ -26,6 +26,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.attachment.AttachmentMessage;
@@ -42,6 +43,9 @@ import org.junit.Test;
public class MultiPartFormWithCustomFilterTest extends BaseJettyTest {
+ @BindToRegistry("myMultipartFilter")
+ private MyMultipartFilter multipartFilter = new MyMultipartFilter();
+
private static class MyMultipartFilter extends MultiPartFilter {
@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
@@ -94,13 +98,6 @@ public class MultiPartFormWithCustomFilterTest extends
BaseJettyTest {
assertEquals("Get a wrong response status", 200, status);
assertNotNull("Did not use custom multipart filter",
httppost.getResponseHeader("MyMultipartFilter"));
}
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myMultipartFilter", new MyMultipartFilter());
- return jndi;
- }
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java
index 035116e..08a53a0 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jetty.rest;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -28,12 +29,8 @@ import org.junit.Test;
public class RestJettyDefaultValueTest extends BaseJettyTest {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("mybinding", new JettyRestHttpBinding());
- return jndi;
- }
+ @BindToRegistry("mybinding")
+ private JettyRestHttpBinding binding = new JettyRestHttpBinding();
@Test
public void testDefaultValue() throws Exception {
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCustomHttpBindingTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCustomHttpBindingTest.java
index 5e308bb..e5a6f03 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCustomHttpBindingTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCustomHttpBindingTest.java
@@ -16,21 +16,19 @@
*/
package org.apache.camel.component.jetty.rest;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
+import org.apache.camel.component.jetty.JettyRestHttpBinding;
import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
public class RestJettyGetCustomHttpBindingTest extends BaseJettyTest {
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("mybinding", new MyCustomHttpBinding("I was here;"));
- return jndi;
- }
+
+ @BindToRegistry("mybinding")
+ private JettyRestHttpBinding binding = new MyCustomHttpBinding("I was
here;");
@Test
public void testJettyProducerGet() throws Exception {
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java
index 8a8de99..d224b7a 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jetty.rest;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -26,12 +27,8 @@ import org.junit.Test;
public class RestJettyGetToDTest extends BaseJettyTest {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("mybinding", new JettyRestHttpBinding());
- return jndi;
- }
+ @BindToRegistry("mybinding")
+ private JettyRestHttpBinding binding = new JettyRestHttpBinding();
@Test
public void testJettyProducerGet() throws Exception {
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetWildcardsTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetWildcardsTest.java
index 4143c3d..6188c3f 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetWildcardsTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetWildcardsTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jetty.rest;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -25,13 +26,9 @@ import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
public class RestJettyGetWildcardsTest extends BaseJettyTest {
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("mybinding", new JettyRestHttpBinding());
- return jndi;
- }
+
+ @BindToRegistry("mybinding")
+ private JettyRestHttpBinding binding = new JettyRestHttpBinding();
@Test
public void testJettyProducerGet() throws Exception {
