From 3fd9102b357dc3d750905a72b035541a16cfdfb0 Mon Sep 17 00:00:00 2001 From: Babak Vahdat Date: Sun, 18 Dec 2016 17:16:27 +0100 Subject: [PATCH] Polish --- .../camel/util/OrderedComparatorTest.java | 1 - .../headers/PullImageCmdHeaderTest.java | 2 +- .../headers/PushImageCmdHeaderTest.java | 2 +- .../camel/component/ironmq/MockQueue.java | 4 ++-- .../mllp/MllpTcpClientProducerTest.java | 1 - .../MongoDbIdempotentRepositoryTest.java | 2 +- .../keystone/producer/ProjectProducer.java | 19 ++++++++++--------- .../keystone/producer/RegionProducer.java | 15 ++++++++------- .../neutron/producer/NetworkProducer.java | 17 +++++++++-------- .../neutron/producer/PortProducer.java | 19 ++++++++++--------- .../swift/producer/ObjectProducer.java | 11 ++++++----- .../keystone/ProjectProducerTest.java | 17 +++++++++-------- .../keystone/RegionProducerTest.java | 15 ++++++++------- .../neutron/NetworkProducerTest.java | 13 +++++++------ .../openstack/neutron/PortProducerTest.java | 17 +++++++++-------- .../openstack/swift/ObjectProducerTest.java | 15 ++++++++------- .../salesforce/api/dto/RestError.java | 2 -- .../api/dto/composite/ReferenceId.java | 1 - .../template/generated/ParseException.java | 12 ++++++------ .../component/sql/stored/ParserTest.java | 2 +- .../sql/stored/ProducerBatchTest.java | 2 +- .../camel/example/transformer/demo/Order.java | 5 ----- .../transformer/demo/OrderProcessor.java | 5 ----- .../transformer/demo/OrderResponse.java | 6 ------ parent/pom.xml | 2 +- 25 files changed, 98 insertions(+), 109 deletions(-) diff --git a/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java b/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java index d663aafabcc66..2c89e77f4c3eb 100644 --- a/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java +++ b/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; diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java index 1a01b0352717d..050468589b8ea 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java +++ b/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) { diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java index 85e4e7c7ae725..edec5e3a68f9c 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java +++ b/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) { diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/MockQueue.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/MockQueue.java index 1d917a83be3a4..9f438417a1c16 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/MockQueue.java +++ b/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()); } } diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerTest.java index 0a98daad286bb..4e47d5bc5fc34 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerTest.java +++ b/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; diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/processor/idempotent/MongoDbIdempotentRepositoryTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/processor/idempotent/MongoDbIdempotentRepositoryTest.java index 25aa56961d002..9731b60be81f0 100644 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/processor/idempotent/MongoDbIdempotentRepositoryTest.java +++ b/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 diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/ProjectProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/ProjectProducer.java index 5a439c89ab694..48beb203b63db 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/ProjectProducer.java +++ b/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)); diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/RegionProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/RegionProducer.java index 0999752da1361..6fb0fa86b84be 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/RegionProducer.java +++ b/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); diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/NetworkProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/NetworkProducer.java index afc014df89dd9..1d49b0deeedb6 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/NetworkProducer.java +++ b/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)); diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/PortProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/PortProducer.java index e3ccf5aa4ea3c..0c7bd830e2458 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/PortProducer.java +++ b/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)); diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java index 25564e7f78d6a..f51b609969ac5 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java +++ b/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 out = os.objectStorage().objects().list(name); exchange.getIn().setBody(out); diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java index c0f79bad73046..d8c5731ae386f 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java +++ b/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); diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java index 6f1cfebaa1040..9b9df53448310 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.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.RegionProducer; import org.apache.camel.component.openstack.neutron.NeutronConstants; import org.junit.Before; @@ -66,7 +67,7 @@ public void setUp() { @Test public void createTest() throws Exception { - msg.setHeader(KeystoneConstants.OPERATION, KeystoneConstants.CREATE); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); msg.setHeader(KeystoneConstants.DESCRIPTION, dummyRegion.getDescription()); producer.process(exchange); @@ -80,8 +81,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); @@ -94,7 +95,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); @@ -106,7 +107,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); when(testOSregion.getId()).thenReturn(id); final String newDescription = "ndesc"; @@ -129,8 +130,8 @@ public void updateTest() throws Exception { public void deleteTest() throws Exception { when(regionService.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); diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java index bcf5d6d61a2a3..4d52bafb8a21b 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.UUID; +import org.apache.camel.component.openstack.common.OpenstackConstants; import org.apache.camel.component.openstack.neutron.producer.NetworkProducer; import org.junit.Before; import org.junit.Test; @@ -67,8 +68,8 @@ public void setUp() { @Test public void createTest() throws Exception { - msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.CREATE); - msg.setHeader(NeutronConstants.NAME, dummyNetwork.getName()); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); + msg.setHeader(OpenstackConstants.NAME, dummyNetwork.getName()); msg.setHeader(NeutronConstants.NETWORK_TYPE, dummyNetwork.getNetworkType()); msg.setHeader(NeutronConstants.TENANT_ID, dummyNetwork.getTenantId()); @@ -84,7 +85,7 @@ public void createTest() throws Exception { @Test public void getTest() throws Exception { final String networkID = "myNetID"; - msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET); msg.setHeader(NeutronConstants.NETWORK_ID, networkID); producer.process(exchange); @@ -98,7 +99,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,8 +112,8 @@ public void getAllTest() throws Exception { public void deleteTest() throws Exception { when(networkService.delete(anyString())).thenReturn(ActionResponse.actionSuccess()); final String networkID = "myNetID"; - 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); diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java index 3b01ab8a55cf0..feb4385b10a47 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.UUID; +import org.apache.camel.component.openstack.common.OpenstackConstants; import org.apache.camel.component.openstack.neutron.producer.PortProducer; import org.junit.Before; import org.junit.Test; @@ -67,8 +68,8 @@ public void setUp() { @Test public void createTest() throws Exception { - msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.CREATE); - msg.setHeader(NeutronConstants.NAME, dummyPort.getName()); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); + msg.setHeader(OpenstackConstants.NAME, dummyPort.getName()); msg.setHeader(NeutronConstants.TENANT_ID, dummyPort.getTenantId()); msg.setHeader(NeutronConstants.NETWORK_ID, dummyPort.getNetworkId()); msg.setHeader(NeutronConstants.MAC_ADDRESS, dummyPort.getMacAddress()); @@ -86,8 +87,8 @@ public void createTest() throws Exception { @Test public void getTest() throws Exception { final String portID = "myNetID"; - msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET); - msg.setHeader(NeutronConstants.ID, portID); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET); + msg.setHeader(OpenstackConstants.ID, portID); producer.process(exchange); @@ -100,7 +101,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); @@ -112,7 +113,7 @@ public void getAllTest() throws Exception { @Test public void updateTest() throws Exception { final String portID = "myID"; - msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.UPDATE); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE); final String newDevId = "dev"; when(testOSport.getDeviceId()).thenReturn(newDevId); when(testOSport.getId()).thenReturn(portID); @@ -133,8 +134,8 @@ public void updateTest() throws Exception { public void deleteTest() throws Exception { when(portService.delete(anyString())).thenReturn(ActionResponse.actionSuccess()); final String portID = "myNetID"; - msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.DELETE); - msg.setHeader(NeutronConstants.ID, portID); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE); + msg.setHeader(OpenstackConstants.ID, portID); producer.process(exchange); diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java index d6b842d621b8e..955c963357917 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.UUID; +import org.apache.camel.component.openstack.common.OpenstackConstants; import org.apache.camel.component.openstack.swift.producer.ObjectProducer; import org.junit.Before; import org.junit.Test; @@ -63,7 +64,7 @@ public void setUp() { @Test public void createTest() throws Exception { when(objectService.put(anyString(), anyString(), any(Payload.class))).thenReturn(ETAG); - msg.setHeader(SwiftConstants.OPERATION, SwiftConstants.CREATE); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); msg.setHeader(SwiftConstants.OBJECT_NAME, OBJECT_NAME); final Payload payload = getTmpPayload(); @@ -85,7 +86,7 @@ public void createTest() throws Exception { @Test public void getTest() throws Exception { when(objectService.get(CONTAINER_NAME, OBJECT_NAME)).thenReturn(mockOsObject); - when(endpoint.getOperation()).thenReturn(SwiftConstants.GET); + when(endpoint.getOperation()).thenReturn(OpenstackConstants.GET); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); msg.setHeader(SwiftConstants.OBJECT_NAME, OBJECT_NAME); @@ -101,7 +102,7 @@ public void getAllFromContainerTest() throws Exception { objectsList.add(mockOsObject); doReturn(objectsList).when(objectService).list(CONTAINER_NAME); - when(endpoint.getOperation()).thenReturn(SwiftConstants.GET_ALL); + when(endpoint.getOperation()).thenReturn(OpenstackConstants.GET_ALL); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); @@ -114,7 +115,7 @@ public void getAllFromContainerTest() throws Exception { public void deleteObjectTest() throws Exception { final String failMessage = "fail"; when(objectService.delete(anyString(), anyString())).thenReturn(ActionResponse.actionSuccess()); - msg.setHeader(SwiftConstants.OPERATION, SwiftConstants.DELETE); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); msg.setHeader(SwiftConstants.OBJECT_NAME, OBJECT_NAME); @@ -134,7 +135,7 @@ public void deleteObjectTest() throws Exception { public void deleteObjectFailTest() throws Exception { final String failMessage = "fail"; when(objectService.delete(anyString(), anyString())).thenReturn(ActionResponse.actionFailed(failMessage, 401)); - msg.setHeader(SwiftConstants.OPERATION, SwiftConstants.DELETE); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); msg.setHeader(SwiftConstants.OBJECT_NAME, OBJECT_NAME); @@ -149,7 +150,7 @@ public void updateMetadataTest() throws Exception { final Map md = new HashMap<>(); md.put("key", "val"); - msg.setHeader(SwiftConstants.OPERATION, SwiftConstants.CREATE_UPDATE_METADATA); + msg.setHeader(OpenstackConstants.OPERATION, SwiftConstants.CREATE_UPDATE_METADATA); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); msg.setHeader(SwiftConstants.OBJECT_NAME, OBJECT_NAME); msg.setBody(md); @@ -171,7 +172,7 @@ public void getMetadataTest() throws Exception { md.put("key", "val"); when(objectService.getMetadata(CONTAINER_NAME, OBJECT_NAME)).thenReturn(md); - msg.setHeader(SwiftConstants.OPERATION, SwiftConstants.GET_METADATA); + msg.setHeader(OpenstackConstants.OPERATION, SwiftConstants.GET_METADATA); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); msg.setHeader(SwiftConstants.OBJECT_NAME, OBJECT_NAME); diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java index 74fbcbb8d4110..3c22fd81ea012 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java @@ -16,11 +16,9 @@ */ package org.apache.camel.component.salesforce.api.dto; -import java.util.Arrays; import java.util.List; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/ReferenceId.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/ReferenceId.java index 2cb970d9fabc2..f81102e5ccd5a 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/ReferenceId.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/ReferenceId.java @@ -17,7 +17,6 @@ package org.apache.camel.component.salesforce.api.dto.composite; import java.io.Serializable; -import java.util.Collections; import java.util.List; import java.util.Objects; diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java index b3829dde52302..8c562f1e24cba 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java @@ -90,14 +90,14 @@ private static String initialise(Token currentToken, String eol = System.getProperty("line.separator", "\n"); StringBuffer expected = new StringBuffer(); int maxSize = 0; - for (int i = 0; i < expectedTokenSequences.length; i++) { - if (maxSize < expectedTokenSequences[i].length) { - maxSize = expectedTokenSequences[i].length; + for (int[] expectedTokenSequence : expectedTokenSequences) { + if (maxSize < expectedTokenSequence.length) { + maxSize = expectedTokenSequence.length; } - for (int j = 0; j < expectedTokenSequences[i].length; j++) { - expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' '); + for (int j = 0; j < expectedTokenSequence.length; j++) { + expected.append(tokenImage[expectedTokenSequence[j]]).append(' '); } - if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) { + if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) { expected.append("..."); } expected.append(eol).append(" "); diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java index 5ed96c43896b0..cc399bee83b3f 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java @@ -107,7 +107,7 @@ public void vendorSpeficSqlTypeOut() { @Test public void nableIssueSyntax() { - Map params = new HashMap<>(); + Map params = new HashMap<>(); params.put("P_STR_IN", "a"); Template template = parser.parseTemplate("IBS.\"Z$IMS_INTERFACE_WS\".TEST_STR(VARCHAR :#P_STR_IN,OUT VARCHAR P_STR_OUT)"); assertEquals("a", ((InputParameter) template.getParameterList().get(0)).getValueExtractor().eval(null, params)); diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java index 8a36c5ee16731..0fce1ea1dc5b0 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java @@ -55,7 +55,7 @@ public void shouldExecuteBatch() throws InterruptedException { mock.expectedMessageCount(1); - List batchParams = new ArrayList<>(); + List> batchParams = new ArrayList<>(); Map batch1 = new HashMap<>(); batchParams.add(batch1); diff --git a/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/Order.java b/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/Order.java index 1ce5a3ae04f69..81f84eabda190 100644 --- a/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/Order.java +++ b/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/Order.java @@ -21,13 +21,8 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.ExchangePattern; -import org.apache.camel.ProducerTemplate; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; -import org.apache.camel.util.IOHelper; -import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; /** * The Order. diff --git a/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/OrderProcessor.java b/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/OrderProcessor.java index 5cf47940b8a8a..918c355bafa09 100644 --- a/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/OrderProcessor.java +++ b/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/OrderProcessor.java @@ -17,12 +17,7 @@ package org.apache.camel.example.transformer.demo; import org.apache.camel.Exchange; -import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.util.IOHelper; -import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; /** * A processor which receives a order request and return a response. diff --git a/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/OrderResponse.java b/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/OrderResponse.java index 3ca2ae5a59ec5..3cbca59b376a7 100644 --- a/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/OrderResponse.java +++ b/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/OrderResponse.java @@ -21,12 +21,6 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.ExchangePattern; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.util.IOHelper; -import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - /** * The OrderResponse. */ diff --git a/parent/pom.xml b/parent/pom.xml index f3a475e90f7a6..073be3bfad822 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -476,8 +476,8 @@ 1.4.27 3.0.2 17.0 - 6.5.0.Final 1.5.0 + 6.5.0.Final 2.0.8_6 2.4_5 4.3.1