Polish

camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java

@@ -17,7 +17,6 @@
 package org.apache.camel.util;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import junit.framework.TestCase;

components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java

@@ -62,7 +62,7 @@ public void pullImageHeaderTest() {
     @Override
     protected void setupMocks() {
         Mockito.when(dockerClient.pullImageCmd(Matchers.anyString())).thenReturn(mockObject);
-        Mockito.when(mockObject.exec(Mockito.anyObject())).thenReturn(callback);
+        Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
         try {
             Mockito.when(callback.awaitCompletion()).thenReturn(callback);
         } catch (InterruptedException e) {

components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java

@@ -70,7 +70,7 @@ public void pushImageHeaderTest() {
     @Override
     protected void setupMocks() {
         Mockito.when(dockerClient.pushImageCmd(Matchers.anyString())).thenReturn(mockObject);
-        Mockito.when(mockObject.exec(Mockito.anyObject())).thenReturn(callback);
+        Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
         try {
             Mockito.when(callback.awaitCompletion()).thenReturn(callback);
         } catch (InterruptedException e) {

components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/MockQueue.java

@@ -90,8 +90,8 @@ public void deleteMessage(String id, String reservationId) throws IOException {
     @Override
     public void deleteMessages(Messages messages) throws IOException {
         MessageOptions[] messageOptions = messages.toMessageOptions();
-        for (int i = 0; i < messageOptions.length; i++) {
-            deleteMessage(messageOptions[i].getId(), messageOptions[i].getReservationId());
+        for (MessageOptions messageOption : messageOptions) {
+            deleteMessage(messageOption.getId(), messageOption.getReservationId());
         }
     }
 

components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerTest.java

@@ -29,7 +29,6 @@
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit.rule.mllp.MllpServerResource;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 

components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/processor/idempotent/MongoDbIdempotentRepositoryTest.java

@@ -38,7 +38,7 @@ public void clearDB() {
     @Override
     public void doPostSetup() {
         super.doPostSetup();
-        repo = new MongoDbIdempotentRepository<>((MongoClient) mongo, testCollectionName, dbName);
+        repo = new MongoDbIdempotentRepository<>(mongo, testCollectionName, dbName);
     }
 
     @Test

components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/ProjectProducer.java

@@ -21,6 +21,7 @@
 
 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 ProjectProducer(KeystoneEndpoint endpoint, OSClient client) {
     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 @@ private void doCreate(Exchange exchange) {
 
     private void doGet(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(KeystoneConstants.ID, String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, String.class);
         ObjectHelper.notEmpty(id, "Project ID");
         final Project result = osV3Client.identity().projects().get(id);
         msg.setBody(result);
@@ -88,7 +89,7 @@ private void doUpdate(Exchange exchange) {
 
     private void doDelete(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(KeystoneConstants.ID, String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, String.class);
         ObjectHelper.notEmpty(id, "Project ID");
         final ActionResponse response = osV3Client.identity().projects().delete(id);
         checkFailure(response, msg, "Delete project with ID " + id);
@@ -101,8 +102,8 @@ private Project messageToProject(Message message) {
             Map headers = message.getHeaders();
             ProjectBuilder builder = Builders.project();
 
-            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));

components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/RegionProducer.java

@@ -21,6 +21,7 @@
 
 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 RegionProducer(KeystoneEndpoint endpoint, OSClient client) {
     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:
@@ -67,7 +68,7 @@ private void doCreate(Exchange exchange) {
     }
 
     private void doGet(Exchange exchange) {
-        final String id = exchange.getIn().getHeader(KeystoneConstants.ID, String.class);
+        final String id = exchange.getIn().getHeader(OpenstackConstants.ID, String.class);
         ObjectHelper.notEmpty(id, "Region ID");
         final Region out = osV3Client.identity().regions().get(id);
         exchange.getIn().setBody(out);
@@ -87,7 +88,7 @@ private void doUpdate(Exchange exchange) {
 
     private void doDelete(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(KeystoneConstants.ID, String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, String.class);
         ObjectHelper.notEmpty(id, "Region ID");
         final ActionResponse response = osV3Client.identity().regions().delete(id);
         checkFailure(response, msg, "Delete network" + id);

components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/NetworkProducer.java

@@ -22,6 +22,7 @@
 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;
@@ -42,16 +43,16 @@ public NetworkProducer(NeutronEndpoint endpoint, OSClient client) {
     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:
@@ -67,7 +68,7 @@ private void doCreate(Exchange exchange) {
 
     private void doGet(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.NETWORK_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.NETWORK_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Network ID");
         final Network out = os.networking().network().get(id);
         exchange.getIn().setBody(out);
@@ -80,7 +81,7 @@ private void doGetAll(Exchange exchange) {
 
     private void doDelete(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.NETWORK_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.NETWORK_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Network ID");
         final ActionResponse response = os.networking().network().delete(id);
         checkFailure(response, msg, "Delete network" + id);
@@ -92,8 +93,8 @@ private Network messageToNetwork(Message message) {
             Map headers = message.getHeaders();
             NetworkBuilder builder = Builders.network();
 
-            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.ADMIN_STATE_UP)) {
                 builder.adminStateUp(message.getHeader(NeutronConstants.ADMIN_STATE_UP, Boolean.class));

components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/PortProducer.java

@@ -22,6 +22,7 @@
 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;
@@ -41,19 +42,19 @@ public PortProducer(NeutronEndpoint endpoint, OSClient client) {
     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;
         default:
@@ -69,7 +70,7 @@ private void doCreate(Exchange exchange) {
 
     private void doGet(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.PORT_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.PORT_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Port ID");
         final Port result = os.networking().port().get(id);
         msg.setBody(result);
@@ -89,7 +90,7 @@ private void doUpdate(Exchange exchange) {
 
     private void doDelete(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.PORT_ID, String.class), String.class);
+        final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.PORT_ID, String.class), String.class);
         ObjectHelper.notEmpty(id, "Port ID");
         final ActionResponse response = os.networking().port().delete(id);
         checkFailure(response, msg, "Delete port with ID " + id);
@@ -102,8 +103,8 @@ private Port messageToPort(Message message) {
             Map headers = message.getHeaders();
             PortBuilder builder = Builders.port();
 
-            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));

components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java

@@ -22,6 +22,7 @@
 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.swift.SwiftConstants;
 import org.apache.camel.component.openstack.swift.SwiftEndpoint;
 import org.apache.camel.util.ObjectHelper;
@@ -42,16 +43,16 @@ public void process(Exchange exchange) throws Exception {
         String operation = getOperation(exchange);
 
         switch (operation) {
-        case SwiftConstants.CREATE:
+        case OpenstackConstants.CREATE:
             doCreate(exchange);
             break;
-        case SwiftConstants.GET:
+        case OpenstackConstants.GET:
             doGet(exchange);
             break;
-        case SwiftConstants.GET_ALL:
+        case OpenstackConstants.GET_ALL:
             doGetAll(exchange);
             break;
-        case SwiftConstants.DELETE:
+        case OpenstackConstants.DELETE:
             doDelete(exchange);
             break;
         case SwiftConstants.GET_METADATA:
@@ -88,7 +89,7 @@ private void doGet(Exchange exchange) {
 
     private void doGetAll(Exchange exchange) {
         final Message msg = exchange.getIn();
-        final String name = msg.getHeader(SwiftConstants.CONTAINER_NAME, msg.getHeader(SwiftConstants.NAME, String.class), String.class);
+        final String name = msg.getHeader(SwiftConstants.CONTAINER_NAME, msg.getHeader(OpenstackConstants.NAME, String.class), String.class);
         ObjectHelper.notEmpty(name, "Container name");
         final List<? extends SwiftObject> out = os.objectStorage().objects().list(name);
         exchange.getIn().setBody(out);

components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java

@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.camel.component.openstack.common.OpenstackConstants;
 import org.apache.camel.component.openstack.keystone.producer.ProjectProducer;
 import org.apache.camel.component.openstack.neutron.NeutronConstants;
 import org.junit.Before;
@@ -67,8 +68,8 @@ public void setUp() {
 
     @Test
     public void createTest() throws Exception {
-        msg.setHeader(KeystoneConstants.OPERATION, KeystoneConstants.CREATE);
-        msg.setHeader(KeystoneConstants.NAME, dummyProject.getName());
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE);
+        msg.setHeader(OpenstackConstants.NAME, dummyProject.getName());
         msg.setHeader(KeystoneConstants.DESCRIPTION, dummyProject.getDescription());
         msg.setHeader(KeystoneConstants.DOMAIN_ID, dummyProject.getDomainId());
         msg.setHeader(KeystoneConstants.PARENT_ID, dummyProject.getParentId());
@@ -85,8 +86,8 @@ public void createTest() throws Exception {
     @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);
 
@@ -99,7 +100,7 @@ public void getTest() throws Exception {
 
     @Test
     public void getAllTest() throws Exception {
-        msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET_ALL);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET_ALL);
 
         producer.process(exchange);
 
@@ -111,7 +112,7 @@ public void getAllTest() throws Exception {
     @Test
     public void updateTest() throws Exception {
         final String id = "myID";
-        msg.setHeader(KeystoneConstants.OPERATION, KeystoneConstants.UPDATE);
+        msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE);
         final String newName = "newName";
 
         when(testOSproject.getId()).thenReturn(id);
@@ -135,8 +136,8 @@ public void updateTest() throws Exception {
     public void deleteTest() throws Exception {
         when(projectService.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);