You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/12 17:00:28 UTC
[camel] branch master updated: CAMEL-14544 (#3627)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 9039300 CAMEL-14544 (#3627)
9039300 is described below
commit 9039300e29bd1096870e41d2bab96085387f763a
Author: Madhawa Gunasekara <st...@stud.uni-stuttgart.de>
AuthorDate: Thu Mar 12 18:00:17 2020 +0100
CAMEL-14544 (#3627)
* CAMEL-14544
* Fix Checkstyles
* Fix OSGI import version fro hazelcast
---
components/camel-hazelcast/pom.xml | 7 +------
.../component/hazelcast/HazelcastConstants.java | 1 +
.../HazelcastAtomicnumberProducer.java | 4 ++--
.../instance/HazelcastInstanceConsumer.java | 10 ++-------
.../hazelcast/list/HazelcastListConsumer.java | 2 +-
.../hazelcast/list/HazelcastListProducer.java | 2 +-
.../hazelcast/listener/CamelEntryListener.java | 7 ++++++-
.../hazelcast/listener/CamelItemListener.java | 4 ++--
.../hazelcast/listener/CamelMapListener.java | 2 +-
.../hazelcast/listener/CamelMessageListener.java | 4 ++--
.../hazelcast/map/HazelcastMapConsumer.java | 2 +-
.../hazelcast/map/HazelcastMapProducer.java | 4 ++--
.../multimap/HazelcastMultimapConsumer.java | 2 +-
.../multimap/HazelcastMultimapProducer.java | 2 +-
.../hazelcast/policy/HazelcastRoutePolicy.java | 2 +-
.../hazelcast/queue/HazelcastQueueConsumer.java | 2 +-
.../hazelcast/queue/HazelcastQueueProducer.java | 2 +-
.../HazelcastReplicatedmapConsumer.java | 2 +-
.../HazelcastReplicatedmapProducer.java | 2 +-
.../hazelcast/seda/HazelcastSedaConsumer.java | 3 ++-
.../hazelcast/set/HazelcastSetConsumer.java | 2 +-
.../hazelcast/set/HazelcastSetProducer.java | 2 +-
.../hazelcast/topic/HazelcastTopicConsumer.java | 2 +-
.../hazelcast/topic/HazelcastTopicProducer.java | 2 +-
.../hazelcast/HazelcastAggregationRepository.java | 8 ++++----
.../hazelcast/HazelcastIdempotentRepository.java | 2 +-
...HazelcastAtomicnumberProducerForSpringTest.java | 17 ++++++++-------
.../HazelcastAtomicnumberProducerTest.java | 12 ++++++++---
.../hazelcast/HazelcastInstanceConsumerTest.java | 13 ++++++------
.../hazelcast/HazelcastListConsumerTest.java | 9 ++++----
.../hazelcast/HazelcastListProducerTest.java | 2 +-
.../hazelcast/HazelcastMapConsumerTest.java | 5 +++--
.../HazelcastMapProducerForSpringTest.java | 4 ++--
.../hazelcast/HazelcastMapProducerTest.java | 4 ++--
.../hazelcast/HazelcastMultimapConsumerTest.java | 5 +++--
.../HazelcastMultimapProducerForSpringTest.java | 2 +-
.../hazelcast/HazelcastMultimapProducerTest.java | 2 +-
.../hazelcast/HazelcastQueueConsumerPollTest.java | 2 +-
.../hazelcast/HazelcastQueueConsumerTest.java | 9 ++++----
.../hazelcast/HazelcastQueueProducerTest.java | 2 +-
.../HazelcastReliableTopicConsumerTest.java | 9 ++++----
.../HazelcastReliableTopicProducerTest.java | 2 +-
.../HazelcastReplicatedmapConsumerTest.java | 5 +++--
...azelcastReplicatedmapProducerForSpringTest.java | 2 +-
.../HazelcastReplicatedmapProducerTest.java | 2 +-
.../HazelcastSedaRecoverableConsumerTest.java | 4 ++--
.../hazelcast/HazelcastSetConsumerTest.java | 9 ++++----
.../hazelcast/HazelcastSetProducerTest.java | 2 +-
.../hazelcast/HazelcastTopicConsumerTest.java | 9 ++++----
.../hazelcast/HazelcastTopicProducerTest.java | 2 +-
.../HazelcastIdempotentRepositoryTest.java | 2 +-
.../src/test/resources/hazelcast-custom.xml | 11 +++++-----
.../src/test/resources/hazelcast-default.xml | 24 ++++++++++++++--------
.../src/test/resources/hazelcast-named.xml | 13 ++++++------
.../policy/CacheManagerFromRegistryTest.java | 2 +-
parent/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 1 -
57 files changed, 148 insertions(+), 125 deletions(-)
diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml
index 2e38b68..2ed2445 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -33,7 +33,7 @@
<properties>
<camel.osgi.import.before.defaults>
- com.hazelcast.*;version="[3.2,4)"
+ com.hazelcast.*;version="[4,5)"
</camel.osgi.import.before.defaults>
</properties>
@@ -48,11 +48,6 @@
<artifactId>hazelcast</artifactId>
<version>${hazelcast-version}</version>
</dependency>
- <dependency>
- <groupId>com.hazelcast</groupId>
- <artifactId>hazelcast-client</artifactId>
- <version>${hazelcast-version}</version>
- </dependency>
<dependency>
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
index 3fb9923..3c37f70 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
@@ -309,6 +309,7 @@ public final class HazelcastConstants {
// listener actions
public static final String REMOVED = "removed";
public static final String EVICTED = "evicted";
+ public static final String EXPIRED = "expired";
public static final String UPDATED = "updated";
public static final String ADDED = "added";
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberProducer.java
index 49ef55a..6675d27 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberProducer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberProducer.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.hazelcast.atomicnumber;
import java.util.Map;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicLong;
+import com.hazelcast.cp.IAtomicLong;
import org.apache.camel.Exchange;
import org.apache.camel.component.hazelcast.HazelcastComponentHelper;
import org.apache.camel.component.hazelcast.HazelcastConstants;
@@ -34,7 +34,7 @@ public class HazelcastAtomicnumberProducer extends HazelcastDefaultProducer {
public HazelcastAtomicnumberProducer(HazelcastInstance hazelcastInstance, HazelcastDefaultEndpoint endpoint, String cacheName) {
super(endpoint);
- this.atomicnumber = hazelcastInstance.getAtomicLong(cacheName);
+ this.atomicnumber = hazelcastInstance.getCPSubsystem().getAtomicLong(cacheName);
}
@Override
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceConsumer.java
index 97efae0..2d79344 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceConsumer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceConsumer.java
@@ -18,10 +18,9 @@ package org.apache.camel.component.hazelcast.instance;
import java.net.InetSocketAddress;
+import com.hazelcast.cluster.MembershipEvent;
+import com.hazelcast.cluster.MembershipListener;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.MemberAttributeEvent;
-import com.hazelcast.core.MembershipEvent;
-import com.hazelcast.core.MembershipListener;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.hazelcast.HazelcastComponentHelper;
@@ -49,11 +48,6 @@ public class HazelcastInstanceConsumer extends DefaultConsumer {
this.sendExchange(event, HazelcastConstants.REMOVED);
}
- @Override
- public void memberAttributeChanged(MemberAttributeEvent event) {
- this.sendExchange(event, HazelcastConstants.UPDATED);
- }
-
private void sendExchange(MembershipEvent event, String action) {
Exchange exchange = getEndpoint().createExchange();
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListConsumer.java
index 79c8346..e3928d0 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListConsumer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListConsumer.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.hazelcast.list;
+import com.hazelcast.collection.IList;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IList;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListProducer.java
index 141719b..c7bbf64 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListProducer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListProducer.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.hazelcast.list;
import java.util.Collection;
import java.util.Map;
+import com.hazelcast.collection.IList;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IList;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.component.hazelcast.HazelcastComponentHelper;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java
index 5ef0811..7189b5f 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.hazelcast.listener;
import com.hazelcast.core.EntryEvent;
import com.hazelcast.core.EntryListener;
-import com.hazelcast.core.MapEvent;
+import com.hazelcast.map.MapEvent;
import org.apache.camel.component.hazelcast.HazelcastConstants;
import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer;
@@ -60,4 +60,9 @@ public class CamelEntryListener extends CamelListener implements EntryListener<O
public void entryUpdated(EntryEvent<Object, Object> event) {
this.sendExchange(HazelcastConstants.UPDATED, event.getKey(), event.getValue());
}
+
+ @Override
+ public void entryExpired(EntryEvent<Object, Object> event) {
+ this.sendExchange(HazelcastConstants.EXPIRED, event.getKey(), event.getValue());
+ }
}
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
index 7cd2cfc..8c17ea9 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.hazelcast.listener;
-import com.hazelcast.core.ItemEvent;
-import com.hazelcast.core.ItemListener;
+import com.hazelcast.collection.ItemEvent;
+import com.hazelcast.collection.ItemListener;
import org.apache.camel.component.hazelcast.HazelcastConstants;
import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelMapListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelMapListener.java
index 362afbe..9eeccfd 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelMapListener.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelMapListener.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.hazelcast.listener;
import com.hazelcast.core.EntryEvent;
-import com.hazelcast.core.MapEvent;
+import com.hazelcast.map.MapEvent;
import org.apache.camel.component.hazelcast.HazelcastConstants;
import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelMessageListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelMessageListener.java
index 8a93ed3..a7bb960 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelMessageListener.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelMessageListener.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.hazelcast.listener;
-import com.hazelcast.core.Message;
-import com.hazelcast.core.MessageListener;
+import com.hazelcast.topic.Message;
+import com.hazelcast.topic.MessageListener;
import org.apache.camel.component.hazelcast.HazelcastConstants;
import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapConsumer.java
index 5e437a3..7076e89 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapConsumer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapConsumer.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.hazelcast.map;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java
index a436195..674d9eb 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java
@@ -22,8 +22,8 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
-import com.hazelcast.query.SqlPredicate;
+import com.hazelcast.map.IMap;
+import com.hazelcast.query.impl.predicates.SqlPredicate;
import org.apache.camel.Exchange;
import org.apache.camel.component.hazelcast.HazelcastComponentHelper;
import org.apache.camel.component.hazelcast.HazelcastConstants;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapConsumer.java
index 182854f..c1b3632 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapConsumer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapConsumer.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.hazelcast.multimap;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.MultiMap;
+import com.hazelcast.multimap.MultiMap;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java
index dcb1843..84de0a1 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.hazelcast.multimap;
import java.util.Map;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.MultiMap;
+import com.hazelcast.multimap.MultiMap;
import org.apache.camel.Exchange;
import org.apache.camel.component.hazelcast.HazelcastComponentHelper;
import org.apache.camel.component.hazelcast.HazelcastConstants;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/policy/HazelcastRoutePolicy.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/policy/HazelcastRoutePolicy.java
index 0209ebf..3a65468 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/policy/HazelcastRoutePolicy.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/policy/HazelcastRoutePolicy.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Route;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java
index 256df91..1be5a9c 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.hazelcast.queue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
+import com.hazelcast.collection.IQueue;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
index 54170032..c6336e5 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
@@ -20,8 +20,8 @@ import java.util.Collection;
import java.util.Map;
import java.util.function.Predicate;
+import com.hazelcast.collection.IQueue;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
import org.apache.camel.Exchange;
import org.apache.camel.component.hazelcast.HazelcastComponentHelper;
import org.apache.camel.component.hazelcast.HazelcastConstants;
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 87dcef5..692ab94 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,7 @@
package org.apache.camel.component.hazelcast.replicatedmap;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ReplicatedMap;
+import com.hazelcast.replicatedmap.ReplicatedMap;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer;
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 b5817a9..4e4b60a 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,7 @@ package org.apache.camel.component.hazelcast.replicatedmap;
import java.util.Map;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ReplicatedMap;
+import com.hazelcast.replicatedmap.ReplicatedMap;
import org.apache.camel.Exchange;
import org.apache.camel.component.hazelcast.HazelcastComponentHelper;
import org.apache.camel.component.hazelcast.HazelcastConstants;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
index dbb00b2..9120a15 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
@@ -19,8 +19,9 @@ package org.apache.camel.component.hazelcast.seda;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
-import com.hazelcast.core.BaseQueue;
+import com.hazelcast.collection.BaseQueue;
import com.hazelcast.transaction.TransactionContext;
+import com.hazelcast.transaction.TransactionOptions;
import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Consumer;
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 cdbb56d..8468562 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
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.hazelcast.set;
+import com.hazelcast.collection.ISet;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ISet;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
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 fdadc4a..5462df1 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
@@ -18,8 +18,8 @@ package org.apache.camel.component.hazelcast.set;
import java.util.Collection;
+import com.hazelcast.collection.ISet;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ISet;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.component.hazelcast.HazelcastComponentHelper;
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 e08b83a..ddd5d36 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,7 +17,7 @@
package org.apache.camel.component.hazelcast.topic;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ITopic;
+import com.hazelcast.topic.ITopic;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer;
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 d2ef60f..0bdb61d 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
@@ -17,7 +17,7 @@
package org.apache.camel.component.hazelcast.topic;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ITopic;
+import com.hazelcast.topic.ITopic;
import org.apache.camel.Exchange;
import org.apache.camel.component.hazelcast.HazelcastComponentHelper;
import org.apache.camel.component.hazelcast.HazelcastConstants;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 7501eb1..58fde58 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -25,10 +25,10 @@ import com.hazelcast.config.Config;
import com.hazelcast.config.XmlConfigBuilder;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
-import com.hazelcast.core.TransactionalMap;
+import com.hazelcast.map.IMap;
import com.hazelcast.transaction.TransactionContext;
import com.hazelcast.transaction.TransactionOptions;
+import com.hazelcast.transaction.TransactionalMap;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.spi.OptimisticLockingAggregationRepository;
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
* {@link RecoverableAggregationRepository} and {@link OptimisticLockingAggregationRepository}.
* Defaults to thread-safe (non-optimistic) locking and recoverable strategy.
* Hazelcast settings are given to an end-user and can be controlled with repositoryName and persistentRespositoryName,
- * both are {@link com.hazelcast.core.IMap} <String, Exchange>. However HazelcastAggregationRepository
+ * both are {@link com.hazelcast.map.IMap} <String, Exchange>. However HazelcastAggregationRepository
* can run it's own Hazelcast instance, but obviously no benefits of Hazelcast clustering are gained this way.
* If the {@link HazelcastAggregationRepository} uses it's own local {@link HazelcastInstance} it will DESTROY this
* instance on {@link #doStop()}. You should control {@link HazelcastInstance} lifecycle yourself whenever you instantiate
@@ -208,7 +208,7 @@ public class HazelcastAggregationRepository extends ServiceSupport
throw new UnsupportedOperationException();
}
LOG.trace("Adding an Exchange with ID {} for key {} in a thread-safe manner.", exchange.getExchangeId(), key);
- Lock l = hzInstance.getLock(mapName);
+ Lock l = hzInstance.getCPSubsystem().getLock(mapName);
try {
l.lock();
DefaultExchangeHolder newHolder = DefaultExchangeHolder.marshal(exchange, true, allowSerializedHeaders);
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepository.java b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepository.java
index 18d851b..8a39065 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepository.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepository.java
@@ -17,7 +17,7 @@
package org.apache.camel.processor.idempotent.hazelcast;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.support.service.ServiceSupport;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerForSpringTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerForSpringTest.java
index 4bf5266..661d379 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerForSpringTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerForSpringTest.java
@@ -20,31 +20,34 @@ import java.util.HashMap;
import java.util.Map;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicLong;
+import com.hazelcast.cp.CPSubsystem;
+import com.hazelcast.cp.IAtomicLong;
import org.junit.After;
import org.junit.Test;
import org.mockito.Mock;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
public class HazelcastAtomicnumberProducerForSpringTest extends HazelcastCamelSpringTestSupport {
@Mock
private IAtomicLong atomicNumber;
+ @Mock
+ private CPSubsystem cpSubsystem;
+
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
- when(hazelcastInstance.getAtomicLong("foo")).thenReturn(atomicNumber);
+ when(hazelcastInstance.getCPSubsystem()).thenReturn(cpSubsystem);
+ when(cpSubsystem.getAtomicLong("foo")).thenReturn(atomicNumber);
}
@Override
protected void verifyHazelcastInstance(HazelcastInstance hazelcastInstance) {
- verify(hazelcastInstance, atLeastOnce()).getAtomicLong("foo");
+ verify(hazelcastInstance, times(7)).getCPSubsystem();
+ verify(cpSubsystem, atLeastOnce()).getAtomicLong("foo");
}
@After
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerTest.java
index 922b762..f902949 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerTest.java
@@ -20,7 +20,8 @@ import java.util.HashMap;
import java.util.Map;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicLong;
+import com.hazelcast.cp.CPSubsystem;
+import com.hazelcast.cp.IAtomicLong;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.junit.After;
@@ -34,14 +35,19 @@ public class HazelcastAtomicnumberProducerTest extends HazelcastCamelTestSupport
@Mock
private IAtomicLong atomicNumber;
+ @Mock
+ private CPSubsystem cpSubsystem;
+
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
- when(hazelcastInstance.getAtomicLong("foo")).thenReturn(atomicNumber);
+ when(hazelcastInstance.getCPSubsystem()).thenReturn(cpSubsystem);
+ when(cpSubsystem.getAtomicLong("foo")).thenReturn(atomicNumber);
}
@Override
protected void verifyHazelcastInstance(HazelcastInstance hazelcastInstance) {
- verify(hazelcastInstance, atLeastOnce()).getAtomicLong("foo");
+ verify(hazelcastInstance, times(10)).getCPSubsystem();
+ verify(cpSubsystem, atLeastOnce()).getAtomicLong("foo");
}
@After
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java
index da5d67e..729d787 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java
@@ -18,14 +18,15 @@ package org.apache.camel.component.hazelcast;
import java.net.InetSocketAddress;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import com.hazelcast.core.Cluster;
+import com.hazelcast.cluster.Cluster;
+import com.hazelcast.cluster.Member;
+import com.hazelcast.cluster.MembershipEvent;
+import com.hazelcast.cluster.MembershipListener;
+import com.hazelcast.collection.IList;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IList;
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MembershipEvent;
-import com.hazelcast.core.MembershipListener;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -54,7 +55,7 @@ public class HazelcastInstanceConsumerTest extends HazelcastCamelTestSupport {
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.getCluster()).thenReturn(cluster);
argument = ArgumentCaptor.forClass(MembershipListener.class);
- when(cluster.addMembershipListener(any())).thenReturn("foo");
+ when(cluster.addMembershipListener(any())).thenReturn(UUID.randomUUID());
}
@Override
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
index a5b96e7..0b051ac 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
@@ -17,13 +17,14 @@
package org.apache.camel.component.hazelcast;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import com.hazelcast.collection.IList;
+import com.hazelcast.collection.ItemEvent;
+import com.hazelcast.collection.ItemListener;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IList;
-import com.hazelcast.core.ItemEvent;
import com.hazelcast.core.ItemEventType;
-import com.hazelcast.core.ItemListener;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
@@ -44,7 +45,7 @@ public class HazelcastListConsumerTest extends HazelcastCamelTestSupport {
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getList("foo")).thenReturn(list);
- when(list.addItemListener(any(), eq(true))).thenReturn("foo");
+ when(list.addItemListener(any(), eq(true))).thenReturn(UUID.randomUUID());
}
@Override
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
index b3848c8..3cdb165 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.hazelcast;
import java.util.ArrayList;
import java.util.Collection;
+import com.hazelcast.collection.IList;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IList;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.junit.After;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
index d579281..e71bb30 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
@@ -17,12 +17,13 @@
package org.apache.camel.component.hazelcast;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.hazelcast.core.EntryEvent;
import com.hazelcast.core.EntryEventType;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.hazelcast.listener.MapEntryListener;
import org.apache.camel.component.mock.MockEndpoint;
@@ -47,7 +48,7 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.getMap("foo")).thenReturn(map);
- when(map.addEntryListener(any(), eq(true))).thenReturn("foo");
+ when(map.addEntryListener(any(), eq(true))).thenReturn(UUID.randomUUID());
}
@Override
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
index 226c0b2..60ff742 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
@@ -25,8 +25,8 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
-import com.hazelcast.query.SqlPredicate;
+import com.hazelcast.map.IMap;
+import com.hazelcast.query.impl.predicates.SqlPredicate;
import org.apache.camel.component.hazelcast.testutil.Dummy;
import org.junit.After;
import org.junit.Test;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
index df2dbc0..b524893 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
@@ -26,8 +26,8 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
-import com.hazelcast.query.SqlPredicate;
+import com.hazelcast.map.IMap;
+import com.hazelcast.query.impl.predicates.SqlPredicate;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.hazelcast.testutil.Dummy;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
index 2836b48..bb4bc14 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
@@ -17,13 +17,14 @@
package org.apache.camel.component.hazelcast;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
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.multimap.MultiMap;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
@@ -47,7 +48,7 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport {
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.getMultiMap("mm")).thenReturn(map);
- when(map.addEntryListener(any(), eq(true))).thenReturn("foo");
+ when(map.addEntryListener(any(), eq(true))).thenReturn(UUID.randomUUID());
}
@Override
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
index 0303619..86936e6 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.Collection;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.MultiMap;
+import com.hazelcast.multimap.MultiMap;
import org.junit.After;
import org.junit.Test;
import org.mockito.Mock;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java
index 34fb396..f542564 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.Collection;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.MultiMap;
+import com.hazelcast.multimap.MultiMap;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.junit.After;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
index ffce91c..64bf5f3 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.hazelcast;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import com.hazelcast.collection.IQueue;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
index 1670b66..73439a2 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
@@ -17,13 +17,14 @@
package org.apache.camel.component.hazelcast;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import com.hazelcast.collection.IQueue;
+import com.hazelcast.collection.ItemEvent;
+import com.hazelcast.collection.ItemListener;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
-import com.hazelcast.core.ItemEvent;
import com.hazelcast.core.ItemEventType;
-import com.hazelcast.core.ItemListener;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
@@ -47,7 +48,7 @@ public class HazelcastQueueConsumerTest extends HazelcastCamelTestSupport {
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getQueue("foo")).thenReturn(queue);
- when(queue.addItemListener(any(), eq(true))).thenReturn("foo");
+ when(queue.addItemListener(any(), eq(true))).thenReturn(UUID.randomUUID());
}
@Override
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
index cc3047d..37f8d07 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
@@ -23,8 +23,8 @@ import java.util.HashSet;
import java.util.Map;
import java.util.function.Predicate;
+import com.hazelcast.collection.IQueue;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.junit.After;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
index c0a393f..b8eab03 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
@@ -17,12 +17,13 @@
package org.apache.camel.component.hazelcast;
import java.util.Map;
+import java.util.UUID;
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 com.hazelcast.topic.ITopic;
+import com.hazelcast.topic.Message;
+import com.hazelcast.topic.MessageListener;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
@@ -45,7 +46,7 @@ public class HazelcastReliableTopicConsumerTest extends HazelcastCamelTestSuppor
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getReliableTopic("foo")).thenReturn(reliableTopic);
- when(reliableTopic.addMessageListener(any())).thenReturn("foo");
+ when(reliableTopic.addMessageListener(any())).thenReturn(UUID.randomUUID());
}
@Override
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java
index fc4bb44..f4ff491 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.hazelcast;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ITopic;
+import com.hazelcast.topic.ITopic;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.junit.After;
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 513fd75..e859a24 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
@@ -17,13 +17,14 @@
package org.apache.camel.component.hazelcast;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.hazelcast.core.EntryEvent;
import com.hazelcast.core.EntryEventType;
import com.hazelcast.core.EntryListener;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ReplicatedMap;
+import com.hazelcast.replicatedmap.ReplicatedMap;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
@@ -47,7 +48,7 @@ public class HazelcastReplicatedmapConsumerTest extends HazelcastCamelTestSuppor
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.getReplicatedMap("rm")).thenReturn(map);
- when(map.addEntryListener(any(), eq(true))).thenReturn("foo");
+ when(map.addEntryListener(any(), eq(true))).thenReturn(UUID.randomUUID());
}
@Override
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 5dfd7d4..63160c8 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,7 @@ import java.util.Arrays;
import java.util.Collection;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ReplicatedMap;
+import com.hazelcast.replicatedmap.ReplicatedMap;
import org.junit.After;
import org.junit.Test;
import org.mockito.Mock;
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 4caaf09..73e1712 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,7 +20,7 @@ import java.util.Arrays;
import java.util.Collection;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ReplicatedMap;
+import com.hazelcast.replicatedmap.ReplicatedMap;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.junit.After;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java
index 4646f33..d87ed13 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.hazelcast;
import java.util.concurrent.TimeUnit;
-import com.hazelcast.core.IQueue;
-import com.hazelcast.core.TransactionalQueue;
+import com.hazelcast.collection.IQueue;
+import com.hazelcast.transaction.TransactionalQueue;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
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 c62daff..ef4e279 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
@@ -17,13 +17,14 @@
package org.apache.camel.component.hazelcast;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import com.hazelcast.collection.ISet;
+import com.hazelcast.collection.ItemEvent;
+import com.hazelcast.collection.ItemListener;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ISet;
-import com.hazelcast.core.ItemEvent;
import com.hazelcast.core.ItemEventType;
-import com.hazelcast.core.ItemListener;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
@@ -44,7 +45,7 @@ public class HazelcastSetConsumerTest extends HazelcastCamelTestSupport {
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getSet("foo")).thenReturn(set);
- when(set.addItemListener(any(), eq(true))).thenReturn("foo");
+ when(set.addItemListener(any(), eq(true))).thenReturn(UUID.randomUUID());
}
@Override
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 aa5f30c..6401d13 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
@@ -19,8 +19,8 @@ package org.apache.camel.component.hazelcast;
import java.util.ArrayList;
import java.util.Collection;
+import com.hazelcast.collection.ISet;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ISet;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.junit.After;
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 fe7be95..fa67350 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
@@ -17,12 +17,13 @@
package org.apache.camel.component.hazelcast;
import java.util.Map;
+import java.util.UUID;
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 com.hazelcast.topic.ITopic;
+import com.hazelcast.topic.Message;
+import com.hazelcast.topic.MessageListener;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
@@ -45,7 +46,7 @@ public class HazelcastTopicConsumerTest extends HazelcastCamelTestSupport {
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getTopic("foo")).thenReturn(topic);
- when(topic.addMessageListener(any())).thenReturn("foo");
+ when(topic.addMessageListener(any())).thenReturn(UUID.randomUUID());
}
@Override
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java
index 5bdd83d..e398f3b 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.hazelcast;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ITopic;
+import com.hazelcast.topic.ITopic;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.junit.After;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java
index 86a4426..688f602 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.processor.idempotent.hazelcast;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-hazelcast/src/test/resources/hazelcast-custom.xml b/components/camel-hazelcast/src/test/resources/hazelcast-custom.xml
index e04a5cf..740f230 100644
--- a/components/camel-hazelcast/src/test/resources/hazelcast-custom.xml
+++ b/components/camel-hazelcast/src/test/resources/hazelcast-custom.xml
@@ -17,14 +17,15 @@
limitations under the License.
-->
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
- xmlns="http://www.hazelcast.com/schema/config"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config
+ http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
- <group>
+ <!-- DEPRECATED SINCE: 4.0 group>
<name>dev</name>
<password>dev-pass</password>
- </group>
+ </group-->
<!-- Disable the version check -->
<properties>
diff --git a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
index 0c41bda..5311c63 100644
--- a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
+++ b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
@@ -17,15 +17,16 @@
limitations under the License.
-->
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
- xmlns="http://www.hazelcast.com/schema/config"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config
+ http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
- <group>
+ <!-- DEPRECATED SINCE: 4.0group>
<name>dev</name>
<password>dev-pass</password>
- </group>
-
+ </group-->
+
<!-- Disable the version check -->
<properties>
<property name="hazelcast.phone.home.enabled">false</property>
@@ -86,13 +87,20 @@
Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU
(Least Frequently Used). NONE is the default.
-->
- <eviction-policy>LRU</eviction-policy>
+ <eviction eviction-policy="LRU" max-size-policy="PER_NODE" size="20"/>
+ <!--
+ Maximum number of seconds for each entry to stay idle in the map. Entries that are
+ idle(not touched) for more than <max-idle-seconds> will get
+ automatically evicted from the map. Entry is touched if get, put or containsKey is called.
+ Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+ -->
+ <max-idle-seconds>0</max-idle-seconds>
<!--
Maximum size of the map. When max size is reached, map is evicted
based on the policy defined. Any integer between 0 and
Integer.MAX_VALUE. 0 means Integer.MAX_VALUE. Default is 0.
-->
- <max-size>5</max-size>
+ <!-- DEPRECATED SINCE: 4.0 <max-size>5</max-size-->
<!--
When max. size is reached, specified percentage of the map will be
evicted. Any integer between 0 and 100. If 25 is set for example, 25%
diff --git a/components/camel-hazelcast/src/test/resources/hazelcast-named.xml b/components/camel-hazelcast/src/test/resources/hazelcast-named.xml
index 56a8677..b2ce25f 100644
--- a/components/camel-hazelcast/src/test/resources/hazelcast-named.xml
+++ b/components/camel-hazelcast/src/test/resources/hazelcast-named.xml
@@ -17,16 +17,17 @@
limitations under the License.
-->
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
- xmlns="http://www.hazelcast.com/schema/config"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config
+ http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
<instance-name>camel-hz</instance-name>
- <group>
+ <!-- DEPRECATED SINCE: 4.0 group>
<name>dev</name>
<password>dev-pass</password>
- </group>
+ </group-->
<!-- Disable the version check -->
<properties>
@@ -35,7 +36,7 @@
</properties>
<network>
- <port auto-increment="true">9876</port>
+ <port auto-increment="true" port-count="100">9876</port>
<join>
<multicast enabled="false"/>
<tcp-ip enabled="false"/>
diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
index 312c41a..609e82b 100644
--- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
+++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
@@ -22,7 +22,7 @@ import javax.cache.Cache;
import javax.cache.CacheManager;
import javax.cache.Caching;
-import com.hazelcast.instance.HazelcastInstanceFactory;
+import com.hazelcast.instance.impl.HazelcastInstanceFactory;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.junit.After;
diff --git a/parent/pom.xml b/parent/pom.xml
index 4223182..f48a0b3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -277,7 +277,7 @@
<hapi-fhir-version>4.1.0</hapi-fhir-version>
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdispatch-version>1.22</hawtdispatch-version>
- <hazelcast-version>3.12.6</hazelcast-version>
+ <hazelcast-version>4.0</hazelcast-version>
<hbase-version>1.2.6</hbase-version>
<hdrhistrogram-version>2.1.11</hdrhistrogram-version>
<hibernate-validator-version>6.1.2.Final</hibernate-validator-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 9eb676b..88546b3 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1203,7 +1203,6 @@
<feature>transaction</feature>
<bundle dependency='true'>mvn:com.eclipsesource.minimal-json/minimal-json/${minimal-json-version}</bundle>
<bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle>
- <bundle dependency='true'>mvn:com.hazelcast/hazelcast-client/${hazelcast-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hazelcast/${project.version}</bundle>
</feature>
<feature name='camel-hdfs' version='${project.version}' start-level='50'>