camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject [5/5] camel git commit: Polish
Date Sun, 18 Dec 2016 16:18:02 GMT
Polish

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/079b5f9e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/079b5f9e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/079b5f9e

Branch: refs/heads/master
Commit: 079b5f9e6dd7e664e376f388b457568bbb518e93
Parents: 3fd9102
Author: Babak Vahdat <bvahdat@apache.org>
Authored: Sun Dec 18 17:16:57 2016 +0100
Committer: Babak Vahdat <bvahdat@apache.org>
Committed: Sun Dec 18 17:16:57 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/util/URISupport.java  |  1 -
 .../s3/S3ComponentListBucketsSpringTest.java    |  4 ++--
 .../aws/s3/S3ComponentListBucketsTest.java      |  4 ++--
 .../apache/camel/component/cxf/ssl/SslTest.java |  2 +-
 .../headers/WaitContainerCmdHeaderTest.java     |  4 ++--
 .../camel/dataformat/hessian/TestObject.java    |  2 +-
 .../cinder/producer/SnapshotProducer.java       | 23 ++++++++++----------
 .../cinder/producer/VolumeProducer.java         | 23 ++++++++++----------
 .../keystone/producer/UserProducer.java         | 19 ++++++++--------
 .../neutron/producer/RouterProducer.java        | 19 ++++++++--------
 .../neutron/producer/SubnetProducer.java        | 17 ++++++++-------
 .../openstack/nova/producer/ServerProducer.java | 23 ++++++++++----------
 .../openstack/cinder/VolumeProducerTest.java    | 23 ++++++++++----------
 .../cinder/VolumeSnapshotProducerTest.java      | 19 ++++++++--------
 .../openstack/keystone/UserProducerTest.java    | 17 ++++++++-------
 .../openstack/neutron/RouterProducerTest.java   | 19 ++++++++--------
 .../openstack/neutron/SubnetProducerTest.java   | 13 ++++++-----
 .../openstack/nova/ServerProducerTest.java      | 15 +++++++------
 .../processor/RibbonServiceCallProcessor.java   |  3 ++-
 .../StringMultiSelectPicklistSerializer.java    |  2 +-
 .../component/smpp/SmppNLSTSplitterTest.java    |  9 ++------
 .../component/weather/WeatherConfiguration.java |  2 +-
 .../component/websocket/WebsocketComponent.java |  1 -
 .../WebsocketComponentServletTest.java          |  4 ++--
 24 files changed, 137 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/camel-core/src/main/java/org/apache/camel/util/URISupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 1c30ff4..1530e31 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@ -22,7 +22,6 @@ import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
