You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2016/12/18 16:18:01 UTC
[4/5] camel git commit: Polish
Polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3fd9102b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3fd9102b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3fd9102b
Branch: refs/heads/master
Commit: 3fd9102b357dc3d750905a72b035541a16cfdfb0
Parents: 769a570
Author: Babak Vahdat <bv...@apache.org>
Authored: Sun Dec 18 17:16:27 2016 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sun Dec 18 17:16:27 2016 +0100
----------------------------------------------------------------------
.../apache/camel/util/OrderedComparatorTest.java | 1 -
.../docker/headers/PullImageCmdHeaderTest.java | 2 +-
.../docker/headers/PushImageCmdHeaderTest.java | 2 +-
.../apache/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 +++++++++--------
.../openstack/neutron/producer/PortProducer.java | 19 ++++++++++---------
.../openstack/swift/producer/ObjectProducer.java | 11 ++++++-----
.../openstack/keystone/ProjectProducerTest.java | 17 +++++++++--------
.../openstack/keystone/RegionProducerTest.java | 15 ++++++++-------
.../openstack/neutron/NetworkProducerTest.java | 13 +++++++------
.../openstack/neutron/PortProducerTest.java | 17 +++++++++--------
.../openstack/swift/ObjectProducerTest.java | 15 ++++++++-------
.../component/salesforce/api/dto/RestError.java | 2 --
.../api/dto/composite/ReferenceId.java | 1 -
.../template/generated/ParseException.java | 12 ++++++------
.../camel/component/sql/stored/ParserTest.java | 2 +-
.../component/sql/stored/ProducerBatchTest.java | 2 +-
.../camel/example/transformer/demo/Order.java | 5 -----
.../example/transformer/demo/OrderProcessor.java | 5 -----
.../example/transformer/demo/OrderResponse.java | 6 ------
parent/pom.xml | 2 +-
25 files changed, 98 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
----------------------------------------------------------------------
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 d663aaf..2c89e77 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;
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
----------------------------------------------------------------------
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 1a01b03..0504685 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 class PullImageCmdHeaderTest extends BaseDockerHeaderTest<PullImageCmd> {
@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) {
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
----------------------------------------------------------------------
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 85e4e7c..edec5e3 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 class PushImageCmdHeaderTest extends BaseDockerHeaderTest<PushImageCmd> {
@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) {
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/MockQueue.java
----------------------------------------------------------------------
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 1d917a8..9f43841 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 class MockQueue extends Queue {
@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());
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerTest.java
----------------------------------------------------------------------
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 0a98daa..4e47d5b 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.impl.DefaultCamelContext;
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;
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/processor/idempotent/MongoDbIdempotentRepositoryTest.java
----------------------------------------------------------------------
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 25aa569..9731b60 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 class MongoDbIdempotentRepositoryTest extends AbstractMongoDbTest {
@Override
public void doPostSetup() {
super.doPostSetup();
- repo = new MongoDbIdempotentRepository<>((MongoClient) mongo, testCollectionName, dbName);
+ repo = new MongoDbIdempotentRepository<>(mongo, testCollectionName, dbName);
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/ProjectProducer.java
----------------------------------------------------------------------
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 5a439c8..48beb20 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 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 ProjectProducer 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 ProjectProducer extends AbstractKeystoneProducer {
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 @@ public class ProjectProducer extends AbstractKeystoneProducer {
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 @@ public class ProjectProducer extends AbstractKeystoneProducer {
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));
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/RegionProducer.java
----------------------------------------------------------------------
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 0999752..6fb0fa8 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 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 RegionProducer 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:
@@ -67,7 +68,7 @@ public class RegionProducer extends AbstractKeystoneProducer {
}
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 @@ public class RegionProducer extends AbstractKeystoneProducer {
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);
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/NetworkProducer.java
----------------------------------------------------------------------
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 afc014d..1d49b0d 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 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;
@@ -42,16 +43,16 @@ public class NetworkProducer 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:
@@ -67,7 +68,7 @@ public class NetworkProducer extends AbstractOpenstackProducer {
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 @@ public class NetworkProducer extends AbstractOpenstackProducer {
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 @@ public class NetworkProducer extends AbstractOpenstackProducer {
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));
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/PortProducer.java
----------------------------------------------------------------------
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 e3ccf5a..0c7bd83 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 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;
@@ -41,19 +42,19 @@ public class PortProducer 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;
default:
@@ -69,7 +70,7 @@ public class PortProducer extends AbstractOpenstackProducer {
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 @@ public class PortProducer extends AbstractOpenstackProducer {
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 @@ public class PortProducer extends AbstractOpenstackProducer {
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));
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java
----------------------------------------------------------------------
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 25564e7..f51b609 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 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.swift.SwiftConstants;
import org.apache.camel.component.openstack.swift.SwiftEndpoint;
import org.apache.camel.util.ObjectHelper;
@@ -42,16 +43,16 @@ public class ObjectProducer extends AbstractOpenstackProducer {
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 @@ public class ObjectProducer extends AbstractOpenstackProducer {
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);
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
----------------------------------------------------------------------
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 c0f79ba..d8c5731 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 @@ 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.ProjectProducer;
import org.apache.camel.component.openstack.neutron.NeutronConstants;
import org.junit.Before;
@@ -67,8 +68,8 @@ public class ProjectProducerTest extends KeystoneProducerTestSupport {
@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 class ProjectProducerTest 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);
@@ -99,7 +100,7 @@ public class ProjectProducerTest 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);
@@ -111,7 +112,7 @@ public class ProjectProducerTest extends KeystoneProducerTestSupport {
@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 class ProjectProducerTest extends KeystoneProducerTestSupport {
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);
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
----------------------------------------------------------------------
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 6f1cfeb..9b9df53 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 @@ 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.RegionProducer;
import org.apache.camel.component.openstack.neutron.NeutronConstants;
import org.junit.Before;
@@ -66,7 +67,7 @@ public class RegionProducerTest extends KeystoneProducerTestSupport {
@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 class RegionProducerTest 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);
@@ -94,7 +95,7 @@ public class RegionProducerTest 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);
@@ -106,7 +107,7 @@ public class RegionProducerTest 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(testOSregion.getId()).thenReturn(id);
final String newDescription = "ndesc";
@@ -129,8 +130,8 @@ public class RegionProducerTest extends KeystoneProducerTestSupport {
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);
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
----------------------------------------------------------------------
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 bcf5d6d..4d52baf 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.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.NetworkProducer;
import org.junit.Before;
import org.junit.Test;
@@ -67,8 +68,8 @@ public class NetworkProducerTest extends NeutronProducerTestSupport {
@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 class NetworkProducerTest extends NeutronProducerTestSupport {
@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 class NetworkProducerTest 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);
@@ -111,8 +112,8 @@ public class NetworkProducerTest extends NeutronProducerTestSupport {
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);
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
----------------------------------------------------------------------
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 3b01ab8..feb4385 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.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.PortProducer;
import org.junit.Before;
import org.junit.Test;
@@ -67,8 +68,8 @@ public class PortProducerTest extends NeutronProducerTestSupport {
@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 class PortProducerTest extends NeutronProducerTestSupport {
@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 class PortProducerTest 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);
@@ -112,7 +113,7 @@ public class PortProducerTest extends NeutronProducerTestSupport {
@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 class PortProducerTest extends NeutronProducerTestSupport {
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);
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
----------------------------------------------------------------------
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 d6b842d..955c963 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.List;
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 class ObjectProducerTest extends SwiftProducerTestSupport {
@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 class ObjectProducerTest extends SwiftProducerTestSupport {
@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 class ObjectProducerTest extends SwiftProducerTestSupport {
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 class ObjectProducerTest extends SwiftProducerTestSupport {
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 class ObjectProducerTest extends SwiftProducerTestSupport {
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 class ObjectProducerTest extends SwiftProducerTestSupport {
final Map<String, String> 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 class ObjectProducerTest extends SwiftProducerTestSupport {
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);
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
----------------------------------------------------------------------
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 74fbcbb..3c22fd8 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;
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/ReferenceId.java
----------------------------------------------------------------------
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 2cb970d..f81102e 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;
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
----------------------------------------------------------------------
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 b3829dd..8c562f1 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 @@ public class ParseException extends Exception {
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(" ");
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
----------------------------------------------------------------------
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 5ed96c4..cc399be 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 class ParserTest extends CamelTestSupport {
@Test
public void nableIssueSyntax() {
- Map params = new HashMap<>();
+ Map<String, String> 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));
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchTest.java
----------------------------------------------------------------------
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 8a36c5e..0fce1ea 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 class ProducerBatchTest extends CamelTestSupport {
mock.expectedMessageCount(1);
- List<Map> batchParams = new ArrayList<>();
+ List<Map<String, Object>> batchParams = new ArrayList<>();
Map<String, Object> batch1 = new HashMap<>();
batchParams.add(batch1);
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/Order.java
----------------------------------------------------------------------
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 1ce5a3a..81f84ea 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.XmlAccessorType;
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.
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/OrderProcessor.java
----------------------------------------------------------------------
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 5cf4794..918c355 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.
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/examples/camel-example-transformer-demo/src/main/java/org/apache/camel/example/transformer/demo/OrderResponse.java
----------------------------------------------------------------------
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 3ca2ae5..3cbca59 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.XmlAccessorType;
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.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/3fd9102b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f3a475e..073be3b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -476,8 +476,8 @@
<openshift-client-version>1.4.27</openshift-client-version>
<openstack4j-version>3.0.2</openstack4j-version>
<openstack4j-guava-version>17.0</openstack4j-guava-version>
- <optaplanner-version>6.5.0.Final</optaplanner-version>
<ops4j-base-version>1.5.0</ops4j-base-version>
+ <optaplanner-version>6.5.0.Final</optaplanner-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
<oscache-bundle-version>2.4_5</oscache-bundle-version>
<osgi-version>4.3.1</osgi-version>