Rename base primitive proxy class.

core/src/main/java/io/atomix/counter/impl/AtomicCounterProxy.java

@@ -15,7 +15,7 @@
  */
 package io.atomix.counter.impl;
 
-import io.atomix.primitive.impl.AbstractPrimitive;
+import io.atomix.primitive.impl.AbstractPrimitiveProxy;
 import io.atomix.primitive.proxy.PrimitiveProxy;
 import io.atomix.counter.AsyncAtomicCounter;
 import io.atomix.counter.impl.AtomicCounterOperations.AddAndGet;
@@ -39,7 +39,7 @@
 /**
  * Atomix counter implementation.
  */
-public class AtomicCounterProxy extends AbstractPrimitive implements AsyncAtomicCounter {
+public class AtomicCounterProxy extends AbstractPrimitiveProxy implements AsyncAtomicCounter {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.builder()
       .register(KryoNamespaces.BASIC)
       .register(AtomicCounterOperations.NAMESPACE)

core/src/main/java/io/atomix/election/impl/LeaderElectionProxy.java

@@ -16,7 +16,7 @@
 package io.atomix.election.impl;
 
 import com.google.common.collect.Sets;
-import io.atomix.primitive.impl.AbstractPrimitive;
+import io.atomix.primitive.impl.AbstractPrimitiveProxy;
 import io.atomix.primitive.proxy.PrimitiveProxy;
 import io.atomix.election.AsyncLeaderElection;
 import io.atomix.election.Leadership;
@@ -47,7 +47,7 @@
 /**
  * Distributed resource providing the {@link AsyncLeaderElection} primitive.
  */
-public class LeaderElectionProxy extends AbstractPrimitive implements AsyncLeaderElection<byte[]> {
+public class LeaderElectionProxy extends AbstractPrimitiveProxy implements AsyncLeaderElection<byte[]> {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.builder()
       .register(LeaderElectionOperations.NAMESPACE)
       .register(LeaderElectionEvents.NAMESPACE)

core/src/main/java/io/atomix/election/impl/LeaderElectorProxy.java

@@ -26,7 +26,7 @@
 import io.atomix.election.impl.LeaderElectorOperations.Promote;
 import io.atomix.election.impl.LeaderElectorOperations.Run;
 import io.atomix.election.impl.LeaderElectorOperations.Withdraw;
-import io.atomix.primitive.impl.AbstractPrimitive;
+import io.atomix.primitive.impl.AbstractPrimitiveProxy;
 import io.atomix.primitive.proxy.PrimitiveProxy;
 import io.atomix.utils.serializer.KryoNamespace;
 import io.atomix.utils.serializer.Serializer;
@@ -50,7 +50,7 @@
 /**
  * Distributed resource providing the {@link AsyncLeaderElector} primitive.
  */
-public class LeaderElectorProxy extends AbstractPrimitive implements AsyncLeaderElector<byte[]> {
+public class LeaderElectorProxy extends AbstractPrimitiveProxy implements AsyncLeaderElector<byte[]> {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.builder()
       .register(LeaderElectorOperations.NAMESPACE)
       .register(LeaderElectorEvents.NAMESPACE)

core/src/main/java/io/atomix/lock/impl/DistributedLockProxy.java

@@ -15,7 +15,7 @@
  */
 package io.atomix.lock.impl;
 
-import io.atomix.primitive.impl.AbstractPrimitive;
+import io.atomix.primitive.impl.AbstractPrimitiveProxy;
 import io.atomix.primitive.proxy.PrimitiveProxy;
 import io.atomix.lock.AsyncDistributedLock;
 import io.atomix.lock.impl.DistributedLockOperations.Lock;
@@ -38,7 +38,7 @@
 /**
  * Raft lock.
  */
-public class DistributedLockProxy extends AbstractPrimitive implements AsyncDistributedLock {
+public class DistributedLockProxy extends AbstractPrimitiveProxy implements AsyncDistributedLock {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.builder()
       .register(KryoNamespaces.BASIC)
       .register(DistributedLockOperations.NAMESPACE)

core/src/main/java/io/atomix/map/impl/AtomicCounterMapProxy.java

@@ -15,7 +15,7 @@
  */
 package io.atomix.map.impl;
 
-import io.atomix.primitive.impl.AbstractPrimitive;
+import io.atomix.primitive.impl.AbstractPrimitiveProxy;
 import io.atomix.primitive.proxy.PrimitiveProxy;
 import io.atomix.map.AsyncAtomicCounterMap;
 import io.atomix.map.impl.AtomicCounterMapOperations.AddAndGet;
@@ -55,7 +55,7 @@
 /**
  * {@code AsyncAtomicCounterMap} implementation backed by Atomix.
  */
-public class AtomicCounterMapProxy extends AbstractPrimitive implements AsyncAtomicCounterMap<String> {
+public class AtomicCounterMapProxy extends AbstractPrimitiveProxy implements AsyncAtomicCounterMap<String> {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.builder()
       .register(KryoNamespaces.BASIC)
       .register(AtomicCounterMapOperations.NAMESPACE)

core/src/main/java/io/atomix/map/impl/ConsistentMapProxy.java

@@ -36,7 +36,7 @@
 import io.atomix.map.impl.ConsistentMapOperations.TransactionPrepare;
 import io.atomix.map.impl.ConsistentMapOperations.TransactionPrepareAndCommit;
 import io.atomix.map.impl.ConsistentMapOperations.TransactionRollback;
-import io.atomix.primitive.impl.AbstractPrimitive;
+import io.atomix.primitive.impl.AbstractPrimitiveProxy;
 import io.atomix.primitive.proxy.PrimitiveProxy;
 import io.atomix.transaction.TransactionId;
 import io.atomix.transaction.TransactionLog;
@@ -92,7 +92,7 @@
 /**
  * Distributed resource providing the {@link AsyncConsistentMap} primitive.
  */
-public class ConsistentMapProxy extends AbstractPrimitive implements AsyncConsistentMap<String, byte[]> {
+public class ConsistentMapProxy extends AbstractPrimitiveProxy implements AsyncConsistentMap<String, byte[]> {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.builder()
       .register(KryoNamespaces.BASIC)
       .register(ConsistentMapOperations.NAMESPACE)

core/src/main/java/io/atomix/multimap/impl/ConsistentSetMultimapProxy.java

@@ -18,7 +18,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multiset;
-import io.atomix.primitive.impl.AbstractPrimitive;
+import io.atomix.primitive.impl.AbstractPrimitiveProxy;
 import io.atomix.primitive.proxy.PrimitiveProxy;
 import io.atomix.multimap.AsyncConsistentMultimap;
 import io.atomix.multimap.MultimapEvent;
@@ -69,7 +69,7 @@
  * Note: this implementation does not allow null entries or duplicate entries.
  */
 public class ConsistentSetMultimapProxy
-    extends AbstractPrimitive
+    extends AbstractPrimitiveProxy
     implements AsyncConsistentMultimap<String, byte[]> {
 
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.builder()

core/src/main/java/io/atomix/queue/impl/WorkQueueProxy.java

@@ -16,7 +16,7 @@
 package io.atomix.queue.impl;
 
 import com.google.common.collect.ImmutableList;
-import io.atomix.primitive.impl.AbstractPrimitive;
+import io.atomix.primitive.impl.AbstractPrimitiveProxy;
 import io.atomix.primitive.proxy.PrimitiveProxy;
 import io.atomix.queue.AsyncWorkQueue;
 import io.atomix.queue.Task;
@@ -58,7 +58,7 @@
 /**
  * Distributed resource providing the {@link WorkQueue} primitive.
  */
-public class WorkQueueProxy extends AbstractPrimitive implements AsyncWorkQueue<byte[]> {
+public class WorkQueueProxy extends AbstractPrimitiveProxy implements AsyncWorkQueue<byte[]> {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.builder()
       .register(KryoNamespaces.BASIC)
       .register(WorkQueueOperations.NAMESPACE)

core/src/main/java/io/atomix/tree/impl/DocumentTreeProxy.java

@@ -17,7 +17,7 @@
 package io.atomix.tree.impl;
 
 import com.google.common.util.concurrent.MoreExecutors;
-import io.atomix.primitive.impl.AbstractPrimitive;
+import io.atomix.primitive.impl.AbstractPrimitiveProxy;
 import io.atomix.primitive.proxy.PrimitiveProxy;
 import io.atomix.tree.AsyncDocumentTree;
 import io.atomix.tree.DocumentPath;
@@ -59,7 +59,7 @@
 /**
  * Distributed resource providing the {@link AsyncDocumentTree} primitive.
  */
-public class DocumentTreeProxy extends AbstractPrimitive implements AsyncDocumentTree<byte[]> {
+public class DocumentTreeProxy extends AbstractPrimitiveProxy implements AsyncDocumentTree<byte[]> {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.builder()
       .register(KryoNamespaces.BASIC)
       .register(DocumentTreeOperations.NAMESPACE)

core/src/main/java/io/atomix/value/impl/AtomicValueProxy.java

@@ -16,7 +16,7 @@
 package io.atomix.value.impl;
 
 import com.google.common.collect.Sets;
-import io.atomix.primitive.impl.AbstractPrimitive;
+import io.atomix.primitive.impl.AbstractPrimitiveProxy;
 import io.atomix.primitive.proxy.PrimitiveProxy;
 import io.atomix.value.AsyncAtomicValue;
 import io.atomix.value.AtomicValueEventListener;
@@ -39,7 +39,7 @@
 /**
  * Atomix counter implementation.
  */
-public class AtomicValueProxy extends AbstractPrimitive implements AsyncAtomicValue<byte[]> {
+public class AtomicValueProxy extends AbstractPrimitiveProxy implements AsyncAtomicValue<byte[]> {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.builder()
       .register(KryoNamespaces.BASIC)
       .register(AtomicValueOperations.NAMESPACE)

primitive/src/main/java/io/atomix/primitive/impl/AbstractPrimitive.java → primitive/src/main/java/io/atomix/primitive/impl/AbstractPrimitiveProxy.java

@@ -32,7 +32,7 @@
 /**
  * Abstract base class for primitives that interact with Raft replicated state machines via proxy.
  */
-public abstract class AbstractPrimitive implements AsyncPrimitive {
+public abstract class AbstractPrimitiveProxy implements AsyncPrimitive {
   private final Function<PrimitiveProxy.State, Status> mapper = state -> {
     switch (state) {
       case CONNECTED:
@@ -49,7 +49,7 @@ public abstract class AbstractPrimitive implements AsyncPrimitive {
   protected final PrimitiveProxy proxy;
   private final Set<Consumer<Status>> statusChangeListeners = Sets.newCopyOnWriteArraySet();
 
-  public AbstractPrimitive(PrimitiveProxy proxy) {
+  public AbstractPrimitiveProxy(PrimitiveProxy proxy) {
     this.proxy = checkNotNull(proxy, "proxy cannot be null");
     proxy.addStateChangeListener(this::onStateChange);
   }