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/AtomixConsistentMap.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMap.java
index df44b48..4c065a5 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMap.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMap.java
@@ -65,7 +65,7 @@
@Override
public CompletableFuture<AtomixConsistentMap> open() {
return super.open().thenApply(result -> {
- client.session().onEvent(CHANGE_SUBJECT, this::handleEvent);
+ client.onEvent(CHANGE_SUBJECT, this::handleEvent);
return result;
});
}
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapCommands.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapCommands.java
index 913c3bc..4f912da 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapCommands.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapCommands.java
@@ -22,8 +22,8 @@
import io.atomix.catalyst.serializer.Serializer;
import io.atomix.catalyst.serializer.SerializerRegistry;
import io.atomix.catalyst.util.Assert;
-import io.atomix.copycat.client.Command;
-import io.atomix.copycat.client.Query;
+import io.atomix.copycat.Command;
+import io.atomix.copycat.Query;
import java.util.Collection;
import java.util.Map;
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());
}
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElector.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElector.java
index b7e48fa..9995c4d 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElector.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElector.java
@@ -57,7 +57,7 @@
@Override
public CompletableFuture<AtomixLeaderElector> open() {
return super.open().thenApply(result -> {
- client.session().onEvent("change", this::handleEvent);
+ client.onEvent("change", this::handleEvent);
return result;
});
}
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorCommands.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorCommands.java
index e7de783..235bd07 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorCommands.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorCommands.java
@@ -32,8 +32,8 @@
import io.atomix.catalyst.serializer.Serializer;
import io.atomix.catalyst.serializer.SerializerRegistry;
import io.atomix.catalyst.util.Assert;
-import io.atomix.copycat.client.Command;
-import io.atomix.copycat.client.Query;
+import io.atomix.copycat.Command;
+import io.atomix.copycat.Query;
/**
* {@link AtomixLeaderElector} resource state machine operations.
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java
index 9b58226..23dcf52 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java
@@ -16,7 +16,7 @@
package org.onosproject.store.primitives.resources.impl;
import static org.slf4j.LoggerFactory.getLogger;
-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;
@@ -265,7 +265,7 @@
return electionState == null ? new LinkedList<>() : electionState.candidates();
}
- private void onSessionEnd(Session session) {
+ private void onSessionEnd(ServerSession session) {
Commit<? extends AtomixLeaderElectorCommands.Listen> listener = listeners.remove(session.id());
if (listener != null) {
listener.close();
@@ -337,7 +337,7 @@
this.termStartTime = termStartTime;
}
- public ElectionState cleanup(Session session, Supplier<Long> termCounter) {
+ public ElectionState cleanup(ServerSession session, Supplier<Long> termCounter) {
Optional<Registration> registration =
registrations.stream().filter(r -> r.sessionId() == session.id()).findFirst();
if (registration.isPresent()) {
@@ -409,21 +409,21 @@
}
@Override
- public void register(Session session) {
+ public void register(ServerSession session) {
}
@Override
- public void unregister(Session session) {
+ public void unregister(ServerSession session) {
onSessionEnd(session);
}
@Override
- public void expire(Session session) {
+ public void expire(ServerSession session) {
onSessionEnd(session);
}
@Override
- public void close(Session session) {
+ public void close(ServerSession session) {
onSessionEnd(session);
}