Rename RaftCounter* classes to RaftAtomicCounter* for consistency wit…

…h interface names.
atomix · Nov 8, 2017 · 0225d96 · 0225d96
1 parent 57fbc1f
commit 0225d96
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 51 deletions.
diff --git a/.../primitives/counter/impl/RaftCounter.java → ...tives/counter/impl/RaftAtomicCounter.java b/.../primitives/counter/impl/RaftCounter.java → ...tives/counter/impl/RaftAtomicCounter.java
@@ -16,10 +16,10 @@
 package io.atomix.primitives.counter.impl;
 
 import io.atomix.primitives.counter.AsyncAtomicCounter;
-import io.atomix.primitives.counter.impl.RaftCounterOperations.AddAndGet;
+import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.AddAndGet;
-import io.atomix.primitives.counter.impl.RaftCounterOperations.CompareAndSet;
+import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.CompareAndSet;
-import io.atomix.primitives.counter.impl.RaftCounterOperations.GetAndAdd;
+import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GetAndAdd;
-import io.atomix.primitives.counter.impl.RaftCounterOperations.Set;
+import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.Set;
 import io.atomix.primitives.impl.AbstractRaftPrimitive;
 import io.atomix.protocols.raft.proxy.RaftProxy;
 import io.atomix.serializer.Serializer;
@@ -28,24 +28,24 @@
 
 import java.util.concurrent.CompletableFuture;
 
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.ADD_AND_GET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.ADD_AND_GET;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.COMPARE_AND_SET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.COMPARE_AND_SET;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET_AND_ADD;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET_AND_ADD;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET_AND_INCREMENT;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET_AND_INCREMENT;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.INCREMENT_AND_GET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.INCREMENT_AND_GET;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.SET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.SET;
 
 /**
  * Atomix counter implementation.
  */
