Using 1.0.0.rc2 version of Atomix
CopycatTransport updates
Change-Id: If384ac2574f098c327f0e5749766268c8d7f1ecd
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapState.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapState.java
index 9c9b019..a6e6ca0 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapState.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapState.java
@@ -18,7 +18,7 @@
import static org.onosproject.store.service.MapEvent.Type.INSERT;
import static org.onosproject.store.service.MapEvent.Type.REMOVE;
import static org.onosproject.store.service.MapEvent.Type.UPDATE;
-import io.atomix.copycat.client.session.Session;
+import io.atomix.copycat.server.session.ServerSession;
import io.atomix.copycat.server.Commit;
import io.atomix.copycat.server.Snapshottable;
import io.atomix.copycat.server.StateMachineExecutor;
@@ -322,8 +322,8 @@
commit.session()
.onStateChange(
state -> {
- if (state == Session.State.CLOSED
- || state == Session.State.EXPIRED) {
+ if (state == ServerSession.State.CLOSED
+ || state == ServerSession.State.EXPIRED) {
Commit<? extends Listen> listener = listeners.remove(sessionId);
if (listener != null) {
listener.close();
@@ -503,21 +503,21 @@
}
@Override
- public void register(Session session) {
+ public void register(ServerSession session) {
}
@Override
- public void unregister(Session session) {
+ public void unregister(ServerSession session) {
closeListener(session.id());
}
@Override
- public void expire(Session session) {
+ public void expire(ServerSession session) {
closeListener(session.id());
}
@Override
- public void close(Session session) {
+ public void close(ServerSession session) {
closeListener(session.id());
}