index 4a21958..ddaf04e 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
@@ -54,8 +54,8 @@ public class S3ComponentListBucketsSpringTest extends CamelSpringTestSupport {
     private void assertResultExchange(Exchange resultExchange) {
         List<Bucket> list = resultExchange.getIn().getBody(List.class);
         assertEquals(1, list.size());
-        assertEquals("camel", ((Bucket) list.get(0)).getOwner().getDisplayName());
-        assertEquals("camel-bucket", ((Bucket) list.get(0)).getName());
+        assertEquals("camel", list.get(0).getOwner().getDisplayName());
+        assertEquals("camel-bucket", list.get(0).getName());
     }
     
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
index 9d3db60..cc7a0f2 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
@@ -54,8 +54,8 @@ public class S3ComponentListBucketsTest extends CamelTestSupport {
     private void assertResultExchange(Exchange resultExchange) {
         List<Bucket> list = resultExchange.getIn().getBody(List.class);
         assertEquals(1, list.size());
-        assertEquals("camel", ((Bucket) list.get(0)).getOwner().getDisplayName());
-        assertEquals("camel-bucket", ((Bucket) list.get(0)).getName());
+        assertEquals("camel", list.get(0).getOwner().getDisplayName());
+        assertEquals("camel-bucket", list.get(0).getName());
     }
     
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
index 634cc56..bb73c7e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
@@ -45,7 +45,7 @@ public class SslTest extends CamelSpringTestSupport {
 
     @AfterClass
     public static void cleanUp() {
-        //System.getProperties().remove("cxf.config.file");
+        //System.clearProperty("cxf.config.file");
     }
 
     @BeforeClass

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
index a3b0873..ca0acde 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
@@ -56,8 +56,8 @@ public class WaitContainerCmdHeaderTest extends BaseDockerHeaderTest<WaitContain
     @Override
     protected void setupMocks() {
         Mockito.when(dockerClient.waitContainerCmd(Matchers.anyString())).thenReturn(mockObject);
-        Mockito.when(mockObject.exec(Mockito.anyObject())).thenReturn(callback);
-        Mockito.when(callback.awaitStatusCode()).thenReturn(Mockito.anyInt());
+        Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
+        Mockito.when(callback.awaitStatusCode()).thenReturn(Matchers.anyInt());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/TestObject.java
----------------------------------------------------------------------
diff --git a/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/TestObject.java b/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/TestObject.java
index 7499dc6..2e1182a 100644
--- a/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/TestObject.java
+++ b/components/camel-hessian/src/test/java/org/apache/camel/dataformat/hessian/TestObject.java
@@ -96,7 +96,7 @@ class TestObject implements Serializable {
         result = 31 * result + intNumber;
         temp = Double.doubleToLongBits(floatNumber);
         result = 31 * result + (int) (temp ^ (temp >>> 32));
-        result = 31 * result + (int) character;
+        result = 31 * result + character;
         result = 31 * result + (text != null ? text.hashCode() : 0);
         return result;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java
index 78d6078..b0d994f 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java
@@ -24,6 +24,7 @@ import org.apache.camel.Message;
 import org.apache.camel.component.openstack.cinder.CinderConstants;
 import org.apache.camel.component.openstack.cinder.CinderEndpoint;
 import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.util.ObjectHelper;
 import org.openstack4j.api.Builders;
 import org.openstack4j.api.OSClient;
@@ -42,19 +43,19 @@ public class SnapshotProducer extends AbstractOpenstackProducer {
         String operation = getOperation(exchange);
 
         switch (operation) {
-        case CinderConstants.CREATE:
+        case OpenstackConstants.CREATE:
             doCreate(exchange);
             break;
-        case CinderConstants.GET:
+        case OpenstackConstants.GET:
             doGet(exchange);
             break;
-        case CinderConstants.GET_ALL:
+        case OpenstackConstants.GET_ALL:
             doGetAll(exchange);
             break;
-        case CinderConstants.UPDATE:
+        case OpenstackConstants.UPDATE:
             doUpdate(exchange);
             break;
-        case CinderConstants.DELETE:
+        case OpenstackConstants.DELETE:
             doDelete(exchange);
             break;
         default:
@@ -71,7 +72,7 @@ public class SnapshotProducer extends AbstractOpenstackProducer {
 
     private void doGet(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Snapshot ID");
         final VolumeSnapshot out = os.blockStorage().snapshots().get(id);
         msg.setBody(out);
@@ -84,7 +85,7 @@ public class SnapshotProducer extends AbstractOpenstackProducer {
 
     private void doUpdate(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
         final VolumeSnapshot vs = messageToSnapshot(msg);
         ObjectHelper.notEmpty(id, "Cinder Snapshot ID");
 
@@ -94,7 +95,7 @@ public class SnapshotProducer extends AbstractOpenstackProducer {
 
     private void doDelete(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Cinder Snapshot ID");
 
         final ActionResponse out = os.blockStorage().snapshots().delete(id);
@@ -107,12 +108,12 @@ public class SnapshotProducer extends AbstractOpenstackProducer {
             Map headers = message.getHeaders();
             VolumeSnapshotBuilder builder = Builders.volumeSnapshot();
 
-            final String name = message.getHeader(CinderConstants.NAME, String.class);
+            final String name = message.getHeader(OpenstackConstants.NAME, String.class);
             ObjectHelper.notEmpty(name, "Name");
             builder.name(name);
 
-            if (headers.containsKey(CinderConstants.DESCRIPTION)) {
-                builder.description(message.getHeader(CinderConstants.DESCRIPTION, String.class));
+            if (headers.containsKey(OpenstackConstants.DESCRIPTION)) {
+                builder.description(message.getHeader(OpenstackConstants.DESCRIPTION, String.class));
             }
 
             if (headers.containsKey(CinderConstants.VOLUME_ID)) {

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
index 62ed0bc..71938b3 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
@@ -24,6 +24,7 @@ import org.apache.camel.Message;
 import org.apache.camel.component.openstack.cinder.CinderConstants;
 import org.apache.camel.component.openstack.cinder.CinderEndpoint;
 import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.util.ObjectHelper;
 import org.openstack4j.api.Builders;
 import org.openstack4j.api.OSClient;
@@ -43,22 +44,22 @@ public class VolumeProducer extends AbstractOpenstackProducer {
         String operation = getOperation(exchange);
 
         switch (operation) {
-        case CinderConstants.CREATE:
+        case OpenstackConstants.CREATE:
             doCreate(exchange);
             break;
-        case CinderConstants.GET:
+        case OpenstackConstants.GET:
             doGet(exchange);
             break;
-        case CinderConstants.GET_ALL:
+        case OpenstackConstants.GET_ALL:
             doGetAll(exchange);
             break;
         case CinderConstants.GET_ALL_TYPES:
             doGetAllTypes(exchange);
             break;
-        case CinderConstants.UPDATE:
+        case OpenstackConstants.UPDATE:
             doUpdate(exchange);
             break;
-        case CinderConstants.DELETE:
+        case OpenstackConstants.DELETE:
             doDelete(exchange);
             break;
         default:
@@ -75,7 +76,7 @@ public class VolumeProducer extends AbstractOpenstackProducer {
 
     private void doGet(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Volume ID");
         final Volume out = os.blockStorage().volumes().get(id);
         msg.setBody(out);
@@ -93,7 +94,7 @@ public class VolumeProducer extends AbstractOpenstackProducer {
 
     private void doUpdate(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
         final Volume vol = messageToVolume(msg);
         ObjectHelper.notEmpty(id, "Cinder Volume ID");
         ObjectHelper.notEmpty(vol.getDescription(), "Cinder Volume Description");
@@ -104,7 +105,7 @@ public class VolumeProducer extends AbstractOpenstackProducer {
 
     private void doDelete(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Cinder Volume ID");
         final ActionResponse out = os.blockStorage().volumes().delete(id);
         checkFailure(out, msg, "Delete volume " + id);
@@ -116,12 +117,12 @@ public class VolumeProducer extends AbstractOpenstackProducer {
             Map headers = message.getHeaders();
             VolumeBuilder builder = Builders.volume();
 
-            final String name = message.getHeader(CinderConstants.NAME, String.class);
+            final String name = message.getHeader(OpenstackConstants.NAME, String.class);
             ObjectHelper.notEmpty(name, "Name ");
             builder.name(name);
 
-            if (headers.containsKey(CinderConstants.DESCRIPTION)) {
-                builder.description(message.getHeader(CinderConstants.DESCRIPTION, String.class));
+            if (headers.containsKey(OpenstackConstants.DESCRIPTION)) {
+                builder.description(message.getHeader(OpenstackConstants.DESCRIPTION, String.class));
             }
 
             if (headers.containsKey(CinderConstants.SIZE)) {

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/UserProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/UserProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/UserProducer.java
index 7794cd7..541ec48 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/UserProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/UserProducer.java
@@ -21,6 +21,7 @@ import java.util.Map;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.component.openstack.keystone.KeystoneConstants;
 import org.apache.camel.component.openstack.keystone.KeystoneEndpoint;
 import org.apache.camel.util.ObjectHelper;
@@ -40,19 +41,19 @@ public class UserProducer extends AbstractKeystoneProducer {
     public void process(Exchange exchange) throws Exception {
         final String operation = getOperation(exchange);
         switch (operation) {
-        case KeystoneConstants.CREATE:
+        case OpenstackConstants.CREATE:
             doCreate(exchange);
             break;
-        case KeystoneConstants.GET:
+        case OpenstackConstants.GET:
             doGet(exchange);
             break;
-        case KeystoneConstants.GET_ALL:
+        case OpenstackConstants.GET_ALL:
             doGetAll(exchange);
             break;
-        case KeystoneConstants.UPDATE:
+        case OpenstackConstants.UPDATE:
             doUpdate(exchange);
             break;
-        case KeystoneConstants.DELETE:
+        case OpenstackConstants.DELETE:
             doDelete(exchange);
             break;
         default:
@@ -68,7 +69,7 @@ public class UserProducer extends AbstractKeystoneProducer {
 
     private void doGet(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(KeystoneConstants.ID, msg.getHeader(KeystoneConstants.USER_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.USER_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "User ID");
         final User result = osV3Client.identity().users().get(id);
         msg.setBody(result);
@@ -88,7 +89,7 @@ public class UserProducer extends AbstractKeystoneProducer {
 
     private void doDelete(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(KeystoneConstants.ID, msg.getHeader(KeystoneConstants.USER_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.USER_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "User ID");
         final ActionResponse response = osV3Client.identity().users().delete(id);
         checkFailure(response, msg, "Delete user with ID " + id);
@@ -101,8 +102,8 @@ public class UserProducer extends AbstractKeystoneProducer {
             Map headers = message.getHeaders();
             UserBuilder builder = Builders.user();
 
-            ObjectHelper.notEmpty(message.getHeader(KeystoneConstants.NAME, String.class), "Name");
-            builder.name(message.getHeader(KeystoneConstants.NAME, String.class));
+            ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+            builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
 
             if (headers.containsKey(KeystoneConstants.DOMAIN_ID)) {
                 builder.domainId(message.getHeader(KeystoneConstants.DOMAIN_ID, String.class));

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/RouterProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/RouterProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/RouterProducer.java
index ef8913b..4dfcf4d 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/RouterProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/RouterProducer.java
@@ -22,6 +22,7 @@ import java.util.Map;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.component.openstack.neutron.NeutronConstants;
 import org.apache.camel.component.openstack.neutron.NeutronEndpoint;
 import org.apache.camel.util.ObjectHelper;
@@ -43,19 +44,19 @@ public class RouterProducer extends AbstractOpenstackProducer {
     public void process(Exchange exchange) throws Exception {
         final String operation = getOperation(exchange);
         switch (operation) {
-        case NeutronConstants.CREATE:
+        case OpenstackConstants.CREATE:
             doCreate(exchange);
             break;
-        case NeutronConstants.GET:
+        case OpenstackConstants.GET:
             doGet(exchange);
             break;
-        case NeutronConstants.GET_ALL:
+        case OpenstackConstants.GET_ALL:
             doGetAll(exchange);
             break;
-        case NeutronConstants.UPDATE:
+        case OpenstackConstants.UPDATE:
             doUpdate(exchange);
             break;
-        case NeutronConstants.DELETE:
+        case OpenstackConstants.DELETE:
             doDelete(exchange);
             break;
         case NeutronConstants.ATTACH_INTERFACE:
@@ -77,7 +78,7 @@ public class RouterProducer extends AbstractOpenstackProducer {
 
     private void doGet(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.ROUTER_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.ROUTER_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Router ID");
         final Router result = os.networking().router().get(id);
         msg.setBody(result);
@@ -97,7 +98,7 @@ public class RouterProducer extends AbstractOpenstackProducer {
 
     private void doDelete(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.ROUTER_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.ROUTER_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Router ID");
         final ActionResponse response = os.networking().router().delete(id);
         checkFailure(response, msg, "Delete router with ID " + id);
@@ -132,8 +133,8 @@ public class RouterProducer extends AbstractOpenstackProducer {
             Map headers = message.getHeaders();
             RouterBuilder builder = Builders.router();
 
-            ObjectHelper.notEmpty(message.getHeader(NeutronConstants.NAME, String.class), "Name");
-            builder.name(message.getHeader(NeutronConstants.NAME, String.class));
+            ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+            builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
 
             if (headers.containsKey(NeutronConstants.TENANT_ID)) {
                 builder.tenantId(message.getHeader(NeutronConstants.TENANT_ID, String.class));

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
index 508e36e..ee5ae6e 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
@@ -22,6 +22,7 @@ import java.util.Map;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.component.openstack.neutron.NeutronConstants;
 import org.apache.camel.component.openstack.neutron.NeutronEndpoint;
 import org.apache.camel.util.ObjectHelper;
@@ -43,16 +44,16 @@ public class SubnetProducer extends AbstractOpenstackProducer {
     public void process(Exchange exchange) throws Exception {
         final String operation = getOperation(exchange);
         switch (operation) {
-        case NeutronConstants.CREATE:
+        case OpenstackConstants.CREATE:
             doCreate(exchange);
             break;
-        case NeutronConstants.GET:
+        case OpenstackConstants.GET:
             doGet(exchange);
             break;
-        case NeutronConstants.GET_ALL:
+        case OpenstackConstants.GET_ALL:
             doGetAll(exchange);
             break;
-        case NeutronConstants.DELETE:
+        case OpenstackConstants.DELETE:
             doDelete(exchange);
             break;
         default:
@@ -68,7 +69,7 @@ public class SubnetProducer extends AbstractOpenstackProducer {
 
     private void doGet(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.SUBNET_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.SUBNET_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Subnet ID");
         final Subnet out = os.networking().subnet().get(id);
         exchange.getIn().setBody(out);
@@ -81,7 +82,7 @@ public class SubnetProducer extends AbstractOpenstackProducer {
 
     private void doDelete(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.SUBNET_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.SUBNET_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Subnet ID");
         final ActionResponse response = os.networking().subnet().delete(id);
         checkFailure(response, msg, "Delete network " + id);
@@ -94,8 +95,8 @@ public class SubnetProducer extends AbstractOpenstackProducer {
             Map headers = message.getHeaders();
             SubnetBuilder builder = Builders.subnet();
 
-            ObjectHelper.notEmpty(message.getHeader(NeutronConstants.NAME, String.class), "Name");
-            builder.name(message.getHeader(NeutronConstants.NAME, String.class));
+            ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+            builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
 
             ObjectHelper.notEmpty(message.getHeader(NeutronConstants.NETWORK_ID, String.class), "Network ID");
             builder.networkId(message.getHeader(NeutronConstants.NETWORK_ID, String.class));

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
index 0c8bb5f..1af60eb 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
@@ -22,6 +22,7 @@ import java.util.Map;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.component.openstack.nova.NovaConstants;
 import org.apache.camel.component.openstack.nova.NovaEndpoint;
 import org.apache.camel.util.ObjectHelper;
@@ -43,19 +44,19 @@ public class ServerProducer extends AbstractOpenstackProducer {
     public void process(Exchange exchange) throws Exception {
         final String operation = getOperation(exchange);
         switch (operation) {
-        case NovaConstants.CREATE:
+        case OpenstackConstants.CREATE:
             doCreate(exchange);
             break;
         case NovaConstants.CREATE_SNAPSHOT:
             doCreateSnapshot(exchange);
             break;
-        case NovaConstants.GET:
+        case OpenstackConstants.GET:
             doGet(exchange);
             break;
-        case NovaConstants.GET_ALL:
+        case OpenstackConstants.GET_ALL:
             doGetAll(exchange);
             break;
-        case NovaConstants.DELETE:
+        case OpenstackConstants.DELETE:
             doDelete(exchange);
             break;
         case NovaConstants.ACTION:
@@ -80,8 +81,8 @@ public class ServerProducer extends AbstractOpenstackProducer {
 
     private void doCreateSnapshot(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String serverId = msg.getHeader(NovaConstants.ID, String.class);
-        final String name = msg.getHeader(NovaConstants.NAME, String.class);
+        final String serverId = msg.getHeader(OpenstackConstants.ID, String.class);
+        final String name = msg.getHeader(OpenstackConstants.NAME, String.class);
         ObjectHelper.notEmpty(serverId, "Server ID");
         ObjectHelper.notEmpty(name, "VolumeSnapshot name");
 
@@ -91,7 +92,7 @@ public class ServerProducer extends AbstractOpenstackProducer {
 
     private void doGet(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String serverId = msg.getHeader(NovaConstants.ID, String.class);
+        final String serverId = msg.getHeader(OpenstackConstants.ID, String.class);
         ObjectHelper.notEmpty(serverId, "Server ID");
         final Server result = os.compute().servers().get(serverId);
         msg.setBody(result);
@@ -105,7 +106,7 @@ public class ServerProducer extends AbstractOpenstackProducer {
     private void doAction(Exchange exchange) {
         final Message msg = exchange.getIn();
         final Action action = msg.getHeader(NovaConstants.ACTION, Action.class);
-        final String serverId = msg.getHeader(NovaConstants.ID, String.class);
+        final String serverId = msg.getHeader(OpenstackConstants.ID, String.class);
         ObjectHelper.notNull(action, "Server action");
         ObjectHelper.notEmpty(serverId, "Server ID");
         final ActionResponse response = os.compute().servers().action(serverId, action);
@@ -114,7 +115,7 @@ public class ServerProducer extends AbstractOpenstackProducer {
 
     private void doDelete(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String serverId = msg.getHeader(NovaConstants.ID, String.class);
+        final String serverId = msg.getHeader(OpenstackConstants.ID, String.class);
         ObjectHelper.notEmpty(serverId, "Server ID");
         final ActionResponse response = os.compute().servers().delete(serverId);
         checkFailure(response, msg, "Delete server with ID " + serverId);
@@ -127,8 +128,8 @@ public class ServerProducer extends AbstractOpenstackProducer {
             Map headers = message.getHeaders();
             ServerCreateBuilder builder = Builders.server();
 
-            ObjectHelper.notEmpty(message.getHeader(NovaConstants.NAME, String.class), "Name");
-            builder.name(message.getHeader(NovaConstants.NAME, String.class));
+            ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+            builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
 
             if (headers.containsKey(NovaConstants.IMAGE_ID)) {
                 builder.image(message.getHeader(NovaConstants.IMAGE_ID, String.class));

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
index 580b91c..cc46a11 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.openstack.cinder;
 import java.util.UUID;
 
 import org.apache.camel.component.openstack.cinder.producer.VolumeProducer;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -63,7 +64,7 @@ public class VolumeProducerTest extends CinderProducerTestSupport {
 
     @Test
     public void createVolumeTest() throws Exception {
-        when(endpoint.getOperation()).thenReturn(CinderConstants.CREATE);
+        when(endpoint.getOperation()).thenReturn(OpenstackConstants.CREATE);
         msg.setBody(dummyVolume);
         producer.process(exchange);
         assertEqualVolumes(dummyVolume, msg.getBody(Volume.class));
@@ -72,13 +73,13 @@ public class VolumeProducerTest extends CinderProducerTestSupport {
     @Test
     public void updateVolumeTest() throws Exception {
         when(volumeService.update(anyString(), anyString(), anyString())).thenReturn(ActionResponse.actionSuccess());
-        msg.setHeader(CinderConstants.OPERATION, CinderConstants.UPDATE);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE);
         final String id = "id";
         final String desc = "newDesc";
         final String name = "newName";
-        msg.setHeader(CinderConstants.ID, id);
-        msg.setHeader(CinderConstants.DESCRIPTION, desc);
-        msg.setHeader(CinderConstants.NAME, name);
+        msg.setHeader(OpenstackConstants.ID, id);
+        msg.setHeader(OpenstackConstants.DESCRIPTION, desc);
+        msg.setHeader(OpenstackConstants.NAME, name);
 
         producer.process(exchange);
 
@@ -99,9 +100,9 @@ public class VolumeProducerTest extends CinderProducerTestSupport {
         final String faultMessage = "fault";
         when(volumeService.update(anyString(), anyString(), anyString())).thenReturn(ActionResponse.actionFailed(faultMessage, 401));
 
-        msg.setHeader(CinderConstants.OPERATION, CinderConstants.UPDATE);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE);
         final String id = "id";
-        msg.setHeader(CinderConstants.ID, id);
+        msg.setHeader(OpenstackConstants.ID, id);
         msg.setBody(createTestVolume());
 
         producer.process(exchange);
@@ -112,8 +113,8 @@ public class VolumeProducerTest extends CinderProducerTestSupport {
 
     @Test
     public void getVolumeTest() throws Exception {
-        when(endpoint.getOperation()).thenReturn(CinderConstants.GET);
-        msg.setHeader(CinderConstants.ID, "anyID");
+        when(endpoint.getOperation()).thenReturn(OpenstackConstants.GET);
+        msg.setHeader(OpenstackConstants.ID, "anyID");
         producer.process(exchange);
 
         assertEqualVolumes(dummyVolume, msg.getBody(Volume.class));
@@ -121,10 +122,10 @@ public class VolumeProducerTest extends CinderProducerTestSupport {
 
     @Test
     public void deleteVolumeTest() throws Exception {
-        msg.setHeader(CinderConstants.OPERATION, CinderConstants.DELETE);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE);
         when(volumeService.delete(anyString())).thenReturn(ActionResponse.actionSuccess());
         final String id = "id";
-        msg.setHeader(CinderConstants.ID, id);
+        msg.setHeader(OpenstackConstants.ID, id);
 
         producer.process(exchange);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
index 4ab2144..4212f33 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.openstack.cinder;
 import java.util.UUID;
 
 import org.apache.camel.component.openstack.cinder.producer.SnapshotProducer;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -59,7 +60,7 @@ public class VolumeSnapshotProducerTest extends CinderProducerTestSupport {
 
     @Test
     public void createVolumeTest() throws Exception {
-        when(endpoint.getOperation()).thenReturn(CinderConstants.CREATE);
+        when(endpoint.getOperation()).thenReturn(OpenstackConstants.CREATE);
         msg.setBody(dummyVolumeSnapshot);
         producer.process(exchange);
         final VolumeSnapshot result = msg.getBody(VolumeSnapshot.class);
@@ -70,13 +71,13 @@ public class VolumeSnapshotProducerTest extends CinderProducerTestSupport {
     @Test
     public void updateVolumeSnapshotTest() throws Exception {
         when(snapshotService.update(anyString(), anyString(), anyString())).thenReturn(ActionResponse.actionSuccess());
-        msg.setHeader(CinderConstants.OPERATION, CinderConstants.UPDATE);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE);
         final String id = "id";
         final String desc = "newDesc";
         final String name = "newName";
-        msg.setHeader(CinderConstants.ID, id);
-        msg.setHeader(CinderConstants.DESCRIPTION, desc);
-        msg.setHeader(CinderConstants.NAME, name);
+        msg.setHeader(OpenstackConstants.ID, id);
+        msg.setHeader(OpenstackConstants.DESCRIPTION, desc);
+        msg.setHeader(OpenstackConstants.NAME, name);
 
         producer.process(exchange);
 
@@ -95,8 +96,8 @@ public class VolumeSnapshotProducerTest extends CinderProducerTestSupport {
 
     @Test
     public void getVolumeSnapshotTest() throws Exception {
-        when(endpoint.getOperation()).thenReturn(CinderConstants.GET);
-        msg.setHeader(CinderConstants.ID, "anyID");
+        when(endpoint.getOperation()).thenReturn(OpenstackConstants.GET);
+        msg.setHeader(OpenstackConstants.ID, "anyID");
         producer.process(exchange);
 
         assertEqualsVolumeSnapshots(dummyVolumeSnapshot, msg.getBody(VolumeSnapshot.class));
@@ -104,10 +105,10 @@ public class VolumeSnapshotProducerTest extends CinderProducerTestSupport {
 
     @Test
     public void deleteVolumeSnapshotTest() throws Exception {
-        msg.setHeader(CinderConstants.OPERATION, CinderConstants.DELETE);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE);
         when(snapshotService.delete(anyString())).thenReturn(ActionResponse.actionSuccess());
         final String id = "id";
-        msg.setHeader(CinderConstants.ID, id);
+        msg.setHeader(OpenstackConstants.ID, id);
 
         producer.process(exchange);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
index 4b78e32..7af7c71 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.openstack.keystone;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.component.openstack.keystone.producer.UserProducer;
 import org.apache.camel.component.openstack.neutron.NeutronConstants;
 import org.junit.Before;
@@ -70,8 +71,8 @@ public class UserProducerTest extends KeystoneProducerTestSupport {
 
     @Test
     public void createTest() throws Exception {
-        msg.setHeader(KeystoneConstants.OPERATION, KeystoneConstants.CREATE);
-        msg.setHeader(KeystoneConstants.NAME, dummyUser.getName());
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE);
+        msg.setHeader(OpenstackConstants.NAME, dummyUser.getName());
         msg.setHeader(KeystoneConstants.DESCRIPTION, dummyUser.getDescription());
         msg.setHeader(KeystoneConstants.DOMAIN_ID, dummyUser.getDomainId());
         msg.setHeader(KeystoneConstants.PASSWORD, dummyUser.getPassword());
@@ -88,8 +89,8 @@ public class UserProducerTest extends KeystoneProducerTestSupport {
     @Test
     public void getTest() throws Exception {
         final String id = "id";
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET);
-        msg.setHeader(NeutronConstants.ID, id);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET);
+        msg.setHeader(OpenstackConstants.ID, id);
 
         producer.process(exchange);
 
@@ -102,7 +103,7 @@ public class UserProducerTest extends KeystoneProducerTestSupport {
 
     @Test
     public void getAllTest() throws Exception {
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET_ALL);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET_ALL);
 
         producer.process(exchange);
 
@@ -114,7 +115,7 @@ public class UserProducerTest extends KeystoneProducerTestSupport {
     @Test
     public void updateTest() throws Exception {
         final String id = "myID";
-        msg.setHeader(KeystoneConstants.OPERATION, KeystoneConstants.UPDATE);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE);
 
         when(testOSuser.getId()).thenReturn(id);
         final String newDescription = "ndesc";
@@ -137,8 +138,8 @@ public class UserProducerTest extends KeystoneProducerTestSupport {
     public void deleteTest() throws Exception {
         when(userService.delete(anyString())).thenReturn(ActionResponse.actionSuccess());
         final String networkID = "myID";
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.DELETE);
-        msg.setHeader(NeutronConstants.ID, networkID);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE);
+        msg.setHeader(OpenstackConstants.ID, networkID);
 
         producer.process(exchange);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
index 805f7e4..227d5d6 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.component.openstack.neutron.producer.RouterProducer;
 import org.junit.Before;
 import org.junit.Test;
@@ -68,8 +69,8 @@ public class RouterProducerTest extends NeutronProducerTestSupport {
 
     @Test
     public void createTest() throws Exception {
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.CREATE);
-        msg.setHeader(NeutronConstants.NAME, dummyRouter.getName());
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE);
+        msg.setHeader(OpenstackConstants.NAME, dummyRouter.getName());
         msg.setHeader(NeutronConstants.TENANT_ID, dummyRouter.getTenantId());
 
         producer.process(exchange);
@@ -84,7 +85,7 @@ public class RouterProducerTest extends NeutronProducerTestSupport {
     @Test
     public void getTest() throws Exception {
         final String routerID = "myRouterID";
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET);
         msg.setHeader(NeutronConstants.ROUTER_ID, routerID);
 
         producer.process(exchange);
@@ -98,7 +99,7 @@ public class RouterProducerTest extends NeutronProducerTestSupport {
 
     @Test
     public void getAllTest() throws Exception {
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET_ALL);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET_ALL);
 
         producer.process(exchange);
 
@@ -110,7 +111,7 @@ public class RouterProducerTest extends NeutronProducerTestSupport {
     @Test
     public void updateTest() throws Exception {
         final String routerID = "myRouterID";
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.UPDATE);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE);
         final Router tmp = createRouter();
         final String newName = "newName";
         tmp.setName(newName);
@@ -132,8 +133,8 @@ public class RouterProducerTest extends NeutronProducerTestSupport {
     public void deleteTest() throws Exception {
         when(routerService.delete(anyString())).thenReturn(ActionResponse.actionSuccess());
         final String routerID = "myRouterID";
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.DELETE);
-        msg.setHeader(NeutronConstants.ID, routerID);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE);
+        msg.setHeader(OpenstackConstants.ID, routerID);
 
         producer.process(exchange);
 
@@ -158,7 +159,7 @@ public class RouterProducerTest extends NeutronProducerTestSupport {
         final RouterInterface ifce = new NeutronRouterInterface(subnetId, portId);
         when(routerService.detachInterface(anyString(), anyString(), anyString())).thenReturn(ifce);
 
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.DETACH_INTERFACE);
+        msg.setHeader(OpenstackConstants.OPERATION, NeutronConstants.DETACH_INTERFACE);
         msg.setHeader(NeutronConstants.ROUTER_ID, routerID);
         msg.setHeader(NeutronConstants.SUBNET_ID, subnetId);
         msg.setHeader(NeutronConstants.PORT_ID, portId);
@@ -184,7 +185,7 @@ public class RouterProducerTest extends NeutronProducerTestSupport {
         final RouterInterface ifce = new NeutronRouterInterface(subnetId, null);
         when(routerService.attachInterface(anyString(), any(AttachInterfaceType.class), anyString())).thenReturn(ifce);
 
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.ATTACH_INTERFACE);
+        msg.setHeader(OpenstackConstants.OPERATION, NeutronConstants.ATTACH_INTERFACE);
         msg.setHeader(NeutronConstants.ROUTER_ID, routerID);
         msg.setHeader(NeutronConstants.SUBNET_ID, subnetId);
         msg.setHeader(NeutronConstants.ITERFACE_TYPE, AttachInterfaceType.SUBNET);

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
index c663bb3..948b0c4 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.component.openstack.neutron.producer.SubnetProducer;
 import org.junit.Before;
 import org.junit.Test;
@@ -66,8 +67,8 @@ public class SubnetProducerTest extends NeutronProducerTestSupport {
 
     @Test
     public void createTest() throws Exception {
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.CREATE);
-        msg.setHeader(NeutronConstants.NAME, dummySubnet.getName());
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE);
+        msg.setHeader(OpenstackConstants.NAME, dummySubnet.getName());
         msg.setHeader(NeutronConstants.NETWORK_ID, dummySubnet.getNetworkId());
         msg.setHeader(NeutronConstants.IP_VERSION, IPVersionType.V4);
 
@@ -83,7 +84,7 @@ public class SubnetProducerTest extends NeutronProducerTestSupport {
     @Test
     public void getTest() throws Exception {
         final String subnetID = "myNetID";
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET);
         msg.setHeader(NeutronConstants.SUBNET_ID, subnetID);
 
         producer.process(exchange);
@@ -97,7 +98,7 @@ public class SubnetProducerTest extends NeutronProducerTestSupport {
 
     @Test
     public void getAllTest() throws Exception {
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET_ALL);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET_ALL);
 
         producer.process(exchange);
 
@@ -110,8 +111,8 @@ public class SubnetProducerTest extends NeutronProducerTestSupport {
     public void deleteTest() throws Exception {
         when(subnetService.delete(anyString())).thenReturn(ActionResponse.actionSuccess());
         final String subnetID = "myNetID";
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.DELETE);
-        msg.setHeader(NeutronConstants.ID, subnetID);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE);
+        msg.setHeader(OpenstackConstants.ID, subnetID);
 
         producer.process(exchange);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
index bf6dff2..1681292 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.openstack.nova;
 
 import java.util.UUID;
 
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.component.openstack.nova.producer.ServerProducer;
 import org.junit.Before;
 import org.junit.Test;
@@ -58,7 +59,7 @@ public class ServerProducerTest extends NovaProducerTestSupport {
 
     @Test
     public void createServer() throws Exception {
-        when(endpoint.getOperation()).thenReturn(NovaConstants.CREATE);
+        when(endpoint.getOperation()).thenReturn(OpenstackConstants.CREATE);
         final String expectedFlavorID = UUID.randomUUID().toString();
         when(testOSServer.getId()).thenReturn(expectedFlavorID);
         msg.setBody(dummyServer);
@@ -72,8 +73,8 @@ public class ServerProducerTest extends NovaProducerTestSupport {
         final String expectedFlavorID = UUID.randomUUID().toString();
         when(testOSServer.getId()).thenReturn(expectedFlavorID);
 
-        msg.setHeader(NovaConstants.OPERATION, NovaConstants.CREATE);
-        msg.setHeader(NovaConstants.NAME, dummyServer.getName());
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE);
+        msg.setHeader(OpenstackConstants.NAME, dummyServer.getName());
         msg.setHeader(NovaConstants.FLAVOR_ID, dummyServer.getFlavorRef());
         msg.setHeader(NovaConstants.IMAGE_ID, dummyServer.getImageRef());
 
@@ -90,7 +91,7 @@ public class ServerProducerTest extends NovaProducerTestSupport {
         when(endpoint.getOperation()).thenReturn(NovaConstants.ACTION);
         String id = "myID";
         msg.setHeader(NovaConstants.ACTION, Action.PAUSE);
-        msg.setHeader(NovaConstants.ID, id);
+        msg.setHeader(OpenstackConstants.ID, id);
         producer.process(exchange);
 
         ArgumentCaptor<Action> actionArgumentCaptor = ArgumentCaptor.forClass(Action.class);
@@ -115,9 +116,9 @@ public class ServerProducerTest extends NovaProducerTestSupport {
         String id = "myID";
         String snapshotName = "mySnapshot";
 
-        msg.setHeader(NovaConstants.OPERATION, NovaConstants.CREATE_SNAPSHOT);
-        msg.setHeader(NovaConstants.NAME, snapshotName);
-        msg.setHeader(NovaConstants.ID, id);
+        msg.setHeader(OpenstackConstants.OPERATION, NovaConstants.CREATE_SNAPSHOT);
+        msg.setHeader(OpenstackConstants.NAME, snapshotName);
+        msg.setHeader(OpenstackConstants.ID, id);
         producer.process(exchange);
 
         ArgumentCaptor<String> snapshot = ArgumentCaptor.forClass(String.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/processor/RibbonServiceCallProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/processor/RibbonServiceCallProcessor.java b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/processor/RibbonServiceCallProcessor.java
index 25f1449..f9151ce 100644
--- a/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/processor/RibbonServiceCallProcessor.java
+++ b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/processor/RibbonServiceCallProcessor.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.ribbon.processor;
 import java.util.Map;
 import java.util.concurrent.RejectedExecutionException;
 
+import com.netflix.client.config.CommonClientConfigKey;
 import com.netflix.client.config.IClientConfig;
 import com.netflix.client.config.IClientConfigKey;
 import com.netflix.loadbalancer.DummyPing;
@@ -221,7 +222,7 @@ public class RibbonServiceCallProcessor extends ServiceSupport implements AsyncP
         IClientConfig config = IClientConfig.Builder.newBuilder(name).build();
         if (ribbonClientConfig != null) {
             for (Map.Entry<String, String> entry : ribbonClientConfig.entrySet()) {
-                IClientConfigKey key = IClientConfigKey.Keys.valueOf(entry.getKey());
+                IClientConfigKey key = CommonClientConfigKey.valueOf(entry.getKey());
                 String value = entry.getValue();
                 LOG.debug("RibbonClientConfig: {}={}", key.key(), value);
                 config.set(key, entry.getValue());

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistSerializer.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistSerializer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistSerializer.java
index 7cbd99c..2215e45 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistSerializer.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistSerializer.java
@@ -44,7 +44,7 @@ public class StringMultiSelectPicklistSerializer extends StdSerializer<Object> {
             // construct a string of form value1;value2;...
             final StringBuilder buffer = new StringBuilder();
             for (int i = 0; i < length; i++) {
-                buffer.append((String) a[i].trim());
+                buffer.append(a[i].trim());
                 if (i < (length - 1)) {
                     buffer.append(';');
                 }

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppNLSTSplitterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppNLSTSplitterTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppNLSTSplitterTest.java
index b3cacd1..b45c701 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppNLSTSplitterTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppNLSTSplitterTest.java
@@ -16,12 +16,7 @@
  */
 package org.apache.camel.component.smpp;
 
-import java.nio.charset.Charset;
-
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
@@ -57,7 +52,7 @@ public class SmppNLSTSplitterTest {
 
         assertEquals(2, result.length);
         assertArrayEquals(new byte[]{
-            SmppNLSTSplitter.UDHIE_NLI_MULTI_MSG_HEADER_LENGTH, SmppNLSTSplitter.UDHIE_IDENTIFIER_SAR, SmppNLSTSplitter.UDHIE_SAR_LENGTH, 1, 2, 1,
+            SmppNLSTSplitter.UDHIE_NLI_MULTI_MSG_HEADER_LENGTH, SmppSplitter.UDHIE_IDENTIFIER_SAR, SmppSplitter.UDHIE_SAR_LENGTH, 1, 2, 1,
             SmppNLSTSplitter.UDHIE_NLI_IDENTIFIER, SmppNLSTSplitter.UDHIE_NLI_HEADER_LENGTH, turkishLanguageIdentifier,
             49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48,
             49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 49, 50, 51, 52, 53,
@@ -65,7 +60,7 @@ public class SmppNLSTSplitterTest {
             49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}, result[0]);
 
         assertArrayEquals(new byte[]{
-            SmppNLSTSplitter.UDHIE_NLI_MULTI_MSG_HEADER_LENGTH, SmppNLSTSplitter.UDHIE_IDENTIFIER_SAR, SmppNLSTSplitter.UDHIE_SAR_LENGTH, 1, 2, 2,
+            SmppNLSTSplitter.UDHIE_NLI_MULTI_MSG_HEADER_LENGTH, SmppSplitter.UDHIE_IDENTIFIER_SAR, SmppSplitter.UDHIE_SAR_LENGTH, 1, 2, 2,
             SmppNLSTSplitter.UDHIE_NLI_IDENTIFIER, SmppNLSTSplitter.UDHIE_NLI_HEADER_LENGTH, turkishLanguageIdentifier,
             48, 49, 50, 51, 52, 53, 54}, result[1]);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java b/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java
index f891c19..7066498 100644
--- a/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java
+++ b/components/camel-weather/src/main/java/org/apache/camel/component/weather/WeatherConfiguration.java
@@ -366,7 +366,7 @@ public class WeatherConfiguration {
     }
 
     public List<String> getIds() {
-        return (List<String>) ids;
+        return ids;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index ab0a0f0..ab85381 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.websocket;
 import java.lang.management.ManagementFactory;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.net.URL;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/camel/blob/079b5f9e/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
index 3092997..f0e06b2 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
@@ -81,7 +81,7 @@ public class WebsocketComponentServletTest {
         DefaultWebsocket webSocket = websocketComponentServlet.doWebSocketConnect(request, PROTOCOL);
         assertNotNull(webSocket);
         assertEquals(DefaultWebsocket.class, webSocket.getClass());
-        DefaultWebsocket defaultWebsocket = (DefaultWebsocket) webSocket;
+        DefaultWebsocket defaultWebsocket = webSocket;
         defaultWebsocket.setConnectionKey(CONNECTION_KEY);
         defaultWebsocket.onMessage(MESSAGE);
         InOrder inOrder = inOrder(consumer, sync, request);
@@ -94,7 +94,7 @@ public class WebsocketComponentServletTest {
         DefaultWebsocket webSocket = websocketComponentServlet.doWebSocketConnect(request, PROTOCOL);
         assertNotNull(webSocket);
         assertEquals(DefaultWebsocket.class, webSocket.getClass());
-        DefaultWebsocket defaultWebsocket = (DefaultWebsocket) webSocket;
+        DefaultWebsocket defaultWebsocket = webSocket;
         defaultWebsocket.setConnectionKey(CONNECTION_KEY);
         defaultWebsocket.onMessage(MESSAGE);
         InOrder inOrder = inOrder(consumer, sync, request);


Mime
View raw message