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/07/31 07:31:14 UTC

[camel] branch master updated (6e8c162 -> 6f45265)

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 6e8c162  Removed unused imports
     new e902288  CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Saxon
     new cb49bfd  Removed unused imports
     new 0306efb  Camel-Servlet: Added camel-mock as dependency test
     new eddbf1b  CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Servlet
     new c5ae24a  CAMEL-13801 - Fixed CS for Camel-Servlet
     new 6f45265  Removed unused imports

The 6 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:
 .../component/xquery/XQueryWithExtensionTest.java  | 11 +++---
 components/camel-servlet/pom.xml                   |  5 +++
 .../component/servlet/rest/RestServletGetTest.java | 31 ++++++---------
 .../servlet/rest/RestServletGetWildcardsTest.java  | 45 ++++++++--------------
 .../rest/RestServletMethodNotAllowedTest.java      | 31 ++++++---------
 .../servlet/rest/RestServletOptionsTest.java       | 25 ++++--------
 6 files changed, 58 insertions(+), 90 deletions(-)


[camel] 04/06: CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Servlet

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 eddbf1b8c892024e1999143bbc6b42169aa2dd8a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 09:27:07 2019 +0200

    CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Servlet
---
 .../camel/component/servlet/rest/RestServletGetTest.java     | 10 ++++------
 .../component/servlet/rest/RestServletGetWildcardsTest.java  | 10 ++++------
 .../servlet/rest/RestServletMethodNotAllowedTest.java        | 12 +++++-------
 .../camel/component/servlet/rest/RestServletOptionsTest.java | 10 ++++------
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
index 3faf043..537d100 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
@@ -20,6 +20,8 @@ import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 import com.meterware.servletunit.ServletUnitClient;
+
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -30,12 +32,8 @@ import org.junit.Test;
 
 public class RestServletGetTest extends ServletCamelRouterTestSupport {
     
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry jndi = super.createRegistry();
-        jndi.bind("myBinding", new ServletRestHttpBinding());
-        return jndi;
-    }
+	@BindToRegistry("myBinding")
+    private ServletRestHttpBinding restHttpBinding = new ServletRestHttpBinding();
 
     @Test
     public void testServletProducerGet() throws Exception {
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
index 7e32a3d..6ef25f0 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
@@ -20,6 +20,8 @@ import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 import com.meterware.servletunit.ServletUnitClient;
+
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -30,12 +32,8 @@ import org.junit.Test;
 
 public class RestServletGetWildcardsTest extends ServletCamelRouterTestSupport {
     
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry jndi = super.createRegistry();
-        jndi.bind("myBinding", new ServletRestHttpBinding());
-        return jndi;
-    }
+	@BindToRegistry("myBinding")
+    private ServletRestHttpBinding restHttpBinding = new ServletRestHttpBinding();
 
     @Test
     public void testServletProducerGet() throws Exception {
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
index 3ba0105..fd8b18c 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
@@ -20,6 +20,8 @@ import com.meterware.httpunit.PostMethodWebRequest;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 import com.meterware.servletunit.ServletUnitClient;
+
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -29,13 +31,9 @@ import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class RestServletMethodNotAllowedTest extends ServletCamelRouterTestSupport {
-    
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry jndi = super.createRegistry();
-        jndi.bind("myBinding", new ServletRestHttpBinding());
-        return jndi;
-    }
+	
+	@BindToRegistry("myBinding")
+    private ServletRestHttpBinding restHttpBinding = new ServletRestHttpBinding();
 
     @Test
     public void testServletMethodNotAllowed() throws Exception {
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
index 25d2e71..4215dc9 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.servlet.rest;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 import com.meterware.servletunit.ServletUnitClient;
+
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.servlet.ServletCamelRouterTestSupport;
 import org.apache.camel.component.servlet.ServletRestHttpBinding;
@@ -27,12 +29,8 @@ import org.junit.Test;
 
 public class RestServletOptionsTest extends ServletCamelRouterTestSupport {
     
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry jndi = super.createRegistry();
-        jndi.bind("myBinding", new ServletRestHttpBinding());
-        return jndi;
-    }
+	@BindToRegistry("myBinding")
+    private ServletRestHttpBinding restHttpBinding = new ServletRestHttpBinding();
 
     @Test
     public void testServletOptions() throws Exception {


[camel] 02/06: 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 cb49bfd36cfa097062a8b2b40746a1971bc3e8d3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 09:22:20 2019 +0200

    Removed unused imports
---
 .../java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java
index aee3f14..c74727b 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java
@@ -30,7 +30,6 @@ import net.sf.saxon.value.StringValue;
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 


[camel] 01/06: CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Saxon

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 e902288076537e6dcad69f8b4163bff2e8359cdc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 09:22:00 2019 +0200

    CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Saxon
---
 .../apache/camel/component/xquery/XQueryWithExtensionTest.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java
index 827dc21..aee3f14 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java
@@ -26,6 +26,8 @@ import net.sf.saxon.om.StructuredQName;
 import net.sf.saxon.trans.XPathException;
 import net.sf.saxon.value.SequenceType;
 import net.sf.saxon.value.StringValue;
+
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
@@ -36,15 +38,13 @@ public class XQueryWithExtensionTest extends CamelTestSupport {
 
     private Configuration conf;
 
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry jndi = super.createRegistry();
+    @BindToRegistry("saxonConf")
+    public Configuration loadConf() throws Exception {
 
         conf = new Configuration();
         conf.registerExtensionFunction(new SimpleExtension());
 
-        jndi.bind("saxonConf", conf);
-        return jndi;
+        return conf;
     }
 
     @Test


[camel] 06/06: 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 6f452656a294307c7e27f2619c918a14e3919644
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 09:30:53 2019 +0200

    Removed unused imports
---
 .../java/org/apache/camel/component/servlet/rest/RestServletGetTest.java | 1 -
 .../apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java | 1 -
 .../camel/component/servlet/rest/RestServletMethodNotAllowedTest.java    | 1 -
 .../org/apache/camel/component/servlet/rest/RestServletOptionsTest.java  | 1 -
 4 files changed, 4 deletions(-)

diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
index f3cba1b..0b5d2ba 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.servlet.ServletCamelRouterTestSupport;
 import org.apache.camel.component.servlet.ServletRestHttpBinding;
-import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class RestServletGetTest extends ServletCamelRouterTestSupport {
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
index 614e9f2..709f0c8 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.servlet.ServletCamelRouterTestSupport;
 import org.apache.camel.component.servlet.ServletRestHttpBinding;
-import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class RestServletGetWildcardsTest extends ServletCamelRouterTestSupport {
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
index a162bfb..73adaf3 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.servlet.ServletCamelRouterTestSupport;
 import org.apache.camel.component.servlet.ServletRestHttpBinding;
-import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class RestServletMethodNotAllowedTest extends ServletCamelRouterTestSupport {
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
index 20d7ec1..1af0923 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.servlet.ServletCamelRouterTestSupport;
 import org.apache.camel.component.servlet.ServletRestHttpBinding;
-import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class RestServletOptionsTest extends ServletCamelRouterTestSupport {


[camel] 05/06: CAMEL-13801 - Fixed CS for Camel-Servlet

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 c5ae24af1b05ece01f8d9bef15e9fc688959c480
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 09:27:45 2019 +0200

    CAMEL-13801 - Fixed CS for Camel-Servlet
---
 .../component/servlet/rest/RestServletGetTest.java | 22 ++++++-------
 .../servlet/rest/RestServletGetWildcardsTest.java  | 36 +++++++++-------------
 .../rest/RestServletMethodNotAllowedTest.java      | 22 ++++++-------
 .../servlet/rest/RestServletOptionsTest.java       | 16 +++-------
 4 files changed, 36 insertions(+), 60 deletions(-)

diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
index 537d100..f3cba1b 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
@@ -31,8 +31,8 @@ import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class RestServletGetTest extends ServletCamelRouterTestSupport {
-    
-	@BindToRegistry("myBinding")
+
+    @BindToRegistry("myBinding")
     private ServletRestHttpBinding restHttpBinding = new ServletRestHttpBinding();
 
     @Test
@@ -54,18 +54,14 @@ public class RestServletGetTest extends ServletCamelRouterTestSupport {
             public void configure() throws Exception {
                 // configure to use servlet on localhost
                 restConfiguration().component("servlet").host("localhost").endpointProperty("httpBinding", "#myBinding");
-                
+
                 // use the rest DSL to define the rest services
-                rest("/users/")
-                    .get("{id}/basic")
-                        .route()
-                        .to("mock: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");
-                            }
-                        });
+                rest("/users/").get("{id}/basic").route().to("mock: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");
+                    }
+                });
             }
         };
     }
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
index 6ef25f0..614e9f2 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
@@ -31,8 +31,8 @@ import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class RestServletGetWildcardsTest extends ServletCamelRouterTestSupport {
-    
-	@BindToRegistry("myBinding")
+
+    @BindToRegistry("myBinding")
     private ServletRestHttpBinding restHttpBinding = new ServletRestHttpBinding();
 
     @Test
@@ -66,27 +66,19 @@ public class RestServletGetWildcardsTest extends ServletCamelRouterTestSupport {
             public void configure() throws Exception {
                 // configure to use servlet on localhost
                 restConfiguration().component("servlet").host("localhost").endpointProperty("httpBinding", "#myBinding");
-                
+
                 // use the rest DSL to define the rest services
-                rest("/users/")
-                    .get("{id}/basic")
-                        .route()
-                        .to("mock: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()
-                    .get("{id}/{query}")
-                        .route()
-                        .to("mock: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();
+                rest("/users/").get("{id}/basic").route().to("mock: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().get("{id}/{query}").route().to("mock: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();
             }
         };
     }
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
index fd8b18c..a162bfb 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
@@ -31,8 +31,8 @@ import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class RestServletMethodNotAllowedTest extends ServletCamelRouterTestSupport {
-	
-	@BindToRegistry("myBinding")
+
+    @BindToRegistry("myBinding")
     private ServletRestHttpBinding restHttpBinding = new ServletRestHttpBinding();
 
     @Test
@@ -52,18 +52,14 @@ public class RestServletMethodNotAllowedTest extends ServletCamelRouterTestSuppo
             public void configure() throws Exception {
                 // configure to use servlet on localhost
                 restConfiguration().component("servlet").host("localhost").endpointProperty("httpBinding", "#myBinding");
-                
+
                 // use the rest DSL to define the rest services
-                rest("/users/")
-                    .get("{id}/basic")
-                        .route()
-                        .to("mock: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");
-                            }
-                        });
+                rest("/users/").get("{id}/basic").route().to("mock: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");
+                    }
+                });
             }
         };
     }
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
index 4215dc9..20d7ec1 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
@@ -28,8 +28,8 @@ import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class RestServletOptionsTest extends ServletCamelRouterTestSupport {
-    
-	@BindToRegistry("myBinding")
+
+    @BindToRegistry("myBinding")
     private ServletRestHttpBinding restHttpBinding = new ServletRestHttpBinding();
 
     @Test
@@ -70,17 +70,9 @@ public class RestServletOptionsTest extends ServletCamelRouterTestSupport {
             public void configure() throws Exception {
                 // configure to use servlet on localhost
                 restConfiguration().component("servlet").host("localhost").endpointProperty("httpBinding", "#myBinding");
-                
+
                 // use the rest DSL to define the rest services
-                rest("/users/")
-                    .get("v1/customers")
-                        .to("mock:customers")
-                    .put("v1/id/{id}")
-                        .to("mock:id")
-                    .get("v2/options")
-                        .to("mock:options")
-                    .post("v2/options")
-                        .to("mock:options");
+                rest("/users/").get("v1/customers").to("mock:customers").put("v1/id/{id}").to("mock:id").get("v2/options").to("mock:options").post("v2/options").to("mock:options");
             }
         };
     }


[camel] 03/06: Camel-Servlet: Added camel-mock as dependency test

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 0306efb3e2a19330b2acdb705ee66e4f80332155
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 09:24:02 2019 +0200

    Camel-Servlet: Added camel-mock as dependency test
---
 components/camel-servlet/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 2f030aa..b82d1a5 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -88,6 +88,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-mock</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>