Polish Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b66536d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b66536d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b66536d
Branch: refs/heads/master Commit: 5b66536de61ef276e427f2190cca604fd8835333 Parents: dccd460 Author: Babak Vahdat <bvah...@apache.org> Authored: Sun Dec 18 17:15:03 2016 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Sun Dec 18 17:15:03 2016 +0100 ---------------------------------------------------------------------- .../apache/camel/builder/ExpressionBuilder.java | 1 - .../camel/impl/DefaultHeaderFilterStrategy.java | 1 - .../camel/processor/CamelInternalProcessor.java | 1 - .../apache/camel/support/DefaultTimeoutMap.java | 1 - .../core/xml/CamelProxyFactoryDefinition.java | 3 ++- .../cxf/converter/CxfPayloadConverter.java | 4 +-- .../consumer/DockerEventsConsumerTest.java | 3 ++- .../consumer/DockerStatsConsumerTest.java | 3 ++- .../docker/headers/ExecStartCmdHeaderTest.java | 2 +- .../ConcurrentConsumerLoadTest.java | 4 +-- .../camel/component/metrics/GaugeRouteTest.java | 3 ++- .../openstack/glance/GlanceProducer.java | 27 ++++++++++---------- .../keystone/producer/DomainProducer.java | 19 +++++++------- .../nova/producer/FlavorsProducer.java | 17 ++++++------ .../swift/producer/ContainerProducer.java | 23 +++++++++-------- .../openstack/keystone/DomainProducerTest.java | 17 ++++++------ .../openstack/nova/FlavorProducerTest.java | 21 +++++++-------- .../openstack/swift/ContainerProducerTest.java | 17 ++++++------ .../salesforce/dto/generated/Contact.java | 3 --- .../apache/camel/maven/CamelSalesforceMojo.java | 4 --- .../ClassLoadingAwareObjectInputStream.java | 2 +- .../CamelSpringBootJUnit4ClassRunner.java | 1 + 22 files changed, 89 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java index 6051555..0c04cd8 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java @@ -21,7 +21,6 @@ import java.io.StringWriter; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.Iterator; http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java index 77656a2..9652af6 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java @@ -17,7 +17,6 @@ package org.apache.camel.impl; import java.util.HashSet; -import java.util.Iterator; import java.util.Locale; import java.util.Set; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java index 67ee6c6..3ce9220 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java @@ -17,7 +17,6 @@ package org.apache.camel.processor; import java.util.ArrayList; -import java.util.Collections; import java.util.Date; import java.util.LinkedList; import java.util.List; http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java b/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java index 1e09952..d99a5b0 100644 --- a/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java +++ b/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java @@ -17,7 +17,6 @@ package org.apache.camel.support; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java ---------------------------------------------------------------------- diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java index 4ddaa23..6f160ce 100644 --- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java +++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java @@ -62,7 +62,8 @@ public class CamelProxyFactoryDefinition extends IdentifiedType { * * @deprecated use serviceUrl instead with the ref endpoint. */ - public void setServiceRef(String serviceRef) { + @Deprecated + public void setServiceRef(String serviceRef) { this.serviceRef = serviceRef; } http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java index 5801a7b..29d3c10 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java @@ -210,7 +210,7 @@ public final class CxfPayloadConverter { if (payload.getNsMap() != null) { r = new DelegatingXMLStreamReader(r, payload.getNsMap()); } - return (T)tc.convertTo(type, exchange, r); + return tc.convertTo(type, exchange, r); } tc = registry.lookup(type, Source.class); if (tc != null) { @@ -225,7 +225,7 @@ public final class CxfPayloadConverter { s = new StAXSource(new DelegatingXMLStreamReader(r, payload.getNsMap())); } } - return (T)tc.convertTo(type, exchange, s); + return tc.convertTo(type, exchange, s); } } TypeConverter tc = registry.lookup(type, NodeList.class); http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java index 9b0601a..7490522 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java @@ -27,6 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; @@ -51,7 +52,7 @@ public class DockerEventsConsumerTest extends CamelTestSupport { public void setupMocks() { Mockito.when(dockerClient.eventsCmd()).thenReturn(eventsCmd); - Mockito.when(eventsCmd.withSince(Mockito.anyString())).thenReturn(eventsCmd); + Mockito.when(eventsCmd.withSince(Matchers.anyString())).thenReturn(eventsCmd); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java index ae020c2..a06d75c 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java @@ -27,6 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; @@ -51,7 +52,7 @@ public class DockerStatsConsumerTest extends CamelTestSupport { private DockerClient dockerClient; public void setupMocks() { - Mockito.when(dockerClient.statsCmd(Mockito.anyString())).thenReturn(statsCmd); + Mockito.when(dockerClient.statsCmd(Matchers.anyString())).thenReturn(statsCmd); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java index faed4b0..cce61ef 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java @@ -58,7 +58,7 @@ public class ExecStartCmdHeaderTest extends BaseDockerHeaderTest<ExecStartCmd> { @Override protected void setupMocks() { Mockito.when(dockerClient.execStartCmd(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/5b66536d/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadTest.java index 57e5ce0..0bedf89 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadTest.java @@ -70,7 +70,7 @@ public class ConcurrentConsumerLoadTest extends CamelTestSupport { } long delta = System.currentTimeMillis() - start; int seconds = (int)delta / 1000; - int msgPrSec = (int)(NO_OF_MESSAGES / seconds); + int msgPrSec = NO_OF_MESSAGES / seconds; log.info("IronMQPerformanceTest: Took: " + seconds + " seconds to produce " + NO_OF_MESSAGES + " messages. Which is " + msgPrSec + " messages pr. second"); } @@ -83,7 +83,7 @@ public class ConcurrentConsumerLoadTest extends CamelTestSupport { assertMockEndpointsSatisfied(4, TimeUnit.MINUTES); long delta = System.currentTimeMillis() - start; int seconds = (int)delta / 1000; - int msgPrSec = (int)(NO_OF_MESSAGES / seconds); + int msgPrSec = NO_OF_MESSAGES / seconds; log.info("IronmqPerformanceTest: Took: " + seconds + " seconds to consume " + NO_OF_MESSAGES + " messages. Which is " + msgPrSec + " messages pr. second"); } http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java index 9058faa..4a03ebf 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java @@ -36,6 +36,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; +import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -100,7 +101,7 @@ public class GaugeRouteTest { public MetricRegistry getMetricRegistry() { MetricRegistry registry = Mockito.mock(MetricRegistry.class); when(registry.getGauges()).thenReturn(mockGauges); - when(registry.register(Mockito.anyString(), Mockito.any(CamelMetricsGauge.class))).then( + when(registry.register(Matchers.anyString(), Matchers.any(CamelMetricsGauge.class))).then( new Answer<CamelMetricsGauge>() { @Override public CamelMetricsGauge answer(InvocationOnMock invocation) throws Throwable { http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java index 1b7687c..74123fb 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.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.util.ObjectHelper; import org.openstack4j.api.Builders; import org.openstack4j.api.OSClient; @@ -46,22 +47,22 @@ public class GlanceProducer extends AbstractOpenstackProducer { case GlanceConstants.RESERVE: doReserve(exchange); break; - case GlanceConstants.CREATE: + case OpenstackConstants.CREATE: doCreate(exchange); break; - case GlanceConstants.UPDATE: + case OpenstackConstants.UPDATE: doUpdate(exchange); break; case GlanceConstants.UPLOAD: doUpload(exchange); break; - case GlanceConstants.GET: + case OpenstackConstants.GET: doGet(exchange); break; - case GlanceConstants.GET_ALL: + case OpenstackConstants.GET_ALL: doGetAll(exchange); break; - case GlanceConstants.DELETE: + case OpenstackConstants.DELETE: doDelete(exchange); break; default: @@ -85,7 +86,7 @@ public class GlanceProducer extends AbstractOpenstackProducer { private void doUpload(Exchange exchange) { final Message msg = exchange.getIn(); - final String imageId = msg.getHeader(GlanceConstants.ID, String.class); + final String imageId = msg.getHeader(OpenstackConstants.ID, String.class); ObjectHelper.notEmpty(imageId, "Image ID"); final Image in = messageHeadersToImage(msg, false); final Payload payload = createPayload(msg); @@ -102,7 +103,7 @@ public class GlanceProducer extends AbstractOpenstackProducer { private void doGet(Exchange exchange) { final Message msg = exchange.getIn(); - final String imageId = msg.getHeader(GlanceConstants.ID, String.class); + final String imageId = msg.getHeader(OpenstackConstants.ID, String.class); ObjectHelper.notEmpty(imageId, "ImageID"); final Image out = os.images().get(imageId); msg.setBody(out); @@ -115,7 +116,7 @@ public class GlanceProducer extends AbstractOpenstackProducer { private void doDelete(Exchange exchange) { final Message msg = exchange.getIn(); - final String imageId = msg.getHeader(GlanceConstants.ID, String.class); + final String imageId = msg.getHeader(OpenstackConstants.ID, String.class); ObjectHelper.notEmpty(imageId, "ImageID"); final ActionResponse response = os.compute().images().delete(imageId); checkFailure(response, msg, "Delete image " + imageId); @@ -133,12 +134,12 @@ public class GlanceProducer extends AbstractOpenstackProducer { private Image messageHeadersToImage(Message message, boolean required) { ImageBuilder imageBuilder = null; - if (required && ObjectHelper.isEmpty(message.getHeader(GlanceConstants.NAME, String.class))) { + if (required && ObjectHelper.isEmpty(message.getHeader(OpenstackConstants.NAME, String.class))) { throw new IllegalArgumentException("Image Name must be specified and not empty"); } - if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.NAME, String.class))) { - imageBuilder = getImageBuilder(imageBuilder).name(message.getHeader(GlanceConstants.NAME, String.class)); + if (ObjectHelper.isNotEmpty(message.getHeader(OpenstackConstants.NAME, String.class))) { + imageBuilder = getImageBuilder(imageBuilder).name(message.getHeader(OpenstackConstants.NAME, String.class)); } if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.DISK_FORMAT, DiskFormat.class))) { @@ -173,8 +174,8 @@ public class GlanceProducer extends AbstractOpenstackProducer { imageBuilder = getImageBuilder(imageBuilder).isPublic(message.getHeader(GlanceConstants.IS_PUBLIC, Boolean.class)); } - if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.PROPERTIES))) { - imageBuilder = getImageBuilder(imageBuilder).properties(message.getHeader(GlanceConstants.PROPERTIES, Map.class)); + if (ObjectHelper.isNotEmpty(message.getHeader(OpenstackConstants.PROPERTIES))) { + imageBuilder = getImageBuilder(imageBuilder).properties(message.getHeader(OpenstackConstants.PROPERTIES, Map.class)); } if (!required && imageBuilder == null) { http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/DomainProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/DomainProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/DomainProducer.java index 8320539..50cb9d2 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/DomainProducer.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/DomainProducer.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 DomainProducer 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 DomainProducer extends AbstractKeystoneProducer { private void doGet(Exchange exchange) { final Message msg = exchange.getIn(); - final String id = msg.getHeader(KeystoneConstants.ID, msg.getHeader(KeystoneConstants.DOMAIN_ID, String.class), String.class); + final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.DOMAIN_ID, String.class), String.class); ObjectHelper.notEmpty(id, "Domain ID"); final Domain out = osV3Client.identity().domains().get(id); exchange.getIn().setBody(out); @@ -88,7 +89,7 @@ public class DomainProducer extends AbstractKeystoneProducer { private void doDelete(Exchange exchange) { final Message msg = exchange.getIn(); - final String id = msg.getHeader(KeystoneConstants.ID, msg.getHeader(KeystoneConstants.DOMAIN_ID, String.class), String.class); + final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.DOMAIN_ID, String.class), String.class); ObjectHelper.notEmpty(id, "Domain ID"); final ActionResponse response = osV3Client.identity().domains().delete(id); checkFailure(response, msg, "Delete domain" + id); @@ -100,8 +101,8 @@ public class DomainProducer extends AbstractKeystoneProducer { Map headers = message.getHeaders(); DomainBuilder builder = Builders.domain(); - 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.DESCRIPTION)) { builder.description(message.getHeader(KeystoneConstants.DESCRIPTION, String.class)); http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java index 55416d7..6e681a1 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.openstack.common.AbstractOpenstackProducer; +import org.apache.camel.component.openstack.common.OpenstackConstants; import org.apache.camel.component.openstack.nova.NovaConstants; import org.apache.camel.component.openstack.nova.NovaEndpoint; import org.apache.camel.util.ObjectHelper; @@ -41,16 +42,16 @@ public class FlavorsProducer extends AbstractOpenstackProducer { public void process(Exchange exchange) throws Exception { final String operation = getOperation(exchange); switch (operation) { - case NovaConstants.CREATE: + case OpenstackConstants.CREATE: doCreate(exchange); break; - case NovaConstants.GET: + case OpenstackConstants.GET: doGet(exchange); break; - case NovaConstants.GET_ALL: + case OpenstackConstants.GET_ALL: doGetAll(exchange); break; - case NovaConstants.DELETE: + case OpenstackConstants.DELETE: doDelete(exchange); break; default: @@ -66,7 +67,7 @@ public class FlavorsProducer extends AbstractOpenstackProducer { private void doGet(Exchange exchange) { final Message msg = exchange.getIn(); - final String flavorId = msg.getHeader(NovaConstants.ID, msg.getHeader(NovaConstants.FLAVOR_ID, String.class), String.class); + final String flavorId = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NovaConstants.FLAVOR_ID, String.class), String.class); ObjectHelper.notEmpty(flavorId, "FlavorID"); final Flavor out = os.compute().flavors().get(flavorId); exchange.getIn().setBody(out); @@ -79,7 +80,7 @@ public class FlavorsProducer extends AbstractOpenstackProducer { private void doDelete(Exchange exchange) { final Message msg = exchange.getIn(); - final String flavorId = msg.getHeader(NovaConstants.ID, msg.getHeader(NovaConstants.FLAVOR_ID, String.class), String.class); + final String flavorId = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NovaConstants.FLAVOR_ID, String.class), String.class); ObjectHelper.notEmpty(flavorId, "FlavorID"); final ActionResponse response = os.compute().flavors().delete(flavorId); checkFailure(response, msg, "Delete flavor"); @@ -91,8 +92,8 @@ public class FlavorsProducer extends AbstractOpenstackProducer { Map headers = message.getHeaders(); FlavorBuilder flavorBuilder = Builders.flavor(); - ObjectHelper.notEmpty(message.getHeader(NovaConstants.NAME, String.class), "Name"); - flavorBuilder.name(message.getHeader(NovaConstants.NAME, String.class)); + ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name"); + flavorBuilder.name(message.getHeader(OpenstackConstants.NAME, String.class)); if (headers.containsKey(NovaConstants.VCPU)) { flavorBuilder.vcpus(message.getHeader(NovaConstants.VCPU, Integer.class)); http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java index c0c2d5b..a56d104 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.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; @@ -43,19 +44,19 @@ public class ContainerProducer 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.UPDATE: + case OpenstackConstants.UPDATE: doUpdate(exchange); break; - case SwiftConstants.DELETE: + case OpenstackConstants.DELETE: doDelete(exchange); break; case SwiftConstants.GET_METADATA: @@ -74,7 +75,7 @@ public class ContainerProducer extends AbstractOpenstackProducer { private void doCreate(Exchange exchange) { final Message msg = exchange.getIn(); - final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); + final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); ObjectHelper.notEmpty(name, "Container name"); final CreateUpdateContainerOptions options = messageToCreateUpdateOptions(msg); @@ -97,7 +98,7 @@ public class ContainerProducer extends AbstractOpenstackProducer { private void doUpdate(Exchange exchange) { final Message msg = exchange.getIn(); - final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); + final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); ObjectHelper.notEmpty(name, "Container name"); final CreateUpdateContainerOptions options = messageToCreateUpdateOptions(msg); final ActionResponse out = os.objectStorage().containers().update(name, options); @@ -106,7 +107,7 @@ public class ContainerProducer extends AbstractOpenstackProducer { private void doDelete(Exchange exchange) { final Message msg = exchange.getIn(); - final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); + final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); ObjectHelper.notEmpty(name, "Container name"); final ActionResponse out = os.objectStorage().containers().delete(name); checkFailure(out, msg, "Delete container " + name); @@ -114,14 +115,14 @@ public class ContainerProducer extends AbstractOpenstackProducer { private void doGetMetadata(Exchange exchange) { final Message msg = exchange.getIn(); - final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); + final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); ObjectHelper.notEmpty(name, "Container name"); msg.setBody(os.objectStorage().containers().getMetadata(name)); } private void doDeleteMetadata(Exchange exchange) { final Message msg = exchange.getIn(); - final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); + final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); ObjectHelper.notEmpty(name, "Container name"); boolean success = os.objectStorage().containers().deleteMetadata(name, msg.getBody(Map.class)); msg.setFault(!success); @@ -132,7 +133,7 @@ public class ContainerProducer extends AbstractOpenstackProducer { private void doUpdateMetadata(Exchange exchange) { final Message msg = exchange.getIn(); - final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); + final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class); ObjectHelper.notEmpty(name, "Container name"); boolean success = os.objectStorage().containers().updateMetadata(name, msg.getBody(Map.class)); msg.setFault(!success); http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java index 986edc1..bf8bfbd 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.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.DomainProducer; import org.apache.camel.component.openstack.neutron.NeutronConstants; import org.junit.Before; @@ -67,8 +68,8 @@ public class DomainProducerTest extends KeystoneProducerTestSupport { @Test public void createTest() throws Exception { - msg.setHeader(KeystoneConstants.OPERATION, KeystoneConstants.CREATE); - msg.setHeader(KeystoneConstants.NAME, dummyDomain.getName()); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); + msg.setHeader(OpenstackConstants.NAME, dummyDomain.getName()); msg.setHeader(KeystoneConstants.DESCRIPTION, dummyDomain.getDescription()); @@ -83,8 +84,8 @@ public class DomainProducerTest 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); @@ -97,7 +98,7 @@ public class DomainProducerTest 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); @@ -109,7 +110,7 @@ public class DomainProducerTest 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(testOSdomain.getId()).thenReturn(id); @@ -133,8 +134,8 @@ public class DomainProducerTest extends KeystoneProducerTestSupport { public void deleteTest() throws Exception { when(domainService.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/5b66536d/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java index 2ca9000..181de95 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java @@ -22,6 +22,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.nova.producer.FlavorsProducer; import org.junit.Before; import org.junit.Test; @@ -73,7 +74,7 @@ public class FlavorProducerTest extends NovaProducerTestSupport { @Test public void createFlavor() throws Exception { - when(endpoint.getOperation()).thenReturn(NovaConstants.CREATE); + when(endpoint.getOperation()).thenReturn(OpenstackConstants.CREATE); final String expectedFlavorID = UUID.randomUUID().toString(); when(testOSFlavor.getId()).thenReturn(expectedFlavorID); @@ -93,8 +94,8 @@ public class FlavorProducerTest extends NovaProducerTestSupport { @Test public void createFlavorWithHeaders() throws Exception { Map<String, Object> headers = new HashMap<>(); - headers.put(NovaConstants.OPERATION, NovaConstants.CREATE); - headers.put(NovaConstants.NAME, dummyFlavor.getName()); + headers.put(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); + headers.put(OpenstackConstants.NAME, dummyFlavor.getName()); headers.put(NovaConstants.VCPU, dummyFlavor.getVcpus()); headers.put(NovaConstants.DISK, dummyFlavor.getDisk()); headers.put(NovaConstants.SWAP, dummyFlavor.getSwap()); @@ -113,8 +114,8 @@ public class FlavorProducerTest extends NovaProducerTestSupport { @Test public void getTest() throws Exception { - msg.setHeader(NovaConstants.OPERATION, NovaConstants.GET); - msg.setHeader(NovaConstants.ID, "anything - client is mocked"); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET); + msg.setHeader(OpenstackConstants.ID, "anything - client is mocked"); //should return dummyFlavor producer.process(exchange); @@ -126,7 +127,7 @@ public class FlavorProducerTest extends NovaProducerTestSupport { @Test public void getAllTest() throws Exception { - when(endpoint.getOperation()).thenReturn(NovaConstants.GET_ALL); + when(endpoint.getOperation()).thenReturn(OpenstackConstants.GET_ALL); producer.process(exchange); List<Flavor> result = msg.getBody(List.class); @@ -141,9 +142,9 @@ public class FlavorProducerTest extends NovaProducerTestSupport { @Test public void deleteSuccess() throws Exception { when(flavorService.delete(Matchers.anyString())).thenReturn(ActionResponse.actionSuccess()); - when(endpoint.getOperation()).thenReturn(NovaConstants.DELETE); + when(endpoint.getOperation()).thenReturn(OpenstackConstants.DELETE); String id = "myID"; - msg.setHeader(NovaConstants.ID, id); + msg.setHeader(OpenstackConstants.ID, id); producer.process(exchange); ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class); @@ -158,9 +159,9 @@ public class FlavorProducerTest extends NovaProducerTestSupport { public void deleteFailure() throws Exception { final String failReason = "unknown"; when(flavorService.delete(Matchers.anyString())).thenReturn(ActionResponse.actionFailed(failReason, 401)); - when(endpoint.getOperation()).thenReturn(NovaConstants.DELETE); + when(endpoint.getOperation()).thenReturn(OpenstackConstants.DELETE); String id = "myID"; - msg.setHeader(NovaConstants.ID, id); + msg.setHeader(OpenstackConstants.ID, id); producer.process(exchange); ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class); http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java index 5e618bb..7ec2704 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.camel.component.openstack.common.OpenstackConstants; import org.apache.camel.component.openstack.swift.producer.ContainerProducer; import org.junit.Before; import org.junit.Test; @@ -56,7 +57,7 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { @Test public void createTestWithoutOptions() throws Exception { when(containerService.create(anyString(), any(CreateUpdateContainerOptions.class))).thenReturn(ActionResponse.actionSuccess()); - msg.setHeader(SwiftConstants.OPERATION, SwiftConstants.CREATE); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); producer.process(exchange); @@ -74,7 +75,7 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { @Test public void createTestWithOptions() throws Exception { when(containerService.create(anyString(), any(CreateUpdateContainerOptions.class))).thenReturn(ActionResponse.actionSuccess()); - msg.setHeader(SwiftConstants.OPERATION, SwiftConstants.CREATE); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); final CreateUpdateContainerOptions options = CreateUpdateContainerOptions.create().accessAnybodyRead(); msg.setBody(options); @@ -94,7 +95,7 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { List<SwiftContainer> list = new ArrayList<>(); list.add(mockOsContainer); doReturn(list).when(containerService).list(any(ContainerListOptions.class)); - when(endpoint.getOperation()).thenReturn(SwiftConstants.GET); + when(endpoint.getOperation()).thenReturn(OpenstackConstants.GET); msg.setHeader(SwiftConstants.LIMIT, 10); msg.setHeader(SwiftConstants.DELIMITER, 'x'); @@ -114,7 +115,7 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { list.add(mockOsContainer); doReturn(list).when(containerService).list(); - when(endpoint.getOperation()).thenReturn(SwiftConstants.GET_ALL); + when(endpoint.getOperation()).thenReturn(OpenstackConstants.GET_ALL); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); @@ -125,7 +126,7 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { @Test public void deleteObjectTest() throws Exception { when(containerService.delete(anyString())).thenReturn(ActionResponse.actionSuccess()); - msg.setHeader(SwiftConstants.OPERATION, SwiftConstants.DELETE); + msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); producer.process(exchange); @@ -141,7 +142,7 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { public void deleteObjectFailTest() throws Exception { final String failMessage = "fail"; when(containerService.delete(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); producer.process(exchange); @@ -155,7 +156,7 @@ public class ContainerProducerTest 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.setBody(md); @@ -175,7 +176,7 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { md.put("key", "val"); when(containerService.getMetadata(CONTAINER_NAME)).thenReturn(md); - msg.setHeader(SwiftConstants.OPERATION, SwiftConstants.GET_METADATA); + msg.setHeader(OpenstackConstants.OPERATION, SwiftConstants.GET_METADATA); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); producer.process(exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java index 104d481..2180858 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java @@ -18,9 +18,6 @@ package org.apache.camel.component.salesforce.dto.generated; import com.fasterxml.jackson.annotation.JsonProperty; import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamConverter; - -import org.apache.camel.component.salesforce.api.PicklistEnumConverter; import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase; import org.apache.camel.component.salesforce.api.dto.SObjectDescription; http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java index 3c52e48..0b0de84 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java @@ -16,7 +16,6 @@ */ package org.apache.camel.maven; -import java.beans.PropertyDescriptor; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -31,11 +30,9 @@ import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.Queue; import java.util.Set; import java.util.Stack; import java.util.TreeSet; @@ -65,7 +62,6 @@ import org.apache.camel.component.salesforce.internal.client.SyncResponseCallbac import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.jsse.SSLContextParameters; -import org.apache.commons.lang.ClassUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.maven.plugin.AbstractMojo; http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStream.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStream.java b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStream.java index 6b8493c..30fd73d 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStream.java +++ b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStream.java @@ -90,7 +90,7 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream { } } // fallback - final Class<?> clazz = (Class<?>) PRIM_CLASSES.get(className); + final Class<?> clazz = PRIM_CLASSES.get(className); if (clazz != null) { return clazz; } else { http://git-wip-us.apache.org/repos/asf/camel/blob/5b66536d/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootJUnit4ClassRunner.java ---------------------------------------------------------------------- diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootJUnit4ClassRunner.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootJUnit4ClassRunner.java index 0370985..44c0cb2 100644 --- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootJUnit4ClassRunner.java +++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootJUnit4ClassRunner.java @@ -24,6 +24,7 @@ import org.junit.runners.model.InitializationError; * * @deprecated use {@link CamelSpringBootRunner} */ +@Deprecated public class CamelSpringBootJUnit4ClassRunner extends CamelSpringBootRunner { public CamelSpringBootJUnit4ClassRunner(Class<?> clazz) throws InitializationError {
