This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8618ebae22c94f2ce601e9111cffbcdcbbdb2ab5 Author: Luca Burgazzoli <lburgazz...@gmail.com> AuthorDate: Tue Jan 26 11:50:05 2021 +0100 CAMEL-12489 - camel-infinspan: split remote and embedded components (cleanup) --- .../apache/camel/component/infinispan/InfinispanUtil.java | 9 +-------- .../infinispan/embedded/InfinispanEmbeddedProducerTest.java | 12 +++++++++--- .../infinispan/embedded/InfinispanEmbeddedTestSupport.java | 1 + 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanUtil.java b/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanUtil.java index 95e6e1e..f9f0ebc 100644 --- a/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanUtil.java +++ b/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanUtil.java @@ -27,20 +27,13 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.support.ResourceHelper; import org.apache.camel.util.ObjectHelper; -import org.infinispan.AdvancedCache; -import org.infinispan.commons.api.BasicCache; public class InfinispanUtil { protected InfinispanUtil() { } - @SuppressWarnings("unchecked") - public static <K, V> AdvancedCache<K, V> asAdvanced(BasicCache<K, V> cache) { - return (AdvancedCache) cache; - } - public static boolean isInHeaderEmpty(Exchange exchange, String header) { - return isHeaderEmpty(exchange.getIn(), header); + return isHeaderEmpty(exchange.getMessage(), header); } public static boolean isHeaderEmpty(Message message, String header) { diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedProducerTest.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedProducerTest.java index 46a4a1c..3f0acc8 100644 --- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedProducerTest.java +++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedProducerTest.java @@ -23,8 +23,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.infinispan.InfinispanConstants; import org.apache.camel.component.infinispan.InfinispanOperation; import org.apache.camel.component.infinispan.InfinispanProducerTestSupport; -import org.apache.camel.component.infinispan.InfinispanUtil; import org.infinispan.commons.api.BasicCache; +import org.infinispan.configuration.cache.ConfigurationBuilder; import org.infinispan.stats.Stats; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -37,10 +37,16 @@ public class InfinispanEmbeddedProducerTest extends InfinispanEmbeddedTestSuppor return (k, v) -> v + "replay"; } + @Override + protected ConfigurationBuilder getConfiguration() { + ConfigurationBuilder builder = super.getConfiguration(); + builder.statistics().enable(); + + return builder; + } + @Test public void statsOperation() { - InfinispanUtil.asAdvanced(getCache()).getStats().setStatisticsEnabled(true); - fluentTemplate() .to("direct:start") .withHeader(InfinispanConstants.KEY, InfinispanProducerTestSupport.KEY_ONE) diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedTestSupport.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedTestSupport.java index e887c9c..f99da99 100644 --- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedTestSupport.java +++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedTestSupport.java @@ -65,6 +65,7 @@ public class InfinispanEmbeddedTestSupport extends InfinispanTestSupport { protected ConfigurationBuilder getConfiguration() { ConfigurationBuilder builder = new ConfigurationBuilder(); builder.clustering().cacheMode(CacheMode.LOCAL); + return builder; }