-public class RaftCounter extends AbstractRaftPrimitive implements AsyncAtomicCounter {
+public class RaftAtomicCounter extends AbstractRaftPrimitive implements AsyncAtomicCounter {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.newBuilder()
       .register(KryoNamespaces.BASIC)
-      .register(RaftCounterOperations.NAMESPACE)
+      .register(RaftAtomicCounterOperations.NAMESPACE)
       .build());
 
-  public RaftCounter(RaftProxy proxy) {
+  public RaftAtomicCounter(RaftProxy proxy) {
     super(proxy);
   }
 

diff --git a/...s/counter/impl/RaftCounterOperations.java → ...ter/impl/RaftAtomicCounterOperations.java b/...s/counter/impl/RaftCounterOperations.java → ...ter/impl/RaftAtomicCounterOperations.java
@@ -23,7 +23,7 @@
 /**
  * Counter commands.
  */
-public enum RaftCounterOperations implements OperationId {
+public enum RaftAtomicCounterOperations implements OperationId {
   SET("set", OperationType.COMMAND),
   COMPARE_AND_SET("compareAndSet", OperationType.COMMAND),
   INCREMENT_AND_GET("incrementAndGet", OperationType.COMMAND),
@@ -35,7 +35,7 @@ public enum RaftCounterOperations implements OperationId {
   private final String id;
   private final OperationType type;
 
-  RaftCounterOperations(String id, OperationType type) {
+  RaftAtomicCounterOperations(String id, OperationType type) {
     this.id = id;
     this.type = type;
   }
@@ -58,7 +58,7 @@ public OperationType type() {
       .register(CompareAndSet.class)
       .register(AddAndGet.class)
       .register(GetAndAdd.class)
-      .build(RaftCounterOperations.class.getSimpleName());
+      .build(RaftAtomicCounterOperations.class.getSimpleName());
 
   /**
    * Abstract value command.

diff --git a/...ives/counter/impl/RaftCounterService.java → ...ounter/impl/RaftAtomicCounterService.java b/...ives/counter/impl/RaftCounterService.java → ...ounter/impl/RaftAtomicCounterService.java
@@ -15,10 +15,10 @@
  */
 package io.atomix.primitives.counter.impl;
 
-import io.atomix.primitives.counter.impl.RaftCounterOperations.AddAndGet;
+import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.AddAndGet;
-import io.atomix.primitives.counter.impl.RaftCounterOperations.CompareAndSet;
+import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.CompareAndSet;
-import io.atomix.primitives.counter.impl.RaftCounterOperations.GetAndAdd;
+import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GetAndAdd;
-import io.atomix.primitives.counter.impl.RaftCounterOperations.Set;
+import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.Set;
 import io.atomix.protocols.raft.service.AbstractRaftService;
 import io.atomix.protocols.raft.service.Commit;
 import io.atomix.protocols.raft.service.RaftServiceExecutor;
@@ -30,21 +30,21 @@
 
 import java.util.Objects;
 
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.ADD_AND_GET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.ADD_AND_GET;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.COMPARE_AND_SET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.COMPARE_AND_SET;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET_AND_ADD;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET_AND_ADD;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET_AND_INCREMENT;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET_AND_INCREMENT;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.INCREMENT_AND_GET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.INCREMENT_AND_GET;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.SET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.SET;
 
 /**
  * Atomix long state.
  */
-public class RaftCounterService extends AbstractRaftService {
+public class RaftAtomicCounterService extends AbstractRaftService {
   private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.newBuilder()
       .register(KryoNamespaces.BASIC)
-      .register(RaftCounterOperations.NAMESPACE)
+      .register(RaftAtomicCounterOperations.NAMESPACE)
       .build());
 
   private Long value = 0L;

diff --git a/.../counter/impl/RaftCounterServiceTest.java → ...er/impl/RaftAtomicCounterServiceTest.java b/.../counter/impl/RaftCounterServiceTest.java → ...er/impl/RaftAtomicCounterServiceTest.java
@@ -27,15 +27,15 @@
 import io.atomix.time.WallClockTimestamp;
 import org.junit.Test;
 
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET;
-import static io.atomix.primitives.counter.impl.RaftCounterOperations.SET;
+import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.SET;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
 /**
  * Counter service test.
  */
-public class RaftCounterServiceTest {
+public class RaftAtomicCounterServiceTest {
   @Test
   public void testSnapshot() throws Exception {
     SnapshotStore store = new SnapshotStore(RaftStorage.newBuilder()
@@ -44,11 +44,11 @@ public void testSnapshot() throws Exception {
         .build());
     Snapshot snapshot = store.newSnapshot(ServiceId.from(1), "test", 2, new WallClockTimestamp());
 
-    RaftCounterService service = new RaftCounterService();
+    RaftAtomicCounterService service = new RaftAtomicCounterService();
     service.set(new DefaultCommit<>(
         2,
         SET,
-        new RaftCounterOperations.Set(1L),
+        new RaftAtomicCounterOperations.Set(1L),
         mock(RaftSessionContext.class),
         System.currentTimeMillis()));
 
@@ -58,7 +58,7 @@ public void testSnapshot() throws Exception {
 
     snapshot.complete();
 
-    service = new RaftCounterService();
+    service = new RaftAtomicCounterService();
     try (SnapshotReader reader = snapshot.openReader()) {
       service.install(reader);
     }

diff --git a/...mitives/counter/impl/RaftCounterTest.java → ...s/counter/impl/RaftAtomicCounterTest.java b/...mitives/counter/impl/RaftCounterTest.java → ...s/counter/impl/RaftAtomicCounterTest.java
@@ -25,17 +25,17 @@
 import static org.junit.Assert.assertTrue;
 
 /**
- * Unit tests for {@link RaftCounter}.
+ * Unit tests for {@link RaftAtomicCounter}.
  */
-public class RaftCounterTest extends AbstractRaftPrimitiveTest<RaftCounter> {
+public class RaftAtomicCounterTest extends AbstractRaftPrimitiveTest<RaftAtomicCounter> {
   @Override
   protected RaftService createService() {
-    return new RaftCounterService();
+    return new RaftAtomicCounterService();
   }
 
   @Override
-  protected RaftCounter createPrimitive(RaftProxy proxy) {
+  protected RaftAtomicCounter createPrimitive(RaftProxy proxy) {
-    return new RaftCounter(proxy);
+    return new RaftAtomicCounter(proxy);
   }
 
   @Test
@@ -44,7 +44,7 @@ public void testBasicOperations() throws Throwable {
   }
 
   protected void basicOperationsTest() throws Throwable {
-    RaftCounter along = newPrimitive("test-counter-basic-operations");
+    RaftAtomicCounter along = newPrimitive("test-counter-basic-operations");
     assertEquals(0, along.get().join().longValue());
     assertEquals(1, along.incrementAndGet().join().longValue());
     along.set(100).join();

diff --git a/primitives/src/test/java/io/atomix/primitives/generator/impl/RaftIdGeneratorTest.java b/primitives/src/test/java/io/atomix/primitives/generator/impl/RaftIdGeneratorTest.java
@@ -15,8 +15,8 @@
  */
 package io.atomix.primitives.generator.impl;
 
-import io.atomix.primitives.counter.impl.RaftCounter;
+import io.atomix.primitives.counter.impl.RaftAtomicCounter;
-import io.atomix.primitives.counter.impl.RaftCounterService;
+import io.atomix.primitives.counter.impl.RaftAtomicCounterService;
 import io.atomix.primitives.impl.AbstractRaftPrimitiveTest;
 import io.atomix.protocols.raft.proxy.RaftProxy;
 import io.atomix.protocols.raft.service.RaftService;
@@ -29,16 +29,16 @@
 /**
  * Unit test for {@code AtomixIdGenerator}.
  */
-public class RaftIdGeneratorTest extends AbstractRaftPrimitiveTest<RaftCounter> {
+public class RaftIdGeneratorTest extends AbstractRaftPrimitiveTest<RaftAtomicCounter> {
 
   @Override
   protected RaftService createService() {
-    return new RaftCounterService();
+    return new RaftAtomicCounterService();
   }
 
   @Override
-  protected RaftCounter createPrimitive(RaftProxy proxy) {
+  protected RaftAtomicCounter createPrimitive(RaftProxy proxy) {
-    return new RaftCounter(proxy);
+    return new RaftAtomicCounter(proxy);
   }
 
   /**

diff --git a/primitives/src/test/java/io/atomix/primitives/impl/RaftTestNamespaces.java b/primitives/src/test/java/io/atomix/primitives/impl/RaftTestNamespaces.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.primitives.impl;
 
-import io.atomix.primitives.counter.impl.RaftCounterOperations;
+import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations;
 import io.atomix.primitives.leadership.impl.RaftLeaderElectorEvents;
 import io.atomix.primitives.leadership.impl.RaftLeaderElectorOperations;
 import io.atomix.primitives.lock.impl.RaftDistributedLockEvents;
@@ -173,7 +173,7 @@ public final class RaftTestNamespaces {
       .register(RaftConsistentSetMultimapOperations.class)
       .register(RaftConsistentSetMultimapEvents.class)
       .register(RaftConsistentTreeMapOperations.class)
-      .register(RaftCounterOperations.class)
+      .register(RaftAtomicCounterOperations.class)
       .register(RaftDocumentTreeEvents.class)
       .register(RaftDocumentTreeOperations.class)
       .register(RaftLeaderElectorEvents.class)
@@ -213,7 +213,7 @@ public final class RaftTestNamespaces {
       .register(RaftConsistentMapOperations.class)
       .register(RaftConsistentSetMultimapOperations.class)
       .register(RaftConsistentTreeMapOperations.class)
-      .register(RaftCounterOperations.class)
+      .register(RaftAtomicCounterOperations.class)
       .register(RaftDocumentTreeOperations.class)
       .register(RaftLeaderElectorOperations.class)
       .register(RaftWorkQueueOperations.class)