You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/06/06 04:35:27 UTC
[camel] branch master updated: CAMEL-13220: Remove deprecated
producer.
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
The following commit(s) were added to refs/heads/master by this push:
new 4769142 CAMEL-13220: Remove deprecated producer.
4769142 is described below
commit 47691425d8f283ca8eb3adc95db248c77f6d08d7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 6 06:30:58 2019 +0200
CAMEL-13220: Remove deprecated producer.
---
components/camel-zookeeper/pom.xml | 5 +++++
.../zookeeper/cloud/ZooKeeperServiceCallRouteTest.java | 2 +-
.../zookeeper/operations/CreateOperationTest.java | 18 ------------------
.../cloud/SpringZooKeeperServiceCallRouteTest.xml | 2 +-
4 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index 952e1e4..ba56545 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -98,6 +98,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-http4</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-undertow</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java
index 6e764c5..9559e60 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java
@@ -133,7 +133,7 @@ public class ZooKeeperServiceCallRouteTest extends CamelTestSupport {
from("direct:start")
.serviceCall()
.name(SERVICE_NAME)
- .component("jetty")
+ .component("http")
.defaultLoadBalancer()
.zookeeperServiceDiscovery("127.0.0.1:" + SERVER_PORT, SERVICE_PATH)
.end()
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
index 4ca1b5b..e1bc0ef 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
@@ -16,15 +16,9 @@
*/
package org.apache.camel.component.zookeeper.operations;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.ZooDefs.Ids;
-import org.apache.zookeeper.ZooDefs.Perms;
import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.data.ACL;
import org.junit.Before;
import org.junit.Test;
@@ -92,16 +86,4 @@ public class CreateOperationTest extends ZooKeeperTestSupport {
verifyNodeContainsData(out, testPayloadBytes);
}
- @Test
- public void createNodeWithSpecificAccess() throws Exception {
- CreateOperation create = new CreateOperation(connection, "/four");
- create.setData(testPayload.getBytes());
- List<ACL> perms = Collections.singletonList(new ACL(Perms.CREATE, Ids.ANYONE_ID_UNSAFE));
- create.setPermissions(perms);
-
- OperationResult<String> result = create.get();
- assertEquals("/four", result.getResult());
-
- verifyAccessControlList("/four", perms);
- }
}
diff --git a/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.xml b/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.xml
index 482ed76..d5b4fd4 100644
--- a/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.xml
+++ b/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.xml
@@ -33,7 +33,7 @@
<route id="scall">
<from uri="direct:start"/>
- <serviceCall name="http-service" component="jetty">
+ <serviceCall name="http-service" component="http">
<zookeeperServiceDiscovery nodes="localhost:9001" basePath="/camel"/>
</serviceCall>
<to uri="mock:result"/>