Move Raft event interfaces to event package.

atomix · Jul 3, 2017 · 08825bc · 08825bc
1 parent 04774e5
commit 08825bc
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 24 deletions.
diff --git a/...a/io/atomix/protocols/raft/EventType.java → ...tomix/protocols/raft/event/EventType.java b/...a/io/atomix/protocols/raft/EventType.java → ...tomix/protocols/raft/event/EventType.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.protocols.raft;
+package io.atomix.protocols.raft.event;
 
-import io.atomix.protocols.raft.impl.DefaultEventType;
+import io.atomix.protocols.raft.event.impl.DefaultEventType;
 import io.atomix.utils.Identifier;
 
 /**

diff --git a/...a/io/atomix/protocols/raft/RaftEvent.java → ...tomix/protocols/raft/event/RaftEvent.java b/...a/io/atomix/protocols/raft/RaftEvent.java → ...tomix/protocols/raft/event/RaftEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.protocols.raft;
+package io.atomix.protocols.raft.event;
 
 import io.atomix.utils.ArraySizeHashPrinter;
 

diff --git a/...protocols/raft/impl/DefaultEventType.java → ...ols/raft/event/impl/DefaultEventType.java b/...protocols/raft/impl/DefaultEventType.java → ...ols/raft/event/impl/DefaultEventType.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.protocols.raft.impl;
+package io.atomix.protocols.raft.event.impl;
 
-import io.atomix.protocols.raft.EventType;
+import io.atomix.protocols.raft.event.EventType;
 import io.atomix.utils.AbstractIdentifier;
 
 /**

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/operation/OperationId.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/operation/OperationId.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.protocols.raft.operation;
 
-import io.atomix.protocols.raft.impl.DefaultOperationId;
+import io.atomix.protocols.raft.operation.impl.DefaultOperationId;
 import io.atomix.utils.Identifier;
 
 /**

diff --git a/...otocols/raft/impl/DefaultOperationId.java → ...ft/operation/impl/DefaultOperationId.java b/...otocols/raft/impl/DefaultOperationId.java → ...ft/operation/impl/DefaultOperationId.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.protocols.raft.impl;
+package io.atomix.protocols.raft.operation.impl;
 
 import io.atomix.protocols.raft.operation.OperationId;
 import io.atomix.protocols.raft.operation.OperationType;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/protocol/PublishRequest.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/protocol/PublishRequest.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.protocols.raft.protocol;
 
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.RaftEvent;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/DelegatingRaftProxyClient.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/DelegatingRaftProxyClient.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.protocols.raft.proxy;
 
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.operation.RaftOperation;
 import io.atomix.protocols.raft.service.ServiceType;
 import io.atomix.protocols.raft.session.SessionId;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/RaftProxy.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/RaftProxy.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.protocols.raft.proxy;
 
-import io.atomix.protocols.raft.EventType;
+import io.atomix.protocols.raft.event.EventType;
 import io.atomix.protocols.raft.operation.OperationId;
 import io.atomix.protocols.raft.ReadConsistency;
 import io.atomix.protocols.raft.operation.RaftOperation;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/RaftProxyClient.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/RaftProxyClient.java
@@ -16,7 +16,7 @@
 package io.atomix.protocols.raft.proxy;
 
 import io.atomix.protocols.raft.operation.OperationId;
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.operation.RaftOperation;
 import io.atomix.protocols.raft.ReadConsistency;
 import io.atomix.protocols.raft.service.ServiceType;

diff --git a/.../raft/src/main/java/io/atomix/protocols/raft/proxy/impl/BlockingAwareRaftProxyClient.java b/.../raft/src/main/java/io/atomix/protocols/raft/proxy/impl/BlockingAwareRaftProxyClient.java
@@ -16,7 +16,7 @@
 package io.atomix.protocols.raft.proxy.impl;
 
 import com.google.common.collect.Maps;
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.operation.RaftOperation;
 import io.atomix.protocols.raft.proxy.DelegatingRaftProxyClient;
 import io.atomix.protocols.raft.proxy.RaftProxyClient;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/impl/DefaultRaftProxy.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/impl/DefaultRaftProxy.java
@@ -16,8 +16,8 @@
 package io.atomix.protocols.raft.proxy.impl;
 
 import com.google.common.collect.Maps;
-import io.atomix.protocols.raft.EventType;
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.EventType;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.operation.RaftOperation;
 import io.atomix.protocols.raft.service.ServiceType;
 import io.atomix.protocols.raft.proxy.RaftProxy;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/impl/DefaultRaftProxyClient.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/impl/DefaultRaftProxyClient.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.protocols.raft.proxy.impl;
 
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.operation.RaftOperation;
 import io.atomix.protocols.raft.service.ServiceType;
 import io.atomix.protocols.raft.protocol.RaftClientProtocol;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/impl/RaftProxyListener.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/proxy/impl/RaftProxyListener.java
@@ -16,7 +16,7 @@
 package io.atomix.protocols.raft.proxy.impl;
 
 import com.google.common.collect.Sets;
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.protocol.PublishRequest;
 import io.atomix.protocols.raft.protocol.RaftClientProtocol;
 import io.atomix.protocols.raft.protocol.ResetRequest;

diff --git a/...ols/raft/src/main/java/io/atomix/protocols/raft/proxy/impl/RecoveringRaftProxyClient.java b/...ols/raft/src/main/java/io/atomix/protocols/raft/proxy/impl/RecoveringRaftProxyClient.java
@@ -17,7 +17,7 @@
 
 import com.google.common.collect.Sets;
 import io.atomix.protocols.raft.RaftClient;
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.RaftException;
 import io.atomix.protocols.raft.operation.RaftOperation;
 import io.atomix.protocols.raft.service.ServiceType;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/service/RaftCommit.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/service/RaftCommit.java
@@ -16,7 +16,7 @@
 package io.atomix.protocols.raft.service;
 
 import io.atomix.protocols.raft.operation.OperationId;
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.operation.RaftOperation;
 import io.atomix.protocols.raft.operation.RaftOperationExecutor;
 import io.atomix.protocols.raft.session.RaftSession;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/service/RaftService.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/service/RaftService.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.protocols.raft.service;
 
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.operation.RaftOperation;
 import io.atomix.protocols.raft.operation.RaftOperationExecutor;
 import io.atomix.protocols.raft.RaftServer;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/session/RaftSession.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/session/RaftSession.java
@@ -15,8 +15,8 @@
  */
 package io.atomix.protocols.raft.session;
 
