Fixed compilation issues except for Enterprise module

mdyunok · Jun 16, 2019 · 1fc9e10 · 1fc9e10
1 parent 7e57c41
commit 1fc9e10
Show file tree

Hide file tree

Showing 76 changed files with 140 additions and 132 deletions.
diff --git a/clients/client-labels/src/main/java/DeclarativeLabelsExample.java b/clients/client-labels/src/main/java/DeclarativeLabelsExample.java
@@ -15,9 +15,10 @@
  */
 
 import com.hazelcast.client.HazelcastClient;
+import com.hazelcast.client.api.Client;
+import com.hazelcast.client.api.ClientListener;
 import com.hazelcast.config.Config;
 import com.hazelcast.config.JoinConfig;
-import com.hazelcast.core.ClientListener;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 
@@ -31,14 +32,14 @@ public static void main(String[] args) {
         final HazelcastInstance instance = Hazelcast.newHazelcastInstance(config);
         instance.getClientService().addClientListener(new ClientListener() {
             @Override
-            public void clientConnected(com.hazelcast.core.Client client) {
+            public void clientConnected(Client client) {
                 System.out.println("Client : " + client.getName() + " is connected to member: " + instance.getName());
                 System.out.println("Client : " + client.getName() + " is connected with labels " + client.getLabels());
 
             }
 
             @Override
-            public void clientDisconnected(com.hazelcast.core.Client client) {
+            public void clientDisconnected(Client client) {
 
             }
         });

diff --git a/clients/client-labels/src/main/java/ProgrammaticLabelsExample.java b/clients/client-labels/src/main/java/ProgrammaticLabelsExample.java
@@ -1,8 +1,9 @@
 import com.hazelcast.client.HazelcastClient;
+import com.hazelcast.client.api.Client;
+import com.hazelcast.client.api.ClientListener;
 import com.hazelcast.client.config.ClientConfig;
 import com.hazelcast.config.Config;
 import com.hazelcast.config.JoinConfig;
-import com.hazelcast.core.ClientListener;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 
@@ -15,14 +16,14 @@ public static void main(String[] args) {
         final HazelcastInstance instance = Hazelcast.newHazelcastInstance(config);
         instance.getClientService().addClientListener(new ClientListener() {
             @Override
-            public void clientConnected(com.hazelcast.core.Client client) {
+            public void clientConnected(Client client) {
                 System.out.println("Client : " + client.getName() + " is connected to member: " + instance.getName());
                 System.out.println("Client : " + client.getName() + " is connected with labels " + client.getLabels());
 
             }
 
             @Override
-            public void clientDisconnected(com.hazelcast.core.Client client) {
+            public void clientDisconnected(Client client) {
 
             }
         });

diff --git a/cluster-quorum-xml/src/main/java/ClusterQuorum.java b/cluster-quorum-xml/src/main/java/ClusterQuorum.java
@@ -1,7 +1,7 @@
+import com.hazelcast.collection.IQueue;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ILock;
-import com.hazelcast.core.IQueue;
+import com.hazelcast.cp.lock.ILock;
 import com.hazelcast.quorum.QuorumException;
 
 /**

diff --git a/cluster-quorum/src/main/java/CustomQuorumFunction.java b/cluster-quorum/src/main/java/CustomQuorumFunction.java
@@ -1,7 +1,7 @@
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MemberAttributeEvent;
-import com.hazelcast.core.MembershipEvent;
-import com.hazelcast.core.MembershipListener;
+import com.hazelcast.cluster.Member;
+import com.hazelcast.cluster.MemberAttributeEvent;
+import com.hazelcast.cluster.MembershipEvent;
+import com.hazelcast.cluster.MembershipListener;
 import com.hazelcast.quorum.HeartbeatAware;
 import com.hazelcast.quorum.QuorumFunction;
 import com.hazelcast.util.Clock;

diff --git a/cluster-quorum/src/test/java/CustomQuorumFunctionTest.java b/cluster-quorum/src/test/java/CustomQuorumFunctionTest.java
@@ -1,5 +1,5 @@
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MembershipEvent;
+import com.hazelcast.cluster.Member;
+import com.hazelcast.cluster.MembershipEvent;
 import com.hazelcast.util.Clock;
 import org.junit.Test;
 

diff --git a/cluster/src/main/java/PromoteLiteMember.java b/cluster/src/main/java/PromoteLiteMember.java
@@ -1,5 +1,5 @@
+import com.hazelcast.cluster.Cluster;
 import com.hazelcast.config.Config;
-import com.hazelcast.core.Cluster;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 

diff --git a/...bsystem/cp-atomiclong/src/main/java/com/hazelcast/codesamples/cp/atomiclong/CPMember.java b/...bsystem/cp-atomiclong/src/main/java/com/hazelcast/codesamples/cp/atomiclong/CPMember.java
@@ -3,7 +3,7 @@
 import com.hazelcast.config.Config;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicLong;
+import com.hazelcast.cp.IAtomicLong;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 

diff --git a/...-atomicreference/src/main/java/com/hazelcast/codesamples/cp/atomicreference/CPMember.java b/...-atomicreference/src/main/java/com/hazelcast/codesamples/cp/atomicreference/CPMember.java
@@ -3,7 +3,7 @@
 import com.hazelcast.config.Config;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicReference;
+import com.hazelcast.cp.IAtomicReference;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 

diff --git a/...cp-countdownlatch/src/main/java/com/hazelcast/codesamples/cp/countdownlatch/CPMember.java b/...cp-countdownlatch/src/main/java/com/hazelcast/codesamples/cp/countdownlatch/CPMember.java
@@ -3,7 +3,7 @@
 import com.hazelcast.config.Config;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ICountDownLatch;
+import com.hazelcast.cp.ICountDownLatch;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 

diff --git a/cp-subsystem/cp-semaphore/src/main/java/com/hazelcast/codesamples/cp/semaphore/CPMember.java b/cp-subsystem/cp-semaphore/src/main/java/com/hazelcast/codesamples/cp/semaphore/CPMember.java
@@ -3,7 +3,7 @@
 import com.hazelcast.config.Config;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ISemaphore;
+import com.hazelcast.cp.ISemaphore;
 
 import java.util.Date;
 import java.util.Random;

diff --git a/...ens/src/main/java/com/hazelcast/codesamples/cp/fencedlock/FencingOffStaleLockHolders.java b/...ens/src/main/java/com/hazelcast/codesamples/cp/fencedlock/FencingOffStaleLockHolders.java
@@ -4,8 +4,8 @@
 import com.hazelcast.config.cp.CPSubsystemConfig;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicReference;
 import com.hazelcast.core.IFunction;
+import com.hazelcast.cp.IAtomicReference;
 import com.hazelcast.cp.lock.FencedLock;
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;

diff --git a/...s-manually/src/main/java/com/hazelcast/codesamples/cp/RemoveCrashedCPMembersManually.java b/...s-manually/src/main/java/com/hazelcast/codesamples/cp/RemoveCrashedCPMembersManually.java
@@ -3,9 +3,9 @@
 import com.hazelcast.config.Config;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicLong;
 import com.hazelcast.cp.CPGroup;
 import com.hazelcast.cp.CPSubsystemManagementService;
+import com.hazelcast.cp.IAtomicLong;
 
 import java.util.Arrays;
 import java.util.concurrent.ExecutionException;

diff --git a/demo/src/main/java/com/hazelcast/demo/AllTest.java b/demo/src/main/java/com/hazelcast/demo/AllTest.java
@@ -16,19 +16,19 @@
 
 package com.hazelcast.demo;
 
+import com.hazelcast.collection.IQueue;
 import com.hazelcast.config.Config;
 import com.hazelcast.core.EntryAdapter;
 import com.hazelcast.core.EntryEvent;
 import com.hazelcast.core.EntryListener;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IMap;
-import com.hazelcast.core.IQueue;
-import com.hazelcast.core.ITopic;
-import com.hazelcast.core.Message;
-import com.hazelcast.core.MessageListener;
 import com.hazelcast.internal.diagnostics.HealthMonitorLevel;
 import com.hazelcast.query.SqlPredicate;
+import com.hazelcast.topic.ITopic;
+import com.hazelcast.topic.Message;
+import com.hazelcast.topic.MessageListener;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/demo/src/main/java/com/hazelcast/demo/SimpleMapTest.java b/demo/src/main/java/com/hazelcast/demo/SimpleMapTest.java
@@ -16,13 +16,13 @@
 
 package com.hazelcast.demo;
 
+import com.hazelcast.cluster.Member;
 import com.hazelcast.config.Config;
 import com.hazelcast.config.XmlConfigBuilder;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.HazelcastInstanceNotActiveException;
 import com.hazelcast.core.IMap;
-import com.hazelcast.core.Member;
 import com.hazelcast.partition.Partition;
 import com.hazelcast.logging.ILogger;
 

diff --git a/demo/src/main/java/com/hazelcast/demo/SimpleMultiMapTest.java b/demo/src/main/java/com/hazelcast/demo/SimpleMultiMapTest.java
@@ -16,10 +16,10 @@
 
 package com.hazelcast.demo;
 
+import com.hazelcast.cluster.Member;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MultiMap;
+import com.hazelcast.multimap.MultiMap;
 import com.hazelcast.partition.Partition;
 
 import java.util.Random;

diff --git a/distributed-collections/blockingqueue/src/main/java/ConsumerMember.java b/distributed-collections/blockingqueue/src/main/java/ConsumerMember.java
@@ -1,6 +1,6 @@
+import com.hazelcast.collection.IQueue;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
 
 public class ConsumerMember {
 

diff --git a/distributed-collections/blockingqueue/src/main/java/ProducerMember.java b/distributed-collections/blockingqueue/src/main/java/ProducerMember.java
@@ -1,6 +1,6 @@
+import com.hazelcast.collection.IQueue;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
 
 public class ProducerMember {
 

diff --git a/distributed-collections/boundedblockingqueue/src/main/java/ConsumerMember.java b/distributed-collections/boundedblockingqueue/src/main/java/ConsumerMember.java
@@ -1,6 +1,6 @@
+import com.hazelcast.collection.IQueue;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
 
 public class ConsumerMember {
 

diff --git a/distributed-collections/boundedblockingqueue/src/main/java/ProducerMember.java b/distributed-collections/boundedblockingqueue/src/main/java/ProducerMember.java
@@ -1,6 +1,6 @@
+import com.hazelcast.collection.IQueue;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
 
 public class ProducerMember {
 

diff --git a/distributed-collections/itemlisteners/src/main/java/CollectionChangeMember.java b/distributed-collections/itemlisteners/src/main/java/CollectionChangeMember.java
@@ -1,6 +1,6 @@
+import com.hazelcast.collection.IQueue;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
 
 public class CollectionChangeMember {
 

diff --git a/distributed-collections/itemlisteners/src/main/java/ItemListenerMember.java b/distributed-collections/itemlisteners/src/main/java/ItemListenerMember.java
@@ -1,8 +1,8 @@
+import com.hazelcast.collection.ICollection;
+import com.hazelcast.collection.ItemEvent;
+import com.hazelcast.collection.ItemListener;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ICollection;
-import com.hazelcast.core.ItemEvent;
-import com.hazelcast.core.ItemListener;
 
 public class ItemListenerMember {
 

diff --git a/distributed-collections/list/src/main/java/ReadMember.java b/distributed-collections/list/src/main/java/ReadMember.java
@@ -1,6 +1,6 @@
+import com.hazelcast.collection.IList;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IList;
 
 public class ReadMember {
 

diff --git a/distributed-collections/list/src/main/java/WriteMember.java b/distributed-collections/list/src/main/java/WriteMember.java
@@ -1,6 +1,6 @@
+import com.hazelcast.collection.IList;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IList;
 
 public class WriteMember {
 

diff --git a/distributed-collections/queuestore/src/main/java/StoreMember.java b/distributed-collections/queuestore/src/main/java/StoreMember.java
@@ -1,9 +1,9 @@
+import com.hazelcast.collection.IQueue;
 import com.hazelcast.config.Config;
 import com.hazelcast.config.QueueConfig;
 import com.hazelcast.config.QueueStoreConfig;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IQueue;
 
 public class StoreMember {
 

diff --git a/distributed-collections/queuestore/src/main/java/TheQueueStore.java b/distributed-collections/queuestore/src/main/java/TheQueueStore.java
@@ -1,4 +1,5 @@
-import com.hazelcast.core.QueueStore;
+
+import com.hazelcast.collection.QueueStore;
 
 import java.util.Collection;
 import java.util.Map;

diff --git a/distributed-collections/set/src/main/java/ReadMember.java b/distributed-collections/set/src/main/java/ReadMember.java
@@ -1,6 +1,6 @@
+import com.hazelcast.collection.ISet;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ISet;
 
 public class ReadMember {
 

diff --git a/distributed-collections/set/src/main/java/WriteMember.java b/distributed-collections/set/src/main/java/WriteMember.java
@@ -1,6 +1,6 @@
+import com.hazelcast.collection.ISet;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ISet;
 
 public class WriteMember {
 

diff --git a/distributed-executor/executing-on-all-members/src/main/java/MasterMember.java b/distributed-executor/executing-on-all-members/src/main/java/MasterMember.java
@@ -1,7 +1,7 @@
+import com.hazelcast.cluster.Member;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IExecutorService;
-import com.hazelcast.core.Member;
 
 import java.util.Map;
 import java.util.UUID;

diff --git a/distributed-executor/executing-on-specific-member/src/main/java/MasterMember.java b/distributed-executor/executing-on-specific-member/src/main/java/MasterMember.java
@@ -1,7 +1,7 @@
+import com.hazelcast.cluster.Member;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IExecutorService;
-import com.hazelcast.core.Member;
 
 public class MasterMember {
 

diff --git a/distributed-executor/scheduled-executor-retrieve-all-tasks/src/main/java/MasterMember.java b/distributed-executor/scheduled-executor-retrieve-all-tasks/src/main/java/MasterMember.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import com.hazelcast.cluster.Member;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.Member;
 import com.hazelcast.scheduledexecutor.IScheduledExecutorService;
 import com.hazelcast.scheduledexecutor.IScheduledFuture;
 

diff --git a/distributed-map/multi-map/src/main/java/PrintMember.java b/distributed-map/multi-map/src/main/java/PrintMember.java
@@ -1,6 +1,6 @@
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.MultiMap;
+import com.hazelcast.multimap.MultiMap;
 
 import java.util.Collection;
 

diff --git a/distributed-map/multi-map/src/main/java/PutMember.java b/distributed-map/multi-map/src/main/java/PutMember.java
@@ -1,6 +1,6 @@
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.MultiMap;
+import com.hazelcast.multimap.MultiMap;
 
 public class PutMember {
 

diff --git a/distributed-primitives/atomiclong-functions/src/main/java/Member.java b/distributed-primitives/atomiclong-functions/src/main/java/Member.java
@@ -1,7 +1,7 @@
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicLong;
 import com.hazelcast.core.IFunction;
+import com.hazelcast.cp.IAtomicLong;
 
 public class Member {
 

diff --git a/distributed-primitives/atomiclong/src/main/java/Member.java b/distributed-primitives/atomiclong/src/main/java/Member.java
@@ -1,6 +1,6 @@
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicLong;
+import com.hazelcast.cp.IAtomicLong;
 
 import static java.lang.String.format;
 

diff --git a/distributed-primitives/atomicreference/src/main/java/Member.java b/distributed-primitives/atomicreference/src/main/java/Member.java
@@ -1,6 +1,6 @@
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicReference;
+import com.hazelcast.cp.IAtomicReference;
 
 /**
  * @deprecated {@code HazelcastInstance.getAtomicReference()} may lose strong consistency

diff --git a/distributed-primitives/condition/src/main/java/NotifyMember.java b/distributed-primitives/condition/src/main/java/NotifyMember.java
@@ -1,8 +1,8 @@
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicLong;
-import com.hazelcast.core.ICondition;
-import com.hazelcast.core.ILock;
+import com.hazelcast.cp.IAtomicLong;
+import com.hazelcast.cp.lock.ICondition;
+import com.hazelcast.cp.lock.ILock;
 
 public class NotifyMember {
 

diff --git a/distributed-primitives/condition/src/main/java/WaitingMember.java b/distributed-primitives/condition/src/main/java/WaitingMember.java
@@ -1,8 +1,8 @@
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IAtomicLong;
-import com.hazelcast.core.ICondition;
-import com.hazelcast.core.ILock;
+import com.hazelcast.cp.IAtomicLong;
+import com.hazelcast.cp.lock.ICondition;
+import com.hazelcast.cp.lock.ILock;
 
 public class WaitingMember {