Repository: camel Updated Branches: refs/heads/master cc5c00f54 -> c778bbcd6
Polish Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c778bbcd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c778bbcd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c778bbcd Branch: refs/heads/master Commit: c778bbcd680ce0b405e2cefb8e0d3b0c20a1efd3 Parents: cc5c00f Author: Babak Vahdat <bvah...@apache.org> Authored: Tue Dec 2 12:01:52 2014 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Tue Dec 2 12:01:52 2014 +0100 ---------------------------------------------------------------------- .../camel/component/servlet/rest/RestServletGetTest.java | 1 - .../org/apache/camel/component/sparkrest/SparkComponent.java | 8 ++++---- .../spring/boot/CamelAutoConfigurationPropertiesTest.java | 1 - .../spring/javaconfig/test/JavaConfigContextLoader.java | 3 --- .../org/apache/camel/component/event/EventComponent.java | 1 - .../component/stringtemplate/StringTemplateComponent.java | 1 - .../org/apache/camel/component/twitter/TwitterComponent.java | 1 - .../apache/camel/component/velocity/VelocityComponent.java | 1 - .../xmlsecurity/processor/XmlVerifierProcessor.java | 4 ++-- .../apache/camel/component/xmlsecurity/XmlSignatureTest.java | 4 ++-- .../org/apache/camel/itest/karaf/AbstractFeatureTest.java | 2 -- .../camel/itest/osgi/blueprint/AbstractIntegrationTest.java | 3 +-- .../java/org/apache/camel/itest/osgi/core/seda/SedaTest.java | 1 - .../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 1 - 14 files changed, 9 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java ---------------------------------------------------------------------- diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java index 48805d1..12dc536 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java @@ -23,7 +23,6 @@ import com.meterware.servletunit.ServletUnitClient; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.http.HttpBinding; import org.apache.camel.component.servlet.ServletCamelRouterTestSupport; import org.apache.camel.component.servlet.ServletRestHttpBinding; import org.apache.camel.impl.JndiRegistry; http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java index 61b68c1..b5b91a5 100644 --- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java +++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java @@ -104,19 +104,19 @@ public class SparkComponent extends UriEndpointComponent implements RestConsumer super.doStart(); if (getPort() != SparkBase.SPARK_DEFAULT_PORT) { - Spark.setPort(getPort()); + SparkBase.setPort(getPort()); } else { // if no explicit port configured, then use port from rest configuration RestConfiguration config = getCamelContext().getRestConfiguration(); if (config.getComponent() == null || config.getComponent().equals("spark-rest")) { int port = config.getPort(); if (port > 0) { - Spark.setPort(port); + SparkBase.setPort(port); } } } if (getIpAddress() != null) { - Spark.setIpAddress(getIpAddress()); + SparkBase.setIpAddress(getIpAddress()); } // configure component options @@ -132,7 +132,7 @@ public class SparkComponent extends UriEndpointComponent implements RestConsumer @Override protected void doShutdown() throws Exception { super.doShutdown(); - Spark.stop(); + SparkBase.stop(); } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java index 7b39821..452d38a 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java @@ -21,7 +21,6 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java b/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java index 87006b2..274296c 100644 --- a/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java +++ b/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java @@ -23,11 +23,8 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.AnnotationConfigUtils; -import org.springframework.context.support.GenericApplicationContext; import org.springframework.test.context.ContextLoader; /** http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java b/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java index bdff49a..b383f5c 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java +++ b/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java @@ -20,7 +20,6 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import org.apache.camel.impl.DefaultComponent; import org.apache.camel.impl.UriEndpointComponent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java b/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java index af41a4f..e6d3631 100644 --- a/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java +++ b/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java @@ -19,7 +19,6 @@ package org.apache.camel.component.stringtemplate; import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.util.ResourceHelper; http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java index 1407813..72005df 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java @@ -19,7 +19,6 @@ package org.apache.camel.component.twitter; import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.component.twitter.data.EndpointType; import org.apache.camel.impl.UriEndpointComponent; /** http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java index bb0bf41..e9421da 100644 --- a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java +++ b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java @@ -20,7 +20,6 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.ResourceHelper; import org.apache.velocity.app.VelocityEngine; http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java ---------------------------------------------------------------------- diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java index b606ec1..34faadf 100644 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java @@ -163,8 +163,8 @@ public class XmlVerifierProcessor extends XmlSignatureProcessor { } else { throw new XmlSignatureInvalidException("XML signature validation failed"); } - collectedObjects.addAll((List<XMLObject>) signature.getObjects()); - collectedReferences.addAll((List<Reference>) signature.getSignedInfo().getReferences()); + collectedObjects.addAll(signature.getObjects()); + collectedReferences.addAll(signature.getSignedInfo().getReferences()); } map2Message(collectedReferences, collectedObjects, out, doc); } http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java ---------------------------------------------------------------------- diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java index a363e6a..a9cda7c 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java @@ -876,7 +876,7 @@ public class XmlSignatureTest extends CamelTestSupport { MockEndpoint mockVerified = getMockEndpoint("mock:verified"); mockVerified.expectedBodiesReceived(detachedPayload); Map<String, Object> headers = new TreeMap<String, Object>(); - headers.put(XmlSignatureConstants.HEADER_SCHEMA_RESOURCE_URI, (Object) "org/apache/camel/component/xmlsecurity/TestComplex.xsd"); + headers.put(XmlSignatureConstants.HEADER_SCHEMA_RESOURCE_URI, "org/apache/camel/component/xmlsecurity/TestComplex.xsd"); Map<String, String> namespaceMap = new TreeMap<String, String>(); namespaceMap.put("ns", "http://test";); namespaceMap.put("ns1", "http://testB";); @@ -886,7 +886,7 @@ public class XmlSignatureTest extends CamelTestSupport { List<XPathFilterParameterSpec> xpaths = new ArrayList<XPathFilterParameterSpec>(); xpaths.add(xpath1); xpaths.add(xpath2); - headers.put(XmlSignatureConstants.HEADER_XPATHS_TO_ID_ATTRIBUTES, (Object) xpaths); + headers.put(XmlSignatureConstants.HEADER_XPATHS_TO_ID_ATTRIBUTES, xpaths); sendBody("direct:detached", detachedPayload, headers); assertMockEndpointsSatisfied(); Map<String, String> namespaceMap2 = new TreeMap<String, String>(); http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java index 2e7272d..8903684 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java @@ -22,8 +22,6 @@ import java.lang.reflect.Field; import java.nio.charset.Charset; import java.util.Properties; -import javax.inject.Inject; - import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultRouteContext; import org.apache.camel.model.DataFormatDefinition; http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java index c98a270..5040892 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java @@ -131,8 +131,7 @@ public abstract class AbstractIntegrationTest extends OSGiIntegrationTestSupport * Provides an iterable collection of references, even if the original array is null */ private static Collection<ServiceReference<?>> asCollection(ServiceReference<?>[] references) { - return (Collection<ServiceReference<?>>)(references != null ? Arrays.asList(references) - : Collections.<ServiceReference<?>>emptyList()); + return references != null ? Arrays.asList(references) : Collections.<ServiceReference<?>>emptyList(); } /** http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java index 199a1d9..47cf50c 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.itest.osgi.core.seda; -import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; http://git-wip-us.apache.org/repos/asf/camel/blob/c778bbcd/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java index 4e591e1..7d43e25 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java @@ -28,7 +28,6 @@ import java.io.LineNumberReader; import java.nio.channels.FileChannel; import java.util.ArrayList; import java.util.Collections; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set;
