diff --git a/core/src/main/java/io/atomix/partition/impl/AtomixPartition.java b/core/src/main/java/io/atomix/partition/impl/AtomixPartition.java index 45f919f64a..72a037d32d 100644 --- a/core/src/main/java/io/atomix/partition/impl/AtomixPartition.java +++ b/core/src/main/java/io/atomix/partition/impl/AtomixPartition.java @@ -33,7 +33,7 @@ import io.atomix.primitives.multimap.impl.RaftConsistentSetMultimapService; import io.atomix.primitives.queue.impl.RaftWorkQueueService; import io.atomix.primitives.tree.impl.RaftDocumentTreeService; -import io.atomix.primitives.value.impl.RaftValueService; +import io.atomix.primitives.value.impl.RaftAtomicValueService; import io.atomix.protocols.raft.cluster.MemberId; import io.atomix.protocols.raft.protocol.messaging.RaftClientCommunicator; import io.atomix.protocols.raft.service.RaftService; @@ -74,7 +74,7 @@ public abstract class AtomixPartition implements Managed { .put(DistributedPrimitive.Type.COUNTER.name(), RaftCounterService::new) .put(DistributedPrimitive.Type.LEADER_ELECTOR.name(), RaftLeaderElectorService::new) .put(DistributedPrimitive.Type.WORK_QUEUE.name(), RaftWorkQueueService::new) - .put(Type.VALUE.name(), RaftValueService::new) + .put(Type.VALUE.name(), RaftAtomicValueService::new) .put(DistributedPrimitive.Type.DOCUMENT_TREE.name(), () -> new RaftDocumentTreeService(Ordering.NATURAL)) .put(String.format("%s-%s", DistributedPrimitive.Type.DOCUMENT_TREE.name(), Ordering.NATURAL), diff --git a/core/src/main/java/io/atomix/partition/impl/AtomixPartitionClient.java b/core/src/main/java/io/atomix/partition/impl/AtomixPartitionClient.java index 68f1c92bc3..89cfdd2b5e 100644 --- a/core/src/main/java/io/atomix/partition/impl/AtomixPartitionClient.java +++ b/core/src/main/java/io/atomix/partition/impl/AtomixPartitionClient.java @@ -28,7 +28,7 @@ import io.atomix.primitives.leadership.impl.RaftLeaderElector; import io.atomix.primitives.leadership.impl.TranscodingAsyncLeaderElector; import io.atomix.primitives.lock.AsyncDistributedLock; -import io.atomix.primitives.lock.impl.RaftLock; +import io.atomix.primitives.lock.impl.RaftDistributedLock; import io.atomix.primitives.map.AsyncAtomicCounterMap; import io.atomix.primitives.map.AsyncConsistentMap; import io.atomix.primitives.map.AsyncConsistentTreeMap; @@ -45,7 +45,7 @@ import io.atomix.primitives.tree.impl.RaftDocumentTree; import io.atomix.primitives.tree.impl.TranscodingAsyncDocumentTree; import io.atomix.primitives.value.AsyncAtomicValue; -import io.atomix.primitives.value.impl.RaftValue; +import io.atomix.primitives.value.impl.RaftAtomicValue; import io.atomix.primitives.value.impl.TranscodingAsyncAtomicValue; import io.atomix.protocols.raft.RaftClient; import io.atomix.protocols.raft.ReadConsistency; @@ -224,7 +224,7 @@ public AsyncAtomicIdGenerator newAsyncIdGenerator(String name) { @Override public AsyncAtomicValue newAsyncAtomicValue(String name, Serializer serializer) { - RaftValue value = new RaftValue(client.newProxyBuilder() + RaftAtomicValue value = new RaftAtomicValue(client.newProxyBuilder() .withName(name) .withServiceType(DistributedPrimitive.Type.VALUE.name()) .withReadConsistency(ReadConsistency.LINEARIZABLE_LEASE) @@ -285,7 +285,7 @@ public AsyncLeaderElector newAsyncLeaderElector(String name, Serializer s @Override public AsyncDistributedLock newAsyncDistributedLock(String name, Duration lockTimeout) { - return new RaftLock(client.newProxyBuilder() + return new RaftDistributedLock(client.newProxyBuilder() .withName(name) .withServiceType(DistributedPrimitive.Type.LEADER_ELECTOR.name()) .withReadConsistency(ReadConsistency.LINEARIZABLE) diff --git a/core/src/main/java/io/atomix/primitives/lock/impl/RaftLock.java b/core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLock.java similarity index 82% rename from core/src/main/java/io/atomix/primitives/lock/impl/RaftLock.java rename to core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLock.java index 612c9556f1..403389809a 100644 --- a/core/src/main/java/io/atomix/primitives/lock/impl/RaftLock.java +++ b/core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLock.java @@ -17,8 +17,8 @@ import io.atomix.primitives.impl.AbstractRaftPrimitive; import io.atomix.primitives.lock.AsyncDistributedLock; -import io.atomix.primitives.lock.impl.RaftLockOperations.Lock; -import io.atomix.primitives.lock.impl.RaftLockOperations.Unlock; +import io.atomix.primitives.lock.impl.RaftDistributedLockOperations.Lock; +import io.atomix.primitives.lock.impl.RaftDistributedLockOperations.Unlock; import io.atomix.protocols.raft.proxy.RaftProxy; import io.atomix.serializer.Serializer; import io.atomix.serializer.kryo.KryoNamespace; @@ -32,27 +32,27 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import static io.atomix.primitives.lock.impl.RaftLockOperations.LOCK; -import static io.atomix.primitives.lock.impl.RaftLockOperations.UNLOCK; +import static io.atomix.primitives.lock.impl.RaftDistributedLockOperations.LOCK; +import static io.atomix.primitives.lock.impl.RaftDistributedLockOperations.UNLOCK; /** * Raft lock. */ -public class RaftLock extends AbstractRaftPrimitive implements AsyncDistributedLock { +public class RaftDistributedLock extends AbstractRaftPrimitive implements AsyncDistributedLock { private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.newBuilder() .register(KryoNamespaces.BASIC) - .register(RaftLockOperations.NAMESPACE) - .register(RaftLockEvents.NAMESPACE) + .register(RaftDistributedLockOperations.NAMESPACE) + .register(RaftDistributedLockEvents.NAMESPACE) .build()); private final Map> futures = new ConcurrentHashMap<>(); private final AtomicInteger id = new AtomicInteger(); private int lock; - public RaftLock(RaftProxy proxy) { + public RaftDistributedLock(RaftProxy proxy) { super(proxy); - proxy.addEventListener(RaftLockEvents.LOCK, SERIALIZER::decode, this::handleLocked); - proxy.addEventListener(RaftLockEvents.FAIL, SERIALIZER::decode, this::handleFailed); + proxy.addEventListener(RaftDistributedLockEvents.LOCK, SERIALIZER::decode, this::handleLocked); + proxy.addEventListener(RaftDistributedLockEvents.FAIL, SERIALIZER::decode, this::handleFailed); } private void handleLocked(LockEvent event) { diff --git a/core/src/main/java/io/atomix/primitives/lock/impl/RaftLockEvents.java b/core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLockEvents.java similarity index 87% rename from core/src/main/java/io/atomix/primitives/lock/impl/RaftLockEvents.java rename to core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLockEvents.java index dc75e01115..548a59b3e3 100644 --- a/core/src/main/java/io/atomix/primitives/lock/impl/RaftLockEvents.java +++ b/core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLockEvents.java @@ -22,13 +22,13 @@ /** * Raft value events. */ -public enum RaftLockEvents implements EventType { +public enum RaftDistributedLockEvents implements EventType { LOCK("lock"), FAIL("fail"); private final String id; - RaftLockEvents(String id) { + RaftDistributedLockEvents(String id) { this.id = id; } @@ -41,6 +41,6 @@ public String id() { .nextId(KryoNamespaces.BEGIN_USER_CUSTOM_ID + 50) .register(LockEvent.class) .register(byte[].class) - .build(RaftLockEvents.class.getSimpleName()); + .build(RaftDistributedLockEvents.class.getSimpleName()); } diff --git a/core/src/main/java/io/atomix/primitives/lock/impl/RaftLockOperations.java b/core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLockOperations.java similarity index 93% rename from core/src/main/java/io/atomix/primitives/lock/impl/RaftLockOperations.java rename to core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLockOperations.java index bcbbb85d17..7e5a007f6a 100644 --- a/core/src/main/java/io/atomix/primitives/lock/impl/RaftLockOperations.java +++ b/core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLockOperations.java @@ -25,14 +25,14 @@ /** * Counter commands. */ -public enum RaftLockOperations implements OperationId { +public enum RaftDistributedLockOperations implements OperationId { LOCK("lock", OperationType.COMMAND), UNLOCK("unlock", OperationType.COMMAND); private final String id; private final OperationType type; - RaftLockOperations(String id, OperationType type) { + RaftDistributedLockOperations(String id, OperationType type) { this.id = id; this.type = type; } @@ -52,7 +52,7 @@ public OperationType type() { .nextId(KryoNamespaces.BEGIN_USER_CUSTOM_ID) .register(Lock.class) .register(Unlock.class) - .build(RaftLockOperations.class.getSimpleName()); + .build(RaftDistributedLockOperations.class.getSimpleName()); /** * Abstract lock operation. diff --git a/core/src/main/java/io/atomix/primitives/lock/impl/RaftLockService.java b/core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLockService.java similarity index 82% rename from core/src/main/java/io/atomix/primitives/lock/impl/RaftLockService.java rename to core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLockService.java index 9f242756aa..6c5294bdbd 100644 --- a/core/src/main/java/io/atomix/primitives/lock/impl/RaftLockService.java +++ b/core/src/main/java/io/atomix/primitives/lock/impl/RaftDistributedLockService.java @@ -15,8 +15,8 @@ */ package io.atomix.primitives.lock.impl; -import io.atomix.primitives.lock.impl.RaftLockOperations.Lock; -import io.atomix.primitives.lock.impl.RaftLockOperations.Unlock; +import io.atomix.primitives.lock.impl.RaftDistributedLockOperations.Lock; +import io.atomix.primitives.lock.impl.RaftDistributedLockOperations.Unlock; import io.atomix.protocols.raft.service.AbstractRaftService; import io.atomix.protocols.raft.service.Commit; import io.atomix.protocols.raft.service.RaftServiceExecutor; @@ -35,17 +35,17 @@ import java.util.Queue; import static com.google.common.base.MoreObjects.toStringHelper; -import static io.atomix.primitives.lock.impl.RaftLockOperations.LOCK; -import static io.atomix.primitives.lock.impl.RaftLockOperations.UNLOCK; +import static io.atomix.primitives.lock.impl.RaftDistributedLockOperations.LOCK; +import static io.atomix.primitives.lock.impl.RaftDistributedLockOperations.UNLOCK; /** * Raft atomic value service. */ -public class RaftLockService extends AbstractRaftService { +public class RaftDistributedLockService extends AbstractRaftService { private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.newBuilder() .register(KryoNamespaces.BASIC) - .register(RaftLockOperations.NAMESPACE) - .register(RaftLockEvents.NAMESPACE) + .register(RaftDistributedLockOperations.NAMESPACE) + .register(RaftDistributedLockEvents.NAMESPACE) .register(LockHolder.class) .build()); @@ -78,7 +78,7 @@ public void install(SnapshotReader reader) { queue.remove(holder); RaftSession session = sessions().getSession(holder.session); if (session != null && session.getState().active()) { - session.publish(RaftLockEvents.FAIL, SERIALIZER::encode, new LockEvent(holder.id, holder.index)); + session.publish(RaftDistributedLockEvents.FAIL, SERIALIZER::encode, new LockEvent(holder.id, holder.index)); } })); } @@ -105,9 +105,9 @@ protected void lock(Commit commit) { commit.index(), commit.session().sessionId().id(), 0); - commit.session().publish(RaftLockEvents.LOCK, SERIALIZER::encode, new LockEvent(commit.value().id(), commit.index())); + commit.session().publish(RaftDistributedLockEvents.LOCK, SERIALIZER::encode, new LockEvent(commit.value().id(), commit.index())); } else if (commit.value().timeout() == 0) { - commit.session().publish(RaftLockEvents.FAIL, SERIALIZER::encode, new LockEvent(commit.value().id(), commit.index())); + commit.session().publish(RaftDistributedLockEvents.FAIL, SERIALIZER::encode, new LockEvent(commit.value().id(), commit.index())); } else if (commit.value().timeout() > 0) { LockHolder holder = lock = new LockHolder( commit.value().id(), @@ -119,7 +119,7 @@ protected void lock(Commit commit) { timers.remove(commit.index()); queue.remove(holder); if (commit.session().getState().active()) { - commit.session().publish(RaftLockEvents.FAIL, SERIALIZER::encode, new LockEvent(commit.value().id(), commit.index())); + commit.session().publish(RaftDistributedLockEvents.FAIL, SERIALIZER::encode, new LockEvent(commit.value().id(), commit.index())); } })); } else { @@ -152,7 +152,7 @@ protected void unlock(Commit commit) { if (session == null || session.getState() == RaftSession.State.EXPIRED || session.getState() == RaftSession.State.CLOSED) { lock = queue.poll(); } else { - session.publish(RaftLockEvents.LOCK, SERIALIZER::encode, new LockEvent(lock.id, commit.index())); + session.publish(RaftDistributedLockEvents.LOCK, SERIALIZER::encode, new LockEvent(lock.id, commit.index())); break; } } @@ -175,7 +175,7 @@ private void releaseSession(RaftSession session) { if (lockSession == null || lockSession.getState() == RaftSession.State.EXPIRED || lockSession.getState() == RaftSession.State.CLOSED) { lock = queue.poll(); } else { - lockSession.publish(RaftLockEvents.LOCK, SERIALIZER::encode, new LockEvent(lock.id, lock.index)); + lockSession.publish(RaftDistributedLockEvents.LOCK, SERIALIZER::encode, new LockEvent(lock.id, lock.index)); break; } } diff --git a/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValue.java b/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValue.java index 1bac16025a..aabf513fb7 100644 --- a/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValue.java +++ b/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValue.java @@ -19,8 +19,8 @@ import io.atomix.primitives.impl.AbstractRaftPrimitive; import io.atomix.primitives.value.AsyncAtomicValue; import io.atomix.primitives.value.AtomicValueEventListener; -import io.atomix.primitives.value.impl.RaftValueOperations.CompareAndSet; -import io.atomix.primitives.value.impl.RaftValueOperations.GetAndSet; +import io.atomix.primitives.value.impl.RaftAtomicValueOperations.CompareAndSet; +import io.atomix.primitives.value.impl.RaftAtomicValueOperations.GetAndSet; import io.atomix.protocols.raft.proxy.RaftProxy; import io.atomix.serializer.Serializer; import io.atomix.serializer.kryo.KryoNamespace; @@ -29,26 +29,26 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; -import static io.atomix.primitives.value.impl.RaftValueOperations.ADD_LISTENER; -import static io.atomix.primitives.value.impl.RaftValueOperations.COMPARE_AND_SET; -import static io.atomix.primitives.value.impl.RaftValueOperations.GET; -import static io.atomix.primitives.value.impl.RaftValueOperations.GET_AND_SET; -import static io.atomix.primitives.value.impl.RaftValueOperations.REMOVE_LISTENER; -import static io.atomix.primitives.value.impl.RaftValueOperations.SET; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.ADD_LISTENER; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.COMPARE_AND_SET; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.GET; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.GET_AND_SET; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.REMOVE_LISTENER; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.SET; /** * Atomix counter implementation. */ -public class RaftValue extends AbstractRaftPrimitive implements AsyncAtomicValue { +public class RaftAtomicValue extends AbstractRaftPrimitive implements AsyncAtomicValue { private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.newBuilder() .register(KryoNamespaces.BASIC) - .register(RaftValueOperations.NAMESPACE) - .register(RaftValueEvents.NAMESPACE) + .register(RaftAtomicValueOperations.NAMESPACE) + .register(RaftAtomicValueEvents.NAMESPACE) .build()); private final Set> eventListeners = Sets.newConcurrentHashSet(); - public RaftValue(RaftProxy proxy) { + public RaftAtomicValue(RaftProxy proxy) { super(proxy); } @@ -59,7 +59,7 @@ public CompletableFuture get() { @Override public CompletableFuture set(byte[] value) { - return proxy.invoke(SET, SERIALIZER::encode, new RaftValueOperations.Set(value)); + return proxy.invoke(SET, SERIALIZER::encode, new RaftAtomicValueOperations.Set(value)); } @Override diff --git a/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueEvents.java b/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueEvents.java index 49450b57ed..2bf9550df4 100644 --- a/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueEvents.java +++ b/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueEvents.java @@ -23,12 +23,12 @@ /** * Raft value events. */ -public enum RaftValueEvents implements EventType { +public enum RaftAtomicValueEvents implements EventType { CHANGE("change"); private final String id; - RaftValueEvents(String id) { + RaftAtomicValueEvents(String id) { this.id = id; } @@ -42,6 +42,6 @@ public String id() { .register(AtomicValueEvent.class) .register(AtomicValueEvent.Type.class) .register(byte[].class) - .build(RaftValueEvents.class.getSimpleName()); + .build(RaftAtomicValueEvents.class.getSimpleName()); } diff --git a/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueOperations.java b/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueOperations.java index f63dbd09b2..7188b990aa 100644 --- a/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueOperations.java +++ b/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueOperations.java @@ -26,7 +26,7 @@ /** * Counter commands. */ -public enum RaftValueOperations implements OperationId { +public enum RaftAtomicValueOperations implements OperationId { GET("get", OperationType.QUERY), SET("set", OperationType.COMMAND), COMPARE_AND_SET("compareAndSet", OperationType.COMMAND), @@ -37,7 +37,7 @@ public enum RaftValueOperations implements OperationId { private final String id; private final OperationType type; - RaftValueOperations(String id, OperationType type) { + RaftAtomicValueOperations(String id, OperationType type) { this.id = id; this.type = type; } @@ -59,7 +59,7 @@ public OperationType type() { .register(Set.class) .register(CompareAndSet.class) .register(GetAndSet.class) - .build(RaftValueOperations.class.getSimpleName()); + .build(RaftAtomicValueOperations.class.getSimpleName()); /** * Abstract value command. diff --git a/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueService.java b/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueService.java index 34b5520b2a..ab6a0bc5a3 100644 --- a/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueService.java +++ b/core/src/main/java/io/atomix/primitives/value/impl/RaftAtomicValueService.java @@ -17,9 +17,9 @@ import com.google.common.collect.Sets; import io.atomix.primitives.value.AtomicValueEvent; -import io.atomix.primitives.value.impl.RaftValueOperations.CompareAndSet; -import io.atomix.primitives.value.impl.RaftValueOperations.GetAndSet; -import io.atomix.primitives.value.impl.RaftValueOperations.Set; +import io.atomix.primitives.value.impl.RaftAtomicValueOperations.CompareAndSet; +import io.atomix.primitives.value.impl.RaftAtomicValueOperations.GetAndSet; +import io.atomix.primitives.value.impl.RaftAtomicValueOperations.Set; import io.atomix.protocols.raft.service.AbstractRaftService; import io.atomix.protocols.raft.service.Commit; import io.atomix.protocols.raft.service.RaftServiceExecutor; @@ -33,22 +33,22 @@ import java.util.Arrays; import java.util.HashSet; -import static io.atomix.primitives.value.impl.RaftValueEvents.CHANGE; -import static io.atomix.primitives.value.impl.RaftValueOperations.ADD_LISTENER; -import static io.atomix.primitives.value.impl.RaftValueOperations.COMPARE_AND_SET; -import static io.atomix.primitives.value.impl.RaftValueOperations.GET; -import static io.atomix.primitives.value.impl.RaftValueOperations.GET_AND_SET; -import static io.atomix.primitives.value.impl.RaftValueOperations.REMOVE_LISTENER; -import static io.atomix.primitives.value.impl.RaftValueOperations.SET; +import static io.atomix.primitives.value.impl.RaftAtomicValueEvents.CHANGE; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.ADD_LISTENER; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.COMPARE_AND_SET; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.GET; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.GET_AND_SET; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.REMOVE_LISTENER; +import static io.atomix.primitives.value.impl.RaftAtomicValueOperations.SET; /** * Raft atomic value service. */ -public class RaftValueService extends AbstractRaftService { +public class RaftAtomicValueService extends AbstractRaftService { private static final Serializer SERIALIZER = Serializer.using(KryoNamespace.newBuilder() .register(KryoNamespaces.BASIC) - .register(RaftValueOperations.NAMESPACE) - .register(RaftValueEvents.NAMESPACE) + .register(RaftAtomicValueOperations.NAMESPACE) + .register(RaftAtomicValueEvents.NAMESPACE) .build()); private byte[] value = new byte[0]; diff --git a/core/src/main/java/io/atomix/serializer/impl/StorageNamespaces.java b/core/src/main/java/io/atomix/serializer/impl/StorageNamespaces.java index 7b0f95113f..c55ef518eb 100644 --- a/core/src/main/java/io/atomix/serializer/impl/StorageNamespaces.java +++ b/core/src/main/java/io/atomix/serializer/impl/StorageNamespaces.java @@ -18,8 +18,8 @@ import io.atomix.primitives.counter.impl.RaftCounterOperations; import io.atomix.primitives.leadership.impl.RaftLeaderElectorEvents; import io.atomix.primitives.leadership.impl.RaftLeaderElectorOperations; -import io.atomix.primitives.lock.impl.RaftLockEvents; -import io.atomix.primitives.lock.impl.RaftLockOperations; +import io.atomix.primitives.lock.impl.RaftDistributedLockEvents; +import io.atomix.primitives.lock.impl.RaftDistributedLockOperations; import io.atomix.primitives.map.impl.RaftAtomicCounterMapOperations; import io.atomix.primitives.map.impl.RaftConsistentMapEvents; import io.atomix.primitives.map.impl.RaftConsistentMapOperations; @@ -30,8 +30,8 @@ import io.atomix.primitives.queue.impl.RaftWorkQueueOperations; import io.atomix.primitives.tree.impl.RaftDocumentTreeEvents; import io.atomix.primitives.tree.impl.RaftDocumentTreeOperations; -import io.atomix.primitives.value.impl.RaftValueEvents; -import io.atomix.primitives.value.impl.RaftValueOperations; +import io.atomix.primitives.value.impl.RaftAtomicValueEvents; +import io.atomix.primitives.value.impl.RaftAtomicValueOperations; import io.atomix.protocols.raft.RaftError; import io.atomix.protocols.raft.ReadConsistency; import io.atomix.protocols.raft.cluster.MemberId; @@ -180,10 +180,10 @@ public final class StorageNamespaces { .register(RaftLeaderElectorOperations.class) .register(RaftWorkQueueEvents.class) .register(RaftWorkQueueOperations.class) - .register(RaftValueEvents.class) - .register(RaftValueOperations.class) - .register(RaftLockEvents.class) - .register(RaftLockOperations.class) + .register(RaftAtomicValueEvents.class) + .register(RaftAtomicValueOperations.class) + .register(RaftDistributedLockEvents.class) + .register(RaftDistributedLockOperations.class) .build("RaftProtocol"); /** @@ -217,8 +217,8 @@ public final class StorageNamespaces { .register(RaftDocumentTreeOperations.class) .register(RaftLeaderElectorOperations.class) .register(RaftWorkQueueOperations.class) - .register(RaftValueOperations.class) - .register(RaftLockOperations.class) + .register(RaftAtomicValueOperations.class) + .register(RaftDistributedLockOperations.class) .build("RaftStorage"); private StorageNamespaces() { diff --git a/core/src/test/java/io/atomix/primitives/lock/impl/RaftLockTest.java b/core/src/test/java/io/atomix/primitives/lock/impl/RaftDistributedLockTest.java similarity index 73% rename from core/src/test/java/io/atomix/primitives/lock/impl/RaftLockTest.java rename to core/src/test/java/io/atomix/primitives/lock/impl/RaftDistributedLockTest.java index 1d79bb799d..dcb4c9cbdd 100644 --- a/core/src/test/java/io/atomix/primitives/lock/impl/RaftLockTest.java +++ b/core/src/test/java/io/atomix/primitives/lock/impl/RaftDistributedLockTest.java @@ -29,15 +29,15 @@ /** * Raft lock test. */ -public class RaftLockTest extends AbstractRaftPrimitiveTest { +public class RaftDistributedLockTest extends AbstractRaftPrimitiveTest { @Override protected RaftService createService() { - return new RaftLockService(); + return new RaftDistributedLockService(); } @Override - protected RaftLock createPrimitive(RaftProxy proxy) { - return new RaftLock(proxy); + protected RaftDistributedLock createPrimitive(RaftProxy proxy) { + return new RaftDistributedLock(proxy); } /** @@ -45,7 +45,7 @@ protected RaftLock createPrimitive(RaftProxy proxy) { */ @Test public void testLockUnlock() throws Throwable { - RaftLock lock = newPrimitive("test-lock-unlock"); + RaftDistributedLock lock = newPrimitive("test-lock-unlock"); lock.lock().join(); lock.unlock().join(); } @@ -55,8 +55,8 @@ public void testLockUnlock() throws Throwable { */ @Test public void testReleaseOnClose() throws Throwable { - RaftLock lock1 = newPrimitive("test-lock-on-close"); - RaftLock lock2 = newPrimitive("test-lock-on-close"); + RaftDistributedLock lock1 = newPrimitive("test-lock-on-close"); + RaftDistributedLock lock2 = newPrimitive("test-lock-on-close"); lock1.lock().join(); CompletableFuture future = lock2.lock(); lock1.close(); @@ -68,8 +68,8 @@ public void testReleaseOnClose() throws Throwable { */ @Test public void testTryLockFail() throws Throwable { - RaftLock lock1 = newPrimitive("test-try-lock-fail"); - RaftLock lock2 = newPrimitive("test-try-lock-fail"); + RaftDistributedLock lock1 = newPrimitive("test-try-lock-fail"); + RaftDistributedLock lock2 = newPrimitive("test-try-lock-fail"); lock1.lock().join(); @@ -81,8 +81,8 @@ public void testTryLockFail() throws Throwable { */ @Test public void testBlockingUnlock() throws Throwable { - RaftLock lock1 = newPrimitive("test-blocking-unlock"); - RaftLock lock2 = newPrimitive("test-blocking-unlock"); + RaftDistributedLock lock1 = newPrimitive("test-blocking-unlock"); + RaftDistributedLock lock2 = newPrimitive("test-blocking-unlock"); lock1.lock().thenRun(() -> { lock1.unlock().join(); diff --git a/core/src/test/java/io/atomix/primitives/value/impl/RaftAtomicValueTest.java b/core/src/test/java/io/atomix/primitives/value/impl/RaftAtomicValueTest.java index b0d8911376..f3a2a1c90a 100644 --- a/core/src/test/java/io/atomix/primitives/value/impl/RaftAtomicValueTest.java +++ b/core/src/test/java/io/atomix/primitives/value/impl/RaftAtomicValueTest.java @@ -28,15 +28,15 @@ /** * Raft atomic value test. */ -public class RaftValueTest extends AbstractRaftPrimitiveTest { +public class RaftAtomicValueTest extends AbstractRaftPrimitiveTest { @Override protected RaftService createService() { - return new RaftValueService(); + return new RaftAtomicValueService(); } @Override - protected RaftValue createPrimitive(RaftProxy proxy) { - return new RaftValue(proxy); + protected RaftAtomicValue createPrimitive(RaftProxy proxy) { + return new RaftAtomicValue(proxy); } @Test @@ -45,7 +45,7 @@ public void testValue() throws Exception { byte[] bytes2 = "b".getBytes(); byte[] bytes3 = "c".getBytes(); - RaftValue value = newPrimitive("test-value"); + RaftAtomicValue value = newPrimitive("test-value"); assertEquals(0, value.get().join().length); value.set(bytes1).join(); assertArrayEquals(bytes1, value.get().join());