Author: bvahdat
Date: Fri Nov 30 23:11:14 2012
New Revision: 1415884
URL: http://svn.apache.org/viewvc?rev=1415884&view=rev
Log:
CAMEL-5838: Corrected the preexisting typo in awaitExistence setter method by
ZooKeeperConfiguration (setAwaitExistance instead of setAwaitExistence), added
a unit-test and as well did some tiny polishments.
Added:
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperEndpointTest.java
(with props)
Modified:
camel/trunk/components/camel-zookeeper/pom.xml
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
Modified: camel/trunk/components/camel-zookeeper/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/pom.xml?rev=1415884&r1=1415883&r2=1415884&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/pom.xml (original)
+++ camel/trunk/components/camel-zookeeper/pom.xml Fri Nov 30 23:11:14 2012
@@ -52,11 +52,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
Modified:
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java?rev=1415884&r1=1415883&r2=1415884&view=diff
==============================================================================
---
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java
(original)
+++
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java
Fri Nov 30 23:11:14 2012
@@ -43,8 +43,7 @@ public class ZooKeeperComponent extends
this.configuration = configuration;
}
- @SuppressWarnings("all")
- protected Endpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
if (getCamelContext() == null) {
throw new CamelException("No Camel context has been provided to
this zookeeper component");
}
Modified:
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java?rev=1415884&r1=1415883&r2=1415884&view=diff
==============================================================================
---
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
(original)
+++
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
Fri Nov 30 23:11:14 2012
@@ -131,7 +131,7 @@ public class ZooKeeperConfiguration impl
return awaitExistence;
}
- public void setAwaitExistance(boolean awaitExistence) {
+ public void setAwaitExistence(boolean awaitExistence) {
this.awaitExistence = awaitExistence;
}
Modified:
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java?rev=1415884&r1=1415883&r2=1415884&view=diff
==============================================================================
---
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
(original)
+++
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
Fri Nov 30 23:11:14 2012
@@ -151,7 +151,7 @@ public class ZooKeeperEndpoint extends D
@ManagedAttribute
public void setAwaitExistence(boolean awaitExistence) {
- getConfiguration().setAwaitExistance(awaitExistence);
+ getConfiguration().setAwaitExistence(awaitExistence);
}
@ManagedOperation
Added:
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperEndpointTest.java?rev=1415884&view=auto
==============================================================================
---
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperEndpointTest.java
(added)
+++
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperEndpointTest.java
Fri Nov 30 23:11:14 2012
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.zookeeper;
+
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class ZookeeperEndpointTest extends CamelTestSupport {
+
+ @Test
+ public void testAwaitExistenceOptionOnEndpoint() {
+ ZooKeeperEndpoint endpoint =
context.getEndpoint("zookeeper:someserver/zoo", ZooKeeperEndpoint.class);
+ assertTrue("The awaitExistance option defaults to true",
endpoint.getAwaitExistence());
+
+ endpoint =
context.getEndpoint("zookeeper:someserver/zoo?awaitExistence=true",
ZooKeeperEndpoint.class);
+ assertTrue("The awaitExistance option should be true",
endpoint.getAwaitExistence());
+
+ endpoint =
context.getEndpoint("zookeeper:someserver/zoo?awaitExistence=false",
ZooKeeperEndpoint.class);
+ assertFalse("The awaitExistance option should be false",
endpoint.getAwaitExistence());
+ }
+
+}
Propchange:
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperEndpointTest.java
------------------------------------------------------------------------------
svn:eol-style = native