Repository: camel Updated Branches: refs/heads/master e23d8d68a -> f545ca78b
Polish Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f545ca78 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f545ca78 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f545ca78 Branch: refs/heads/master Commit: f545ca78be2b8f062b9ab88ece6d9b3b47f843cf Parents: e23d8d6 Author: Babak Vahdat <bvah...@apache.org> Authored: Tue Dec 29 18:41:49 2015 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Tue Dec 29 18:41:49 2015 +0100 ---------------------------------------------------------------------- .../apache/camel/component/disruptor/DisruptorEndpoint.java | 1 - .../component/disruptor/BasicDisruptorComponentTest.java | 7 ------- .../camel/component/docker/DockerEventsConsumerTest.java | 3 ++- .../camel/component/docker/DockerStatsConsumerTest.java | 3 ++- .../camel/component/docker/headers/AuthCmdHeaderTest.java | 3 ++- .../docker/headers/StartContainerCmdHeaderTest.java | 9 --------- .../converter/ElasticsearchActionRequestConverter.java | 4 ++-- .../apache/camel/component/facebook/FacebookProducer.java | 1 - .../camel/component/facebook/data/ReadingBuilder.java | 1 - .../component/facebook/FacebookComponentProducerTest.java | 7 ------- .../camel/component/file/remote/RemoteFileEndpoint.java | 1 - .../camel/component/ganglia/GangliaConfigurationTest.java | 1 - .../apache/camel/component/git/producer/GitProducer.java | 8 +++----- .../java/org/apache/camel/component/git/GitTestSupport.java | 2 -- .../google/mail/GmailUsersMessagesIntegrationTest.java | 1 - .../google/mail/GmailUsersThreadsIntegrationTest.java | 1 - .../replicatedmap/HazelcastReplicatedmapConsumer.java | 1 - .../replicatedmap/HazelcastReplicatedmapProducer.java | 1 - .../camel/component/hazelcast/set/HazelcastSetConsumer.java | 1 - .../camel/component/hazelcast/set/HazelcastSetProducer.java | 2 -- .../component/hazelcast/topic/HazelcastTopicConsumer.java | 2 -- .../hazelcast/HazelcastReplicatedmapConsumerTest.java | 1 - .../HazelcastReplicatedmapProducerForSpringTest.java | 1 - .../hazelcast/HazelcastReplicatedmapProducerTest.java | 3 +-- .../camel/component/hazelcast/HazelcastSetConsumerTest.java | 1 - .../camel/component/hazelcast/HazelcastSetProducerTest.java | 1 - .../java/org/apache/camel/component/http/HttpProducer.java | 1 - .../java/org/apache/camel/component/http4/BaseHttpTest.java | 1 - .../http4/HttpProducerTwoHeadersWithSameKeyTest.java | 1 - .../apache/camel/component/http4/HttpProxyServerTest.java | 4 ---- 30 files changed, 12 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java index f0be8a1..cffb7ff 100644 --- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java +++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java @@ -30,7 +30,6 @@ import org.apache.camel.Exchange; import org.apache.camel.MultipleConsumersSupport; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.ServiceStatus; import org.apache.camel.WaitForTaskToComplete; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedResource; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java index 97b122e..5f7e1b0 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java @@ -16,14 +16,7 @@ */ package org.apache.camel.component.disruptor; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.TimeUnit; - import org.apache.camel.EndpointInject; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerEventsConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerEventsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerEventsConsumerTest.java index ef06200..314a025 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerEventsConsumerTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerEventsConsumerTest.java @@ -30,6 +30,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.mockito.invocation.InvocationOnMock; @@ -55,7 +56,7 @@ public class DockerEventsConsumerTest extends CamelTestSupport { private DockerClient dockerClient; public void setupMocks() { - Mockito.when(dockerClient.eventsCmd(Mockito.any(EventCallback.class))).thenAnswer(new Answer<EventsCmd>() { + Mockito.when(dockerClient.eventsCmd(Matchers.any(EventCallback.class))).thenAnswer(new Answer<EventsCmd>() { public EventsCmd answer(InvocationOnMock invocation) { Object[] args = invocation.getArguments(); callback = (EventCallback)args[0]; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerStatsConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerStatsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerStatsConsumerTest.java index cb4db77..9eb1a94 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerStatsConsumerTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerStatsConsumerTest.java @@ -30,6 +30,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.mockito.invocation.InvocationOnMock; @@ -57,7 +58,7 @@ public class DockerStatsConsumerTest extends CamelTestSupport { private DockerClient dockerClient; public void setupMocks() { - Mockito.when(dockerClient.statsCmd(Mockito.any(StatsCallback.class))).thenAnswer(new Answer<StatsCmd>() { + Mockito.when(dockerClient.statsCmd(Matchers.any(StatsCallback.class))).thenAnswer(new Answer<StatsCmd>() { public StatsCmd answer(InvocationOnMock invocation) { Object[] args = invocation.getArguments(); callback = (StatsCallback)args[0]; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java index 30d1b38..cf4b0e9 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java @@ -25,6 +25,7 @@ import org.apache.camel.component.docker.DockerClientProfile; import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; import org.junit.Test; +import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; @@ -57,7 +58,7 @@ public class AuthCmdHeaderTest extends BaseDockerHeaderTest<AuthCmd> { template.sendBodyAndHeaders("direct:in", "", headers); Mockito.verify(dockerClient, Mockito.times(1)).authCmd(); - Mockito.verify(mockObject, Mockito.times(1)).withAuthConfig((AuthConfig) Mockito.anyObject()); + Mockito.verify(mockObject, Mockito.times(1)).withAuthConfig((AuthConfig) Matchers.anyObject()); } http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java index 501a993..3542805 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java @@ -19,16 +19,7 @@ package org.apache.camel.component.docker.headers; import java.util.Map; import com.github.dockerjava.api.command.StartContainerCmd; -import com.github.dockerjava.api.model.Bind; -import com.github.dockerjava.api.model.Capability; -import com.github.dockerjava.api.model.Device; import com.github.dockerjava.api.model.ExposedPort; -import com.github.dockerjava.api.model.Link; -import com.github.dockerjava.api.model.LxcConf; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; -import com.github.dockerjava.api.model.RestartPolicy; -import com.github.dockerjava.api.model.Volume; import org.apache.camel.component.docker.DockerConstants; import org.apache.camel.component.docker.DockerOperation; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java index 204ac3b..78f7534 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java @@ -131,7 +131,7 @@ public final class ElasticsearchActionRequestConverter { MultiGetRequest multiGetRequest = new MultiGetRequest(); Iterator<Item> it = items.iterator(); while (it.hasNext()) { - MultiGetRequest.Item item = (MultiGetRequest.Item) it.next(); + MultiGetRequest.Item item = it.next(); multiGetRequest.add(item); } return multiGetRequest; @@ -143,7 +143,7 @@ public final class ElasticsearchActionRequestConverter { MultiSearchRequest multiSearchRequest = new MultiSearchRequest(); Iterator<SearchRequest> it = items.iterator(); while (it.hasNext()) { - SearchRequest item = (SearchRequest) it.next(); + SearchRequest item = it.next(); multiSearchRequest.add(item); } return multiSearchRequest; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java index 800147f..b576d5a 100644 --- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java +++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookProducer.java @@ -23,7 +23,6 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import facebook4j.Facebook; -import facebook4j.Reading; import facebook4j.json.DataObjectFactory; import org.apache.camel.AsyncCallback; import org.apache.camel.CamelContext; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java ---------------------------------------------------------------------- diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java index 50afefb..a10f562 100644 --- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java +++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/ReadingBuilder.java @@ -20,7 +20,6 @@ import java.lang.reflect.Field; import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; -import java.util.Objects; import facebook4j.Reading; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java index 6d5c0e5..dfe219f 100644 --- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java +++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentProducerTest.java @@ -23,17 +23,10 @@ import facebook4j.Facebook; import facebook4j.FacebookException; import org.apache.camel.Exchange; import org.apache.camel.Predicate; -import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.builder.DefaultErrorHandlerBuilder; -import org.apache.camel.builder.ErrorHandlerBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.facebook.data.FacebookMethodsType; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.model.OnExceptionDefinition; -import org.apache.camel.processor.ErrorHandler; -import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; -import org.apache.camel.spi.RouteContext; import org.junit.Test; public class FacebookComponentProducerTest extends CamelFacebookTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java index ce6a5d8..d334d4f 100644 --- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java +++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java @@ -24,7 +24,6 @@ import org.apache.camel.component.file.GenericFile; import org.apache.camel.component.file.GenericFileEndpoint; import org.apache.camel.component.file.GenericFileExist; import org.apache.camel.component.file.GenericFileProducer; -import org.apache.camel.impl.DefaultExchange; import org.apache.camel.processor.idempotent.MemoryIdempotentRepository; import org.apache.camel.spi.UriParam; import org.apache.camel.util.ObjectHelper; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaConfigurationTest.java b/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaConfigurationTest.java index b039927..5ce86b7 100644 --- a/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaConfigurationTest.java +++ b/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaConfigurationTest.java @@ -23,7 +23,6 @@ import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; /** * JUnit test class for <code>org.apache.camel.component.ganglia.GangliaConfiguration</code> http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java index 0504e56..a73deec 100644 --- a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java +++ b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java @@ -25,14 +25,12 @@ import org.apache.camel.component.git.GitConstants; import org.apache.camel.component.git.GitEndpoint; import org.apache.camel.impl.DefaultProducer; import org.apache.camel.util.ObjectHelper; -import org.eclipse.jgit.api.CherryPickCommand; import org.eclipse.jgit.api.CherryPickResult; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.ListBranchCommand.ListMode; import org.eclipse.jgit.api.PullResult; import org.eclipse.jgit.api.Status; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -165,9 +163,9 @@ public class GitProducer extends DefaultProducer { if (!localRepo.exists()) { if (ObjectHelper.isNotEmpty(endpoint.getUsername()) && ObjectHelper.isNotEmpty(endpoint.getPassword())) { UsernamePasswordCredentialsProvider credentials = new UsernamePasswordCredentialsProvider(endpoint.getUsername(), endpoint.getPassword()); - result = git.cloneRepository().setCredentialsProvider(credentials).setURI(endpoint.getRemotePath()).setDirectory(new File(endpoint.getLocalPath(), "")).call(); + result = Git.cloneRepository().setCredentialsProvider(credentials).setURI(endpoint.getRemotePath()).setDirectory(new File(endpoint.getLocalPath(), "")).call(); } else { - result = git.cloneRepository().setURI(endpoint.getRemotePath()).setDirectory(new File(endpoint.getLocalPath(), "")).call(); + result = Git.cloneRepository().setURI(endpoint.getRemotePath()).setDirectory(new File(endpoint.getLocalPath(), "")).call(); } } else { throw new IllegalArgumentException("The local repository directory already exists"); @@ -186,7 +184,7 @@ public class GitProducer extends DefaultProducer { throw new IllegalArgumentException("Local path must specified to execute " + operation); } try { - result = git.init().setDirectory(new File(endpoint.getLocalPath(), "")).setBare(false).call(); + result = Git.init().setDirectory(new File(endpoint.getLocalPath(), "")).setBare(false).call(); } catch (Exception e) { LOG.error("There was an error in Git " + operation + " operation"); throw e; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java index d93b527..10dd399 100644 --- a/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java +++ b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java @@ -19,8 +19,6 @@ package org.apache.camel.component.git; import java.io.File; import java.io.IOException; -import org.apache.camel.EndpointInject; -import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java index fefab49..0953490 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIntegrationTest.java @@ -26,7 +26,6 @@ import java.util.Properties; import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMessage.RecipientType; import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64; import com.google.api.services.gmail.model.ListMessagesResponse; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java index 1ab530e..fcd30fd 100644 --- a/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java +++ b/components/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIntegrationTest.java @@ -25,7 +25,6 @@ import java.util.Properties; import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMessage.RecipientType; import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64; import com.google.api.services.gmail.model.Message; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapConsumer.java index b5934dc..ad25294 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapConsumer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapConsumer.java @@ -17,7 +17,6 @@ package org.apache.camel.component.hazelcast.replicatedmap; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.MultiMap; import com.hazelcast.core.ReplicatedMap; import org.apache.camel.Endpoint; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapProducer.java index cc2a4ab..5d21d0a 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapProducer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapProducer.java @@ -19,7 +19,6 @@ package org.apache.camel.component.hazelcast.replicatedmap; import java.util.Map; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.MultiMap; import com.hazelcast.core.ReplicatedMap; import org.apache.camel.Exchange; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetConsumer.java index c850ecd..7aaa78e 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetConsumer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetConsumer.java @@ -17,7 +17,6 @@ package org.apache.camel.component.hazelcast.set; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.IList; import com.hazelcast.core.ISet; import org.apache.camel.Consumer; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetProducer.java index 99aec66..bf6b007 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetProducer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetProducer.java @@ -17,10 +17,8 @@ package org.apache.camel.component.hazelcast.set; import java.util.Collection; -import java.util.Map; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.IList; import com.hazelcast.core.ISet; import org.apache.camel.Exchange; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConsumer.java index 958f0bd..dd601db 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConsumer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConsumer.java @@ -17,12 +17,10 @@ package org.apache.camel.component.hazelcast.topic; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.IQueue; import com.hazelcast.core.ITopic; import org.apache.camel.Endpoint; import org.apache.camel.Processor; import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer; -import org.apache.camel.component.hazelcast.listener.CamelItemListener; import org.apache.camel.component.hazelcast.listener.CamelMessageListener; /** http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java index 26d8df0..c4a4140 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java @@ -23,7 +23,6 @@ import com.hazelcast.core.EntryEvent; import com.hazelcast.core.EntryEventType; import com.hazelcast.core.EntryListener; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.MultiMap; import com.hazelcast.core.ReplicatedMap; import org.apache.camel.builder.RouteBuilder; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerForSpringTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerForSpringTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerForSpringTest.java index 3922c0c..a743ffd 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerForSpringTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerForSpringTest.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.Collection; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.MultiMap; import com.hazelcast.core.ReplicatedMap; import org.junit.After; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/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 43bbbe4..5108ab6 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,8 +20,7 @@ import java.util.Arrays; import java.util.Collection; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.MultiMap; -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/f545ca78/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java index 3c43d2f..64dc4e6 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.IList; import com.hazelcast.core.ISet; import com.hazelcast.core.ItemEvent; import com.hazelcast.core.ItemEventType; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java index dbf9b58..91c615c 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collection; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.IList; import com.hazelcast.core.ISet; import org.apache.camel.CamelExecutionException; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java index c0c8809..156e547 100644 --- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java +++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java @@ -32,7 +32,6 @@ import java.util.Map; import org.apache.camel.CamelExchangeException; import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.file.GenericFile; import org.apache.camel.converter.stream.CachedOutputStream; import org.apache.camel.http.common.HttpConstants; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java index ab9840a..1fd8d1c 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java @@ -20,7 +20,6 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.http.HttpStatus; /** http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java index 207ac06..046e7d4 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.component.http4.handler.BasicValidationHandler; import org.apache.http.Header; import org.apache.http.HttpException; import org.apache.http.HttpRequest; http://git-wip-us.apache.org/repos/asf/camel/blob/f545ca78/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java index edd23e8..7914b71 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java @@ -24,9 +24,7 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.component.http4.handler.BasicValidationHandler; import org.apache.camel.component.http4.handler.HeaderValidationHandler; -import org.apache.camel.component.http4.handler.ProxyAuthenticationValidationHandler; import org.apache.camel.util.URISupport; import org.apache.commons.codec.BinaryDecoder; import org.apache.commons.codec.DecoderException; @@ -42,8 +40,6 @@ import org.apache.http.ProtocolException; import org.apache.http.auth.AUTH; import org.apache.http.impl.bootstrap.HttpServer; import org.apache.http.impl.bootstrap.ServerBootstrap; -import org.apache.http.localserver.RequestBasicAuth; -import org.apache.http.localserver.ResponseBasicUnauthorized; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpProcessor; import org.apache.http.protocol.ImmutableHttpProcessor;
