Reduce JSR305 proliferation

[controller.git] / opendaylight / md-sal / cds-access-api / src / main / java / org / opendaylight / controller / cluster / access / concepts / AbstractRequestProxy.java

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestProxy.java
index c0bf959dfc294309f5476cd79b0145e091fd4abf..183766f31039fb0d3f56e103cba98027c4ee1e3b 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestProxy.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestProxy.java
@@ -14,7 +14,7 @@ import com.google.common.annotations.Beta;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.WritableIdentifier;
 
 /**
@@ -34,7 +34,7 @@ public abstract class AbstractRequestProxy<T extends WritableIdentifier, C exten
         // For Externalizable
     }
 
-    protected AbstractRequestProxy(final @Nonnull C request) {
+    protected AbstractRequestProxy(final @NonNull C request) {
         super(request);
         this.replyTo = request.getReplyTo();
     }
@@ -42,19 +42,19 @@ public abstract class AbstractRequestProxy<T extends WritableIdentifier, C exten
     @Override
     public void writeExternal(final ObjectOutput out) throws IOException {
         super.writeExternal(out);
-        out.writeUTF(Serialization.serializedActorPath(replyTo));
+        out.writeObject(Serialization.serializedActorPath(replyTo));
     }
 
     @Override
     public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
         super.readExternal(in);
-        replyTo = JavaSerializer.currentSystem().value().provider().resolveActorRef(in.readUTF());
+        replyTo = JavaSerializer.currentSystem().value().provider().resolveActorRef((String) in.readObject());
     }
 
     @Override
-    final @Nonnull C createMessage(@Nonnull final T target) {
-        return createRequest(target, replyTo);
+    final C createMessage(final T target, final long sequence) {
+        return createRequest(target, sequence, replyTo);
     }
 
-    protected abstract @Nonnull C createRequest(@Nonnull T target, @Nonnull ActorRef replyTo);
-}
\ No newline at end of file
+    protected abstract @NonNull C createRequest(@NonNull T target, long sequence, @NonNull ActorRef replyToActor);
+}