CAMEL-11268: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbdab917 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbdab917 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbdab917 Branch: refs/heads/master Commit: dbdab9173b57010fb4a8dc5ecca37d63b92004a2 Parents: d8800ac Author: Andrea Cosentino <[email protected]> Authored: Fri May 12 15:34:16 2017 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Fri May 12 15:34:16 2017 +0200 ---------------------------------------------------------------------- .../infinispan/InfinispanProducer.java | 20 ++++++++++---------- .../infinispan/InfinispanProducerTest.java | 10 +++++----- ...ocalAggregationRepositoryOperationsTest.java | 2 +- ...nfinispanLocalAggregationRepositoryTest.java | 2 +- ...finispanDefaultIdempotentRepositoryTest.java | 7 +++---- .../InfinispanIdempotentRepositoryTest.java | 4 ++-- 6 files changed, 22 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java index a1bd132..c1ccda2 100644 --- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java +++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java @@ -272,11 +272,11 @@ public class InfinispanProducer extends HeaderSelectorProducer { final CompletableFuture<Boolean> resultRemoveAsyncKeyValue; if (ObjectHelper.isEmpty(value)) { - resultRemoveAsyncKey = cache.removeAsync(key); + resultRemoveAsyncKey = cache.removeAsync(key); setResult(message, resultRemoveAsyncKey); } else { - resultRemoveAsyncKeyValue = cache.removeAsync(key, value); - setResult(message, resultRemoveAsyncKeyValue); + resultRemoveAsyncKeyValue = cache.removeAsync(key, value); + setResult(message, resultRemoveAsyncKeyValue); } } @@ -339,33 +339,33 @@ public class InfinispanProducer extends HeaderSelectorProducer { TimeUnit maxIdleTimeUnit = message.getHeader(InfinispanConstants.MAX_IDLE_TIME_UNIT, TimeUnit.class); if (ObjectHelper.isEmpty(oldValue)) { - resultWithNewValue = cache.replaceAsync(key, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit); + resultWithNewValue = cache.replaceAsync(key, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit); setResult(message, resultWithNewValue); } else { - resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit); + resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit); setResult(message, resultWithNewAndOldValue); } } else { if (ObjectHelper.isEmpty(oldValue)) { - resultWithNewValue = cache.replaceAsync(key, value, lifespan, timeUnit); + resultWithNewValue = cache.replaceAsync(key, value, lifespan, timeUnit); setResult(message, resultWithNewValue); } else { - resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit); + resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit); setResult(message, resultWithNewAndOldValue); } } } else { if (ObjectHelper.isEmpty(oldValue)) { - resultWithNewValue = cache.replaceAsync(key, value); + resultWithNewValue = cache.replaceAsync(key, value); setResult(message, resultWithNewValue); } else { - resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value); + resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value); setResult(message, resultWithNewAndOldValue); } } } - + @InvokeOnHeader("SIZE") @InvokeOnHeader(InfinispanConstants.SIZE) void onSize(Message message) { http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java index 1343516..d26744a 100644 --- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java +++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java @@ -120,7 +120,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport { waitFor(new Condition() { @Override public boolean isSatisfied() throws Exception { - CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class); + CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class); Object value = currentCache().get(KEY_ONE); return resultPutAsync.isDone() && value.equals(VALUE_ONE); } @@ -146,7 +146,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport { waitFor(new Condition() { @Override public boolean isSatisfied() throws Exception { - CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class); + CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class); return resultPutAsync.isDone() && currentCache().get(KEY_ONE).toString().equals(VALUE_ONE); } }, 1000); @@ -347,7 +347,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport { waitFor(new Condition() { @Override public boolean isSatisfied() throws Exception { - CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class); + CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class); return resultPutAsync.isDone() && currentCache().get(KEY_ONE).equals(VALUE_ONE); } }, 2000); @@ -368,7 +368,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport { waitFor(new Condition() { @Override public boolean isSatisfied() throws Exception { - CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class); + CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class); return resultPutAsync.isDone() && currentCache().get(KEY_ONE).equals(VALUE_ONE); } }, 100); @@ -393,7 +393,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport { waitFor(new Condition() { @Override public boolean isSatisfied() throws Exception { - CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class); + CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class); return resultPutAsync.isDone() && currentCache().get(KEY_ONE).equals(VALUE_ONE); } }, 500); http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java index c10bdd4..95ac0b6 100644 --- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java +++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java @@ -45,7 +45,7 @@ public class InfinispanLocalAggregationRepositoryOperationsTest { @BeforeClass public static void starting() throws Exception { - Configuration conf = new ConfigurationBuilder().build(); + Configuration conf = new ConfigurationBuilder().build(); aggregationRepository = new InfinispanLocalAggregationRepository(); aggregationRepository.setConfiguration(conf); aggregationRepository.start(); http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java index 1c35d89..536f81f 100644 --- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java +++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java @@ -43,7 +43,7 @@ public class InfinispanLocalAggregationRepositoryTest extends CamelTestSupport { @Test public void checkAggregationFromOneRoute() throws Exception { - Configuration conf = new ConfigurationBuilder().build(); + Configuration conf = new ConfigurationBuilder().build(); final InfinispanLocalAggregationRepository repoOne = new InfinispanLocalAggregationRepository(); repoOne.setConfiguration(conf); http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java index 0425aec..4bd7fb0 100644 --- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java +++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java @@ -16,19 +16,18 @@ */ package org.apache.camel.component.infinispan.processor.idempotent; +import org.infinispan.configuration.cache.ConfigurationBuilder; +import org.infinispan.manager.DefaultCacheManager; import org.junit.Test; import static org.jgroups.util.Util.assertFalse; import static org.jgroups.util.Util.assertTrue; -import org.infinispan.configuration.cache.ConfigurationBuilder; -import org.infinispan.manager.DefaultCacheManager; - public class InfinispanDefaultIdempotentRepositoryTest { @Test public void createsRepositoryUsingInternalCache() throws Exception { - DefaultCacheManager basicCacheContainer = new DefaultCacheManager(new ConfigurationBuilder().build()); + DefaultCacheManager basicCacheContainer = new DefaultCacheManager(new ConfigurationBuilder().build()); InfinispanIdempotentRepository repository = InfinispanIdempotentRepository.infinispanIdempotentRepository(basicCacheContainer, "default"); assertFalse(repository.contains("One")); http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java index 86e9485..e604d7f 100644 --- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java +++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java @@ -40,8 +40,8 @@ public class InfinispanIdempotentRepositoryTest { @Before public void setUp() throws Exception { - GlobalConfiguration global = new GlobalConfigurationBuilder().globalJmxStatistics().allowDuplicateDomains(true).build(); - Configuration conf = new ConfigurationBuilder().build(); + GlobalConfiguration global = new GlobalConfigurationBuilder().globalJmxStatistics().allowDuplicateDomains(true).build(); + Configuration conf = new ConfigurationBuilder().build(); basicCacheContainer = new DefaultCacheManager(global, conf); basicCacheContainer.start(); idempotentRepository = InfinispanIdempotentRepository.infinispanIdempotentRepository(basicCacheContainer, cacheName);
