You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2020/09/22 13:55:12 UTC
[camel] branch master updated: Small cleanups spread across a few
components (#4277)
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 5c4a801 Small cleanups spread across a few components (#4277)
5c4a801 is described below
commit 5c4a8017cb7bb786997c29337cd32008f44088dd
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Sep 22 15:54:50 2020 +0200
Small cleanups spread across a few components (#4277)
Includes:
- camel-freemaker: fixed typo
- camel-freemaker: fixed usage of deprecated constructor
- camel-servlet: fixed usage of deprecated method
- camel-twitter: fixed usage of deprecated inOut method
- camel-ironmq: fixed usage of deprecated getOut method
- camel-aws-xray: fixed usage of deprecated inOnly method
---
.../org/apache/camel/component/aws/xray/CustomComponentTest.java | 9 +++++----
.../apache/camel/component/freemarker/FreemarkerComponent.java | 2 +-
.../apache/camel/component/freemarker/FreemarkerEndpoint.java | 2 +-
.../camel/component/freemarker/FreemarkerEndpointTest.java | 6 +++---
.../apache/camel/component/ironmq/IronMQComponentSpringTest.java | 2 +-
.../org/apache/camel/component/ironmq/IronMQComponentTest.java | 4 ++--
.../camel/component/servlet/ServletTransferExceptionTest.java | 2 +-
.../apache/camel/component/twitter/UserProducerInOutTest.java | 3 ++-
8 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java
index cf60151..2ca3b2c 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.aws.xray;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.xray.bean.ProcessingCamelBean;
@@ -114,25 +115,25 @@ public class CustomComponentTest extends CamelAwsXRayTestSupport {
public void configure() {
from(START).routeId("start")
.log("Starting test")
- .inOnly(DELIVERY);
+ .to(ExchangePattern.InOnly, DELIVERY);
from(DELIVERY).routeId("delivery")
.log("Doing some stuff")
.to(CommonEndpoints.RECEIVED)
.delay(100)
- .inOnly(IN_QUEUE);
+ .to(ExchangePattern.InOnly, IN_QUEUE);
from(IN_QUEUE).routeId("processing")
.log("Do some more stuff")
.to(CommonEndpoints.PROCESSING)
.delay(100)
- .inOnly(PERSISTENCE_QUEUE);
+ .to(ExchangePattern.InOnly, PERSISTENCE_QUEUE);
from(PERSISTENCE_QUEUE).routeId("wait-for-persisting")
.log("Waiting on available persisting instance")
.to(CommonEndpoints.PERSISTENCE_QUEUE)
.delay(100)
- .inOnly(PERSISTING);
+ .to(ExchangePattern.InOnly, PERSISTING);
from(PERSISTING).routeId("persisting")
.log("Payload ready for usage")
diff --git a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java
index e68ebd6..ddfe6bf 100644
--- a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java
+++ b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java
@@ -85,7 +85,7 @@ public class FreemarkerComponent extends DefaultComponent {
public synchronized Configuration getConfiguration() {
if (configuration == null) {
- configuration = new Configuration();
+ configuration = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
configuration.setTemplateLoader(new URLTemplateLoader() {
@Override
protected URL getURL(String name) {
diff --git a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
index 59d57fa..4f96403 100644
--- a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
+++ b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
@@ -167,7 +167,7 @@ public class FreemarkerEndpoint extends ResourceEndpoint {
if (reader != null) {
log.debug("Freemarker is evaluating template read from header {} using context: {}",
FreemarkerConstants.FREEMARKER_TEMPLATE, dataModel);
- template = new Template("temp", reader, new Configuration());
+ template = new Template("temp", reader, new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS));
} else {
log.debug("Freemarker is evaluating {} using context: {}", path, dataModel);
if (getEncoding() != null) {
diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerEndpointTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerEndpointTest.java
index d624462..ae6720c 100644
--- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerEndpointTest.java
+++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerEndpointTest.java
@@ -36,9 +36,9 @@ public class FreemarkerEndpointTest extends FreemarkerTest {
endpoint.setAllowContextMapAll(true);
endpoint.setResourceUri("org/apache/camel/component/freemarker/example.ftl");
- Configuration configuraiton = new Configuration();
- configuraiton.setTemplateLoader(new ClassTemplateLoader(Resource.class, "/"));
- endpoint.setConfiguration(configuraiton);
+ Configuration configuration = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
+ configuration.setTemplateLoader(new ClassTemplateLoader(Resource.class, "/"));
+ endpoint.setConfiguration(configuration);
context.addEndpoint("free", endpoint);
diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java
index db554b6..5a61307 100644
--- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java
+++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java
@@ -72,7 +72,7 @@ public class IronMQComponentSpringTest extends CamelSpringTestSupport {
assertEquals("This is my message text.", resultExchange.getIn().getBody());
assertNotNull(resultExchange.getIn().getHeader(IronMQConstants.MESSAGE_ID));
- assertNotNull(exchange.getOut().getHeader(IronMQConstants.MESSAGE_ID));
+ assertNotNull(exchange.getMessage().getHeader(IronMQConstants.MESSAGE_ID));
}
@Override
diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java
index 8677f1a..6ce10c4 100644
--- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java
+++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java
@@ -89,8 +89,8 @@ public class IronMQComponentTest extends CamelTestSupport {
assertEquals("This is my message text.", resultExchange.getIn().getBody());
assertNotNull(resultExchange.getIn().getHeader(IronMQConstants.MESSAGE_ID));
- assertEquals("This is my message text.", exchange.getOut().getBody());
- assertNotNull(exchange.getOut().getHeader(IronMQConstants.MESSAGE_ID));
+ assertEquals("This is my message text.", exchange.getMessage().getBody());
+ assertNotNull(exchange.getMessage().getHeader(IronMQConstants.MESSAGE_ID));
}
@Override
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java
index d08a2b0..f006da0 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java
@@ -38,7 +38,7 @@ public class ServletTransferExceptionTest extends ServletCamelRouterTestSupport
assertEquals(500, response.getResponseCode());
assertEquals(HttpConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT, response.getContentType());
- Object object = HttpHelper.deserializeJavaObjectFromStream(response.getInputStream());
+ Object object = HttpHelper.deserializeJavaObjectFromStream(response.getInputStream(), null);
assertNotNull(object);
IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, object);
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java
index 98d3c40..8d858b2 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java
@@ -21,6 +21,7 @@ import java.util.List;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -74,7 +75,7 @@ public class UserProducerInOutTest extends CamelTwitterTestSupport {
public void configure() {
from("direct:tweets")
//.to("log:org.apache.camel.component.twitter?level=INFO&showAll=true&multiline=true")
- .inOut("twitter-timeline://user?" + getUriTokens())
+ .to(ExchangePattern.InOut, "twitter-timeline://user?" + getUriTokens())
//.to("log:org.apache.camel.component.twitter?level=INFO&showAll=true&multiline=true")
//.transform().simple("The tweet '${body.text}' was published with the id '${body.id}'")
//.to("log:org.apache.camel.component.twitter?level=INFO&showAll=true&multiline=true")