CAMEL-9309: Make it easier to turn on|off java transport over http

apache · Nov 12, 2015 · 5ea0a6f · 5ea0a6f
1 parent 0afcf72
commit 5ea0a6f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
@@ -70,7 +70,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty</artifactId>
+      <artifactId>camel-jetty9</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
@@ -131,7 +131,6 @@ protected String getTestServerEndpointTwoUrl() {
     }
 
     protected String getTestServerEndpointTwoUri() {
-
         return "jetty:" + getTestServerEndpointTwoUrl();
     }
 

diff --git a/...mel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java b/...mel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java
@@ -22,6 +22,8 @@
 import org.apache.camel.component.ahc.AhcComponent;
 import org.apache.camel.component.ahc.AhcConstants;
 import org.apache.camel.component.ahc.BaseAhcTest;
+import org.apache.camel.component.jetty.JettyHttpComponent;
+import org.apache.camel.http.common.HttpCommonComponent;
 import org.junit.Test;
 
 /**
@@ -36,6 +38,9 @@ public boolean isUseRouteBuilder() {
 
     @Test
     public void testHttpSendJavaBodyAndReceiveString() throws Exception {
+        HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
+        jetty.setAllowJavaSerializedObject(true);
+
         AhcComponent ahc = context.getComponent("ahc", AhcComponent.class);
         ahc.setAllowJavaSerializedObject(true);
 
@@ -70,6 +75,9 @@ public void process(Exchange exchange) throws Exception {
 
     @Test
     public void testHttpSendJavaBodyAndReceiveJavaBody() throws Exception {
+        HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
+        jetty.setAllowJavaSerializedObject(true);
+
         AhcComponent ahc = context.getComponent("ahc", AhcComponent.class);
         ahc.setAllowJavaSerializedObject(true);
 
@@ -105,6 +113,9 @@ public void process(Exchange exchange) throws Exception {
 
     @Test
     public void testHttpSendStringAndReceiveJavaBody() throws Exception {
+        HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
+        jetty.setAllowJavaSerializedObject(true);
+
         AhcComponent ahc = context.getComponent("ahc", AhcComponent.class);
         ahc.setAllowJavaSerializedObject(true);
 
@@ -135,6 +146,9 @@ public void process(Exchange exchange) throws Exception {
 
     @Test
     public void testNotAllowedReceive() throws Exception {
+        HttpCommonComponent jetty = context.getComponent("jetty", HttpCommonComponent.class);
+        jetty.setAllowJavaSerializedObject(true);
+
         AhcComponent ahc = context.getComponent("ahc", AhcComponent.class);
         ahc.setAllowJavaSerializedObject(false);
 
@@ -163,6 +177,12 @@ public void process(Exchange exchange) throws Exception {
 
     @Test
     public void testNotAllowed() throws Exception {
+        JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
+        jetty.setAllowJavaSerializedObject(false);
+
+        AhcComponent ahc = context.getComponent("ahc", AhcComponent.class);
+        ahc.setAllowJavaSerializedObject(false);
+
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {