You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/13 10:58:01 UTC
[camel] 01/02: Bump Infinispan to version 10.1.4.Final
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6710111c470c77c974f0dd3b68425e1ee436c983
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Mar 13 10:00:47 2020 +0100
Bump Infinispan to version 10.1.4.Final
---
components/camel-infinispan/pom.xml | 6 ++
.../InfinispanClusteredConsumerTest.java | 3 +-
.../InfinispanComponentEmbeddedCacheTest.java | 92 ----------------------
.../infinispan/InfinispanComponentTest.java | 2 +-
.../policy/InfinispanEmbeddedRoutePolicyTest.java | 2 +-
.../src/test/resources/cache-configuration.xml | 32 --------
parent/pom.xml | 2 +-
7 files changed, 11 insertions(+), 128 deletions(-)
diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml
index 87e9954..ac7b3f0 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -87,6 +87,12 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
+ <artifactId>infinispan-commons-test</artifactId>
+ <version>${infinispan-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
<artifactId>infinispan-spring5-remote</artifactId>
<version>${infinispan-version}</version>
<scope>test</scope>
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
index 8d5d5c5..f7ccd6d 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
@@ -21,8 +21,9 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.infinispan.commons.test.TestResourceTracker;
import org.infinispan.distribution.MagicKey;
-import org.infinispan.test.fwk.TestResourceTracker;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentEmbeddedCacheTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentEmbeddedCacheTest.java
deleted file mode 100644
index c9c54df..0000000
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentEmbeddedCacheTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.infinispan;
-
-import org.apache.camel.EndpointInject;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-public class InfinispanComponentEmbeddedCacheTest extends InfinispanTestSupport {
- @EndpointInject("mock:embedded")
- private MockEndpoint mockEmbedded;
-
- @EndpointInject("mock:file")
- private MockEndpoint mockFile;
-
- @EndpointInject("mock:external")
- private MockEndpoint mockExternal;
-
- @Test
- public void sendAndRecieveToEmbededCache() throws InterruptedException {
- for (int i = 1; i <= 10; i++) {
- fluentTemplate()
- .to("direct:embedded")
- .withHeader(InfinispanConstants.KEY, "key:" + i)
- .withHeader(InfinispanConstants.VALUE, "Hey Camel!" + i)
- .send();
-
- if (i % 2 == 0) {
- fluentTemplate()
- .to("direct:file")
- .withHeader(InfinispanConstants.KEY, "key:" + i)
- .withHeader(InfinispanConstants.VALUE, "Hey Infinispan!" + i)
- .send();
- }
- if (i % 3 == 0) {
- namedCache("test").put("key:" + i, "Hey cache!" + i);
- }
- }
-
- mockEmbedded.expectedBodiesReceived("10");
- mockFile.expectedBodiesReceived("5");
- mockExternal.expectedBodiesReceived("3");
- fluentTemplate()
- .to("direct:embedded-get")
- .withHeader(InfinispanConstants.OPERATION, InfinispanConstants.RESULT_HEADER)
- .withHeader(InfinispanConstants.OPERATION, InfinispanOperation.SIZE)
- .send();
-
- fluentTemplate().to("direct:file-get")
- .withHeader(InfinispanConstants.OPERATION, InfinispanConstants.RESULT_HEADER)
- .withHeader(InfinispanConstants.OPERATION, InfinispanOperation.SIZE)
- .send();
-
- fluentTemplate().to("direct:external")
- .withHeader(InfinispanConstants.OPERATION, InfinispanConstants.RESULT_HEADER)
- .withHeader(InfinispanConstants.OPERATION, InfinispanOperation.SIZE)
- .send();
-
- mockEmbedded.assertIsSatisfied();
- mockFile.assertIsSatisfied();
- mockExternal.assertIsSatisfied();
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- // random order of routes with different endpoints tests are needed for checking of proper containerCache initialization
- return new RouteBuilder() {
- public void configure() {
- from("direct:embedded").to("infinispan:test");
- from("direct:file").to("infinispan:test?configurationUri=cache-configuration.xml");
- from("direct:external").to("infinispan:test?cacheContainer=#cacheContainer").to("mock:external");
- from("direct:file-get").to("infinispan:test?configurationUri=cache-configuration.xml&operation=GET").to("mock:file");
- from("direct:embedded-get").to("infinispan:test?operation=GET").to("mock:embedded");
- }
- };
- }
-}
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java
index 09c9f16..3ee96e8 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.hamcrest.core.Is.is;
public class InfinispanComponentTest extends InfinispanTestSupport {
- private final String cacheName = UUID.randomUUID().toString();
+ private final String cacheName = "default";
@Test
public void consumerReceivedEntryCreatedEventNotifications() throws Exception {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanEmbeddedRoutePolicyTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanEmbeddedRoutePolicyTest.java
index d3eec1a..dd90889 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanEmbeddedRoutePolicyTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanEmbeddedRoutePolicyTest.java
@@ -26,7 +26,7 @@ public class InfinispanEmbeddedRoutePolicyTest extends InfinispanRoutePolicyTest
@Override
protected BasicCacheContainer createCacheManager() throws Exception {
- GlobalConfiguration global = new GlobalConfigurationBuilder().defaultCacheName("default").build();
+ GlobalConfiguration global = new GlobalConfigurationBuilder().defaultCacheName("camel-route-policy").build();
return new DefaultCacheManager(global, new ConfigurationBuilder().build());
}
}
diff --git a/components/camel-infinispan/src/test/resources/cache-configuration.xml b/components/camel-infinispan/src/test/resources/cache-configuration.xml
deleted file mode 100644
index eb9a1fb..0000000
--- a/components/camel-infinispan/src/test/resources/cache-configuration.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<infinispan
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:infinispan:config:7.1 http://www.infinispan.org/schemas/infinispan-config-7.1.xsd"
- xmlns="urn:infinispan:config:7.1">
-
- <cache-container default-cache="test">
- <transport cluster="cacheTest"/>
-
- <distributed-cache name="test" mode="SYNC">
- <expiration lifespan="5000"/>
- </distributed-cache>
- </cache-container>
-</infinispan>
diff --git a/parent/pom.xml b/parent/pom.xml
index ed74f70..483cb24 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -300,7 +300,7 @@
<icu4j-version>65.1</icu4j-version>
<ignite-version>2.7.6</ignite-version>
<impsort-maven-plugin-version>1.3.2</impsort-maven-plugin-version>
- <infinispan-version>10.1.3.Final</infinispan-version>
+ <infinispan-version>10.1.4.Final</infinispan-version>
<influx-java-driver-version>2.17</influx-java-driver-version>
<influx-java-driver-bundle-version>2.17_1</influx-java-driver-bundle-version>
<influx-guava-version>20.0</influx-guava-version>