From 0225d966095aef20d23d526b86a8697861574ed1 Mon Sep 17 00:00:00 2001 From: Jordan Halterman Date: Tue, 7 Nov 2017 21:11:48 -0800 Subject: [PATCH] Rename RaftCounter* classes to RaftAtomicCounter* for consistency with interface names. --- ...aftCounter.java => RaftAtomicCounter.java} | 28 +++++++++---------- ....java => RaftAtomicCounterOperations.java} | 6 ++-- ...ice.java => RaftAtomicCounterService.java} | 26 ++++++++--------- ...java => RaftAtomicCounterServiceTest.java} | 12 ++++---- ...erTest.java => RaftAtomicCounterTest.java} | 12 ++++---- .../generator/impl/RaftIdGeneratorTest.java | 12 ++++---- .../primitives/impl/RaftTestNamespaces.java | 6 ++-- 7 files changed, 51 insertions(+), 51 deletions(-) rename primitives/src/main/java/io/atomix/primitives/counter/impl/{RaftCounter.java => RaftAtomicCounter.java} (68%) rename primitives/src/main/java/io/atomix/primitives/counter/impl/{RaftCounterOperations.java => RaftAtomicCounterOperations.java} (95%) rename primitives/src/main/java/io/atomix/primitives/counter/impl/{RaftCounterService.java => RaftAtomicCounterService.java} (78%) rename primitives/src/test/java/io/atomix/primitives/counter/impl/{RaftCounterServiceTest.java => RaftAtomicCounterServiceTest.java} (85%) rename primitives/src/test/java/io/atomix/primitives/counter/impl/{RaftCounterTest.java => RaftAtomicCounterTest.java} (83%) diff --git a/primitives/src/main/java/io/atomix/primitives/counter/impl/RaftCounter.java b/primitives/src/main/java/io/atomix/primitives/counter/impl/RaftAtomicCounter.java similarity index 68% rename from primitives/src/main/java/io/atomix/primitives/counter/impl/RaftCounter.java rename to primitives/src/main/java/io/atomix/primitives/counter/impl/RaftAtomicCounter.java index 2209cb0ad8..e8f208167c 100644 --- a/primitives/src/main/java/io/atomix/primitives/counter/impl/RaftCounter.java +++ b/primitives/src/main/java/io/atomix/primitives/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.RaftCounterOperations.CompareAndSet; -import io.atomix.primitives.counter.impl.RaftCounterOperations.GetAndAdd; -import io.atomix.primitives.counter.impl.RaftCounterOperations.Set; +import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.AddAndGet; +import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.CompareAndSet; +import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GetAndAdd; +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.RaftCounterOperations.COMPARE_AND_SET; -import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET; -import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET_AND_ADD; -import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET_AND_INCREMENT; -import static io.atomix.primitives.counter.impl.RaftCounterOperations.INCREMENT_AND_GET; -import static io.atomix.primitives.counter.impl.RaftCounterOperations.SET; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.ADD_AND_GET; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.COMPARE_AND_SET; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET_AND_ADD; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET_AND_INCREMENT; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.INCREMENT_AND_GET; +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/primitives/src/main/java/io/atomix/primitives/counter/impl/RaftCounterOperations.java b/primitives/src/main/java/io/atomix/primitives/counter/impl/RaftAtomicCounterOperations.java similarity index 95% rename from primitives/src/main/java/io/atomix/primitives/counter/impl/RaftCounterOperations.java rename to primitives/src/main/java/io/atomix/primitives/counter/impl/RaftAtomicCounterOperations.java index e80ad63505..d8e41770fe 100644 --- a/primitives/src/main/java/io/atomix/primitives/counter/impl/RaftCounterOperations.java +++ b/primitives/src/main/java/io/atomix/primitives/counter/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/primitives/src/main/java/io/atomix/primitives/counter/impl/RaftCounterService.java b/primitives/src/main/java/io/atomix/primitives/counter/impl/RaftAtomicCounterService.java similarity index 78% rename from primitives/src/main/java/io/atomix/primitives/counter/impl/RaftCounterService.java rename to primitives/src/main/java/io/atomix/primitives/counter/impl/RaftAtomicCounterService.java index 3e2fc1e4ff..1365d5605b 100644 --- a/primitives/src/main/java/io/atomix/primitives/counter/impl/RaftCounterService.java +++ b/primitives/src/main/java/io/atomix/primitives/counter/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.RaftCounterOperations.CompareAndSet; -import io.atomix.primitives.counter.impl.RaftCounterOperations.GetAndAdd; -import io.atomix.primitives.counter.impl.RaftCounterOperations.Set; +import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.AddAndGet; +import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.CompareAndSet; +import io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GetAndAdd; +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.RaftCounterOperations.COMPARE_AND_SET; -import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET; -import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET_AND_ADD; -import static io.atomix.primitives.counter.impl.RaftCounterOperations.GET_AND_INCREMENT; -import static io.atomix.primitives.counter.impl.RaftCounterOperations.INCREMENT_AND_GET; -import static io.atomix.primitives.counter.impl.RaftCounterOperations.SET; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.ADD_AND_GET; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.COMPARE_AND_SET; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET_AND_ADD; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET_AND_INCREMENT; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.INCREMENT_AND_GET; +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/primitives/src/test/java/io/atomix/primitives/counter/impl/RaftCounterServiceTest.java b/primitives/src/test/java/io/atomix/primitives/counter/impl/RaftAtomicCounterServiceTest.java similarity index 85% rename from primitives/src/test/java/io/atomix/primitives/counter/impl/RaftCounterServiceTest.java rename to primitives/src/test/java/io/atomix/primitives/counter/impl/RaftAtomicCounterServiceTest.java index 5d42215dc7..909b78f906 100644 --- a/primitives/src/test/java/io/atomix/primitives/counter/impl/RaftCounterServiceTest.java +++ b/primitives/src/test/java/io/atomix/primitives/counter/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.RaftCounterOperations.SET; +import static io.atomix.primitives.counter.impl.RaftAtomicCounterOperations.GET; +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/primitives/src/test/java/io/atomix/primitives/counter/impl/RaftCounterTest.java b/primitives/src/test/java/io/atomix/primitives/counter/impl/RaftAtomicCounterTest.java similarity index 83% rename from primitives/src/test/java/io/atomix/primitives/counter/impl/RaftCounterTest.java rename to primitives/src/test/java/io/atomix/primitives/counter/impl/RaftAtomicCounterTest.java index c6f42999f2..be8b99a7a2 100644 --- a/primitives/src/test/java/io/atomix/primitives/counter/impl/RaftCounterTest.java +++ b/primitives/src/test/java/io/atomix/primitives/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 { +public class RaftAtomicCounterTest extends AbstractRaftPrimitiveTest { @Override protected RaftService createService() { - return new RaftCounterService(); + return new RaftAtomicCounterService(); } @Override - protected RaftCounter createPrimitive(RaftProxy proxy) { - return new RaftCounter(proxy); + protected RaftAtomicCounter createPrimitive(RaftProxy 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 index 1d5583d086..d9d82b8e13 100644 --- 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.RaftCounterService; +import io.atomix.primitives.counter.impl.RaftAtomicCounter; +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 { +public class RaftIdGeneratorTest extends AbstractRaftPrimitiveTest { @Override protected RaftService createService() { - return new RaftCounterService(); + return new RaftAtomicCounterService(); } @Override - protected RaftCounter createPrimitive(RaftProxy proxy) { - return new RaftCounter(proxy); + protected RaftAtomicCounter createPrimitive(RaftProxy 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 index ac40575599..6d78e5d1e5 100644 --- 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)