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 2020/01/07 15:39:27 UTC
[camel] branch master updated: CAMEL-14020 - Migrate deprecate
getOut to getMessage in tests, camel-ahc
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
The following commit(s) were added to refs/heads/master by this push:
new fa80606 CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-ahc
fa80606 is described below
commit fa806067dd92a0fbebf1d8da1d3448062033f022
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 7 16:37:16 2020 +0100
CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-ahc
---
.../ahc/AhcBridgeEndpointPathWithSpacesTest.java | 2 +-
.../camel/component/ahc/AhcBridgeEndpointTest.java | 2 +-
.../component/ahc/AhcComponentClientConfigTest.java | 4 ++--
.../ahc/AhcComponentCustomClientConfigTest.java | 4 ++--
.../ahc/AhcComponentNettyClientConfigTest.java | 4 ++--
.../camel/component/ahc/AhcProduce500Test.java | 4 ++--
.../component/ahc/AhcProduceClientConfigTest.java | 4 ++--
.../ahc/AhcProduceNoThrowExceptionOnFailureTest.java | 4 ++--
.../AhcProduceWithClientConfigUriParametersTest.java | 4 ++--
.../ahc/AhcProducerTwoParametersWithSameKeyTest.java | 14 +++++++-------
.../ahc/javabody/AhcProduceJavaBodyTest.java | 20 ++++++++++----------
11 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
index ac4bcde..8c4123c 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
@@ -49,7 +49,7 @@ public class AhcBridgeEndpointPathWithSpacesTest extends BaseAhcTest {
public void process(Exchange exchange) throws Exception {
// get the request URL and copy it to the request body
String uri = exchange.getIn().getHeader(Exchange.HTTP_URI, String.class);
- exchange.getOut().setBody(uri);
+ exchange.getMessage().setBody(uri);
}
};
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
index 0a15b63..1d36a64 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
@@ -62,7 +62,7 @@ public class AhcBridgeEndpointTest extends BaseAhcTest {
public void process(Exchange exchange) throws Exception {
// get the request URL and copy it to the request body
String uri = exchange.getIn().getHeader(Exchange.HTTP_URI, String.class);
- exchange.getOut().setBody(uri);
+ exchange.getMessage().setBody(uri);
}
};
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigTest.java
index 560e8b6..b5e8d3d 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigTest.java
@@ -63,8 +63,8 @@ public class AhcComponentClientConfigTest extends BaseAhcTest {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
// redirect to test the client config worked as we told it to follow redirects
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, "301");
- exchange.getOut().setHeader("Location", getTestServerEndpointTwoUrl());
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, "301");
+ exchange.getMessage().setHeader("Location", getTestServerEndpointTwoUrl());
}
});
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentCustomClientConfigTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentCustomClientConfigTest.java
index 3ebba9f..fd81ba8 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentCustomClientConfigTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentCustomClientConfigTest.java
@@ -60,8 +60,8 @@ public class AhcComponentCustomClientConfigTest extends BaseAhcTest {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
// redirect to test the client config worked as we told it to follow redirects
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, "301");
- exchange.getOut().setHeader("Location", getTestServerEndpointTwoUrl());
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, "301");
+ exchange.getMessage().setHeader("Location", getTestServerEndpointTwoUrl());
}
});
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentNettyClientConfigTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentNettyClientConfigTest.java
index 33f370a..7ed3347 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentNettyClientConfigTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentNettyClientConfigTest.java
@@ -62,8 +62,8 @@ public class AhcComponentNettyClientConfigTest extends BaseAhcTest {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
// redirect to test the client config worked as we told it to follow redirects
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, "301");
- exchange.getOut().setHeader("Location", getTestServerEndpointTwoUrl());
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, "301");
+ exchange.getMessage().setHeader("Location", getTestServerEndpointTwoUrl());
}
});
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduce500Test.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduce500Test.java
index 42bf0e7..e6f1bb3 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduce500Test.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduce500Test.java
@@ -61,8 +61,8 @@ public class AhcProduce500Test extends BaseAhcTest {
from(getTestServerEndpointUri())
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
- exchange.getOut().setBody("Does not work");
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
+ exchange.getMessage().setBody("Does not work");
}
});
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceClientConfigTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceClientConfigTest.java
index b30a684..b776e25 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceClientConfigTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceClientConfigTest.java
@@ -55,8 +55,8 @@ public class AhcProduceClientConfigTest extends BaseAhcTest {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
// redirect to test the client config worked as we told it to follow redirects
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, "301");
- exchange.getOut().setHeader("Location", getTestServerEndpointTwoUrl());
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, "301");
+ exchange.getMessage().setHeader("Location", getTestServerEndpointTwoUrl());
}
});
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceNoThrowExceptionOnFailureTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceNoThrowExceptionOnFailureTest.java
index ce6aaa8..a844bc8 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceNoThrowExceptionOnFailureTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceNoThrowExceptionOnFailureTest.java
@@ -51,8 +51,8 @@ public class AhcProduceNoThrowExceptionOnFailureTest extends BaseAhcTest {
from(getTestServerEndpointUri())
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
- exchange.getOut().setBody("Does not work");
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
+ exchange.getMessage().setBody("Does not work");
}
});
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceWithClientConfigUriParametersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceWithClientConfigUriParametersTest.java
index fed7ab3..f1ff320 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceWithClientConfigUriParametersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceWithClientConfigUriParametersTest.java
@@ -49,8 +49,8 @@ public class AhcProduceWithClientConfigUriParametersTest extends BaseAhcTest {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
// redirect to test the client config worked as we told it to follow redirects
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, "301");
- exchange.getOut().setHeader("Location", getTestServerEndpointTwoUrl());
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, "301");
+ exchange.getMessage().setHeader("Location", getTestServerEndpointTwoUrl());
}
});
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
index a4e891b..07b8d75 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
@@ -39,8 +39,8 @@ public class AhcProducerTwoParametersWithSameKeyTest extends BaseAhcTest {
assertNotNull(out);
assertFalse(out.isFailed(), "Should not fail");
- assertEquals("OK", out.getOut().getBody(String.class));
- assertEquals("yes", out.getOut().getHeader("bar"));
+ assertEquals("OK", out.getMessage().getBody(String.class));
+ assertEquals("yes", out.getMessage().getHeader("bar"));
}
@Test
@@ -58,8 +58,8 @@ public class AhcProducerTwoParametersWithSameKeyTest extends BaseAhcTest {
assertNotNull(out);
assertFalse(out.isFailed(), "Should not fail");
- assertEquals("OK", out.getOut().getBody(String.class));
- assertEquals("yes", out.getOut().getHeader("bar"));
+ assertEquals("OK", out.getMessage().getBody(String.class));
+ assertEquals("yes", out.getMessage().getHeader("bar"));
}
@@ -81,13 +81,13 @@ public class AhcProducerTwoParametersWithSameKeyTest extends BaseAhcTest {
assertEquals("bar", to.get(1));
// response
- exchange.getOut().setBody("OK");
+ exchange.getMessage().setBody("OK");
// use multiple values for the foo header in the reply
List<Integer> list = new ArrayList<>();
list.add(123);
list.add(456);
- exchange.getOut().setHeader("foo", list);
- exchange.getOut().setHeader("bar", "yes");
+ exchange.getMessage().setHeader("foo", list);
+ exchange.getMessage().setHeader("bar", "yes");
}
});
}
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java
index 77bc296..ca431d3 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/javabody/AhcProduceJavaBodyTest.java
@@ -63,8 +63,8 @@ public class AhcProduceJavaBodyTest extends BaseAhcTest {
assertEquals("Camel", cool.getName());
// we send back plain test
- exchange.getOut().setHeader(Exchange.CONTENT_TYPE, "text/plain");
- exchange.getOut().setBody("OK");
+ exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "text/plain");
+ exchange.getMessage().setBody("OK");
}
});
}
@@ -100,8 +100,8 @@ public class AhcProduceJavaBodyTest extends BaseAhcTest {
assertEquals("Camel", cool.getName());
MyCoolBean reply = new MyCoolBean(456, "Camel rocks");
- exchange.getOut().setBody(reply);
- exchange.getOut().setHeader(Exchange.CONTENT_TYPE, AhcConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT);
+ exchange.getMessage().setBody(reply);
+ exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, AhcConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT);
}
});
}
@@ -136,8 +136,8 @@ public class AhcProduceJavaBodyTest extends BaseAhcTest {
assertEquals("Hello World", body);
MyCoolBean reply = new MyCoolBean(456, "Camel rocks");
- exchange.getOut().setBody(reply);
- exchange.getOut().setHeader(Exchange.CONTENT_TYPE, AhcConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT);
+ exchange.getMessage().setBody(reply);
+ exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, AhcConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT);
}
});
}
@@ -169,8 +169,8 @@ public class AhcProduceJavaBodyTest extends BaseAhcTest {
assertEquals("Hello World", body);
MyCoolBean reply = new MyCoolBean(456, "Camel rocks");
- exchange.getOut().setBody(reply);
- exchange.getOut().setHeader(Exchange.CONTENT_TYPE, AhcConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT);
+ exchange.getMessage().setBody(reply);
+ exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, AhcConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT);
}
});
}
@@ -201,8 +201,8 @@ public class AhcProduceJavaBodyTest extends BaseAhcTest {
assertEquals("Hello World", body);
MyCoolBean reply = new MyCoolBean(456, "Camel rocks");
- exchange.getOut().setBody(reply);
- exchange.getOut().setHeader(Exchange.CONTENT_TYPE, AhcConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT);
+ exchange.getMessage().setBody(reply);
+ exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, AhcConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT);
}
});
}