This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fa35f957004758aab3e555049fdc1dfe72b4a36e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jun 6 05:52:03 2019 +0200
CAMEL-13220: Remove deprecated producer.
---
.../spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java | 4 ++--
.../spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java | 4 ++--
.../org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java | 2 +-
.../java/org/apache/camel/spring/boot/issues/RestDslPostTest.java | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java
b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java
index 002f8c4..9b3d307 100644
---
a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java
+++
b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java
@@ -68,7 +68,7 @@ public class CamelCloudServiceCallRefExpressionTest {
@Bean
Expression myExpression() {
return new SimpleExpression(
-
"jetty:http://${header.CamelServiceCallServiceHost}:${header.CamelServiceCallServicePort}/hello";
+
"http://${header.CamelServiceCallServiceHost}:${header.CamelServiceCallServicePort}/hello";
);
}
@@ -121,7 +121,7 @@ public class CamelCloudServiceCallRefExpressionTest {
prop.put("service.name", "custom-svc-list");
prop.put("camel.cloud.service-call.expression", "myExpression");
prop.put("camel.cloud.load-balancer.enabled", false);
- prop.put("camel.cloud.service-call.component", "jetty");
+ prop.put("camel.cloud.service-call.component", "http");
prop.put("camel.cloud.service-discovery.services[custom-svc-list]",
SpringBootPropertyUtil.getDiscoveryServices());
prop.put("camel.cloud.service-filter.blacklist[custom-svc-list]",
SpringBootPropertyUtil.getServiceFilterBlacklist());
prop.put("ribbon.enabled", false);
diff --git
a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java
b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java
index f97124b..5563035 100644
---
a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java
+++
b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java
@@ -89,8 +89,8 @@ public class CamelCloudServiceCallSimpleExpressionTest {
Properties prop = new Properties();
prop.put("service.name", "custom-svc-list");
prop.put("camel.cloud.load-balancer.enabled", false);
- prop.put("camel.cloud.service-call.component", "jetty");
- prop.put("camel.cloud.service-call.expression",
"$simple{header.CamelServiceCallScheme}:http://$simple{header.CamelServiceCallServiceHost}:$simple{header.CamelServiceCallServicePort}/hello";);
+ prop.put("camel.cloud.service-call.component", "http");
+ prop.put("camel.cloud.service-call.expression",
"$simple{header.CamelServiceCallScheme}:$simple{header.CamelServiceCallServiceHost}:$simple{header.CamelServiceCallServicePort}/hello");
prop.put("camel.cloud.service-call.expression-language", "simple");
prop.put("camel.cloud.service-discovery.services[custom-svc-list]",
SpringBootPropertyUtil.getDiscoveryServices());
prop.put("camel.cloud.service-filter.blacklist[custom-svc-list]",
SpringBootPropertyUtil.getServiceFilterBlacklist());
diff --git
a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java
b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java
index 3a4d2ea..1c8bb09 100644
---
a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java
+++
b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java
@@ -90,7 +90,7 @@ public class CamelCloudServiceCallTest {
Properties prop = new Properties();
prop.put("service.name", "custom-svc-list");
prop.put("camel.cloud.load-balancer.enabled", false);
- prop.put("camel.cloud.service-call.component", "jetty");
+ prop.put("camel.cloud.service-call.component", "http");
prop.put("camel.cloud.service-discovery.services[custom-svc-list]",
SpringBootPropertyUtil.getDiscoveryServices());
prop.put("camel.cloud.service-filter.blacklist[custom-svc-list]",
SpringBootPropertyUtil.getServiceFilterBlacklist());
prop.put("ribbon.enabled", false);
diff --git
a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java
b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java
index 3a35a4e..b03e9b4 100644
---
a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java
+++
b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java
@@ -76,8 +76,8 @@ public class RestDslPostTest extends Assert {
Exchange outExchangeUser = builder.withBody("{\"id\": 1, \"name\":
\"My Name\"}").build();
Exchange outExchangeCountry = builder.withBody("{\"iso\": \"EN\",
\"country\": \"England\"}").build();
- template.send("jetty:http://localhost:"; + PORT + "/user",
outExchangeUser);
- template.send("jetty:http://localhost:"; + PORT + "/country",
outExchangeCountry);
+ template.send("http://localhost:"; + PORT + "/user", outExchangeUser);
+ template.send("http://localhost:"; + PORT + "/country",
outExchangeCountry);
resultEndpointCountry.assertIsSatisfied();
resultEndpointUser.assertIsSatisfied();