-import io.atomix.protocols.raft.EventType;
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.EventType;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.ReadConsistency;
 import io.atomix.protocols.raft.service.ServiceType;
 import io.atomix.protocols.raft.cluster.MemberId;

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/session/impl/RaftSessionContext.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/session/impl/RaftSessionContext.java
@@ -16,7 +16,7 @@
 package io.atomix.protocols.raft.session.impl;
 
 import io.atomix.protocols.raft.operation.OperationType;
-import io.atomix.protocols.raft.RaftEvent;
+import io.atomix.protocols.raft.event.RaftEvent;
 import io.atomix.protocols.raft.ReadConsistency;
 import io.atomix.protocols.raft.service.ServiceType;
 import io.atomix.protocols.raft.cluster.MemberId;

diff --git a/protocols/raft/src/test/java/io/atomix/protocols/raft/RaftTest.java b/protocols/raft/src/test/java/io/atomix/protocols/raft/RaftTest.java
@@ -19,7 +19,8 @@
 import io.atomix.protocols.raft.cluster.RaftClusterEvent;
 import io.atomix.protocols.raft.cluster.RaftMember;
 import io.atomix.protocols.raft.cluster.impl.DefaultRaftMember;
-import io.atomix.protocols.raft.impl.DefaultOperationId;
+import io.atomix.protocols.raft.event.EventType;
+import io.atomix.protocols.raft.operation.impl.DefaultOperationId;
 import io.atomix.protocols.raft.operation.OperationId;
 import io.atomix.protocols.raft.operation.OperationType;
 import io.atomix.protocols.raft.operation.RaftOperation;

diff --git a/tests/src/main/java/io/atomix/protocols/raft/RaftPerformanceTest.java b/tests/src/main/java/io/atomix/protocols/raft/RaftPerformanceTest.java
@@ -21,7 +21,7 @@
 import io.atomix.protocols.raft.cluster.MemberId;
 import io.atomix.protocols.raft.cluster.RaftMember;
 import io.atomix.protocols.raft.cluster.impl.DefaultRaftMember;
-import io.atomix.protocols.raft.impl.DefaultOperationId;
+import io.atomix.protocols.raft.operation.impl.DefaultOperationId;
 import io.atomix.protocols.raft.operation.OperationId;
 import io.atomix.protocols.raft.operation.OperationType;
 import io.atomix.protocols.raft.operation.RaftOperation;