Repository: camel Updated Branches: refs/heads/master 3d038fa7e -> 41c2d6ca9
Polish Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/41c2d6ca Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/41c2d6ca Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/41c2d6ca Branch: refs/heads/master Commit: 41c2d6ca9a9da89353d20ee970fc2a6913b41aad Parents: 3d038fa Author: Babak Vahdat <bvah...@apache.org> Authored: Tue Dec 29 18:52:39 2015 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Tue Dec 29 18:52:39 2015 +0100 ---------------------------------------------------------------------- .../hazelcast/HazelcastReplicatedmapProducerTest.java | 2 +- .../java/org/apache/camel/component/sql/SqlProducer.java | 2 -- .../java/org/apache/camel/component/ssh/SshEndpoint.java | 11 ----------- .../org/apache/camel/component/stomp/StompComponent.java | 1 - .../apache/camel/swagger/RestSwaggerReaderModelTest.java | 1 - .../camel/test/blueprint/CamelBlueprintHelper.java | 5 ----- .../ConfigAdminLoadConfigurationFileNotFoundTest.java | 1 - .../main/java/org/apache/camel/testng/TestSupport.java | 1 + .../apache/camel/component/twitter/TwitterComponent.java | 1 - .../WebsocketSSLContextInUriRouteExampleTest.java | 1 - .../websocket/WebsocketSSLRouteExampleTest.java | 1 - .../zookeeper/ZooKeeperManagedEndpointTest.java | 1 - .../org/apache/camel/example/cdi/UserRouteBuilder.java | 1 - .../org/apache/camel/commands/RouteResumeCommand.java | 3 --- .../camel/commands/jolokia/JolokiaClientFactory.java | 3 ++- .../org/apache/camel/itest/tx/Jms2RequiresNewTest.java | 1 - 16 files changed, 4 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java index 5108ab6..3addc29 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Collection; import com.hazelcast.core.HazelcastInstance; -.import com.hazelcast.core.ReplicatedMap; +import com.hazelcast.core.ReplicatedMap; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java index 9f2e9d2..483bd72 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java @@ -27,9 +27,7 @@ import java.util.List; import java.util.Map; import org.apache.camel.Exchange; -import org.apache.camel.NoSuchHeaderException; import org.apache.camel.impl.DefaultProducer; -import org.apache.camel.util.ExchangeHelper; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.PreparedStatementCallback; import org.springframework.jdbc.core.PreparedStatementCreator; http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java index 27c1f47..d4e777a 100644 --- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java +++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java @@ -16,23 +16,12 @@ */ package org.apache.camel.component.ssh; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.security.KeyPair; - import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.ScheduledPollEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; -import org.apache.sshd.ClientChannel; -import org.apache.sshd.ClientSession; -import org.apache.sshd.SshClient; -import org.apache.sshd.client.future.AuthFuture; -import org.apache.sshd.client.future.ConnectFuture; -import org.apache.sshd.client.future.OpenFuture; import org.apache.sshd.common.KeyPairProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java index e708fc2..8a87a87 100644 --- a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java +++ b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java @@ -19,7 +19,6 @@ package org.apache.camel.component.stomp; import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; import org.apache.camel.impl.UriEndpointComponent; public class StompComponent extends UriEndpointComponent { http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java ---------------------------------------------------------------------- diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java index 72f8409..c5e811c 100644 --- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java +++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java @@ -24,7 +24,6 @@ import io.swagger.models.Swagger; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultClassResolver; import org.apache.camel.impl.JndiRegistry; -import org.apache.camel.model.rest.RestDefinition; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java index b99814c..02babc1 100644 --- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java +++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java @@ -16,7 +16,6 @@ */ package org.apache.camel.test.blueprint; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -47,7 +46,6 @@ import java.util.concurrent.TimeUnit; import java.util.jar.JarInputStream; import org.apache.camel.impl.DefaultClassResolver; -import org.apache.camel.model.dataformat.Base64DataFormat; import org.apache.camel.spi.ClassResolver; import org.apache.camel.util.FileUtil; import org.apache.camel.util.IOHelper; @@ -66,13 +64,10 @@ import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; import org.osgi.framework.BundleException; -import org.osgi.framework.BundleListener; import org.osgi.framework.Constants; import org.osgi.framework.Filter; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; import org.osgi.framework.SynchronousBundleListener; http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadConfigurationFileNotFoundTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadConfigurationFileNotFoundTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadConfigurationFileNotFoundTest.java index 2f6d465..4a4c44c 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadConfigurationFileNotFoundTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadConfigurationFileNotFoundTest.java @@ -17,7 +17,6 @@ package org.apache.camel.test.blueprint; import org.junit.Test; -import org.osgi.framework.BundleContext; /** * http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java index 9bf5fe9..99d1974 100644 --- a/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java +++ b/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java @@ -111,6 +111,7 @@ public abstract class TestSupport extends Assert { * * @deprecated use {@link #bodyAs(Class)} */ + @Deprecated public static <T> ValueBuilder outBodyAs(Class<T> type) { return Builder.outBodyAs(type); } http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/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 4403e85..8551f7b 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 @@ -20,7 +20,6 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; -import org.apache.camel.spi.UriParam; /** * Twitter component http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java index 2d48c8f..a12fadc 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java @@ -35,7 +35,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.JndiRegistry; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit4.CamelTestSupport; -import org.apache.camel.util.jsse.ClientAuthentication; import org.apache.camel.util.jsse.KeyManagersParameters; import org.apache.camel.util.jsse.KeyStoreParameters; import org.apache.camel.util.jsse.SSLContextParameters; http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java index d1af2c8..13c42b4 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java @@ -33,7 +33,6 @@ import com.ning.http.client.ws.WebSocketUpgradeHandler; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit4.CamelTestSupport; -import org.apache.camel.util.jsse.ClientAuthentication; import org.apache.camel.util.jsse.KeyManagersParameters; import org.apache.camel.util.jsse.KeyStoreParameters; import org.apache.camel.util.jsse.SSLContextParameters; http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java index c8c9e5b..fdf9ccd 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java @@ -18,7 +18,6 @@ package org.apache.camel.component.zookeeper; import java.util.ArrayList; import java.util.Set; -import javax.management.Attribute; import javax.management.MBeanServer; import javax.management.ObjectName; http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java b/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java index da88910..3bbffc2 100644 --- a/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java +++ b/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java @@ -19,7 +19,6 @@ package org.apache.camel.example.cdi; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.cdi.ContextName; import org.apache.camel.model.rest.RestBindingMode; -import org.apache.camel.model.rest.RestHostNameResolver; import static org.apache.camel.model.rest.RestParamType.body; import static org.apache.camel.model.rest.RestParamType.path; http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteResumeCommand.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteResumeCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteResumeCommand.java index fef119a..2b81464 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteResumeCommand.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteResumeCommand.java @@ -18,9 +18,6 @@ package org.apache.camel.commands; import java.io.PrintStream; -import org.apache.camel.CamelContext; -import org.apache.camel.Route; - /** * Command to resume a route. */ http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java index e56a16e..96d6c54 100644 --- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java +++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java @@ -19,6 +19,7 @@ package org.apache.camel.commands.jolokia; import org.jolokia.client.BasicAuthenticator; import org.jolokia.client.J4pClient; import org.jolokia.client.J4pClientBuilder; +import org.jolokia.client.J4pClientBuilderFactory; /** * A factory to create a {@link org.jolokia.client.J4pClient} jolokia client that connects to a remote JVM. @@ -29,7 +30,7 @@ public final class JolokiaClientFactory { } public static J4pClient createJolokiaClient(String jolokiaUrl, String username, String password) { - J4pClientBuilder builder = J4pClient.url(jolokiaUrl); + J4pClientBuilder builder = J4pClientBuilderFactory.url(jolokiaUrl); boolean auth = false; if (isNotEmpty(username)) { builder = builder.user(username); http://git-wip-us.apache.org/repos/asf/camel/blob/41c2d6ca/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java index c320cc8..0e6a750 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java @@ -22,7 +22,6 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired;
