CAMEL-7794: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a5666d4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a5666d4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a5666d4 Branch: refs/heads/master Commit: 4a5666d46c9c6fd99afd4d2aa17dd6a2f95a5cea Parents: a97d8b9 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Dec 3 20:01:40 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Dec 3 20:01:40 2014 +0100 ---------------------------------------------------------------------- .../hazelcast/topic/HazelcastTopicEndpoint.java | 2 +- .../hazelcast/topic/HazelcastTopicProducer.java | 18 +++++++----------- .../hazelcast/HazelcastTopicConsumerTest.java | 11 +++++++---- 3 files changed, 15 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4a5666d4/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpoint.java index d74d780..3e57529 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpoint.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpoint.java @@ -19,9 +19,9 @@ package org.apache.camel.component.hazelcast.topic; import com.hazelcast.core.HazelcastInstance; import org.apache.camel.Component; import org.apache.camel.Consumer; +import org.apache.camel.MultipleConsumersSupport; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.MultipleConsumersSupport; import org.apache.camel.component.hazelcast.HazelcastDefaultEndpoint; /** http://git-wip-us.apache.org/repos/asf/camel/blob/4a5666d4/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicProducer.java index 6111c59..4cb08fe 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicProducer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicProducer.java @@ -37,24 +37,20 @@ public class HazelcastTopicProducer extends HazelcastDefaultProducer { } public void process(Exchange exchange) throws Exception { - final int operation = lookupOperationNumber(exchange); switch (operation) { - - case -1: - // default operation to publish - case HazelcastConstants.PUBLISH_OPERATION: - this.publish(exchange); - break; - default: - throw new IllegalArgumentException(String.format("The value '%s' is not allowed for parameter '%s' on the TOPIC cache.", operation, HazelcastConstants.OPERATION)); - + case -1: + // default operation to publish + case HazelcastConstants.PUBLISH_OPERATION: + this.publish(exchange); + break; + default: + throw new IllegalArgumentException(String.format("The value '%s' is not allowed for parameter '%s' on the TOPIC cache.", operation, HazelcastConstants.OPERATION)); } // finally copy headers HazelcastComponentHelper.copyHeaders(exchange); - } private void publish(Exchange exchange) { http://git-wip-us.apache.org/repos/asf/camel/blob/4a5666d4/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java index 57531f6..c833f88 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java @@ -16,16 +16,19 @@ */ package org.apache.camel.component.hazelcast; -import com.hazelcast.core.*; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.core.ITopic; +import com.hazelcast.core.Message; +import com.hazelcast.core.MessageListener; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import java.util.Map; -import java.util.concurrent.TimeUnit; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when;
