Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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 java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import
javax.annotation.Nonn
ull;
+import
org.eclipse.jdt.annotation.NonN
ull;
import org.opendaylight.yangtools.concepts.WritableIdentifier;
/**
import org.opendaylight.yangtools.concepts.WritableIdentifier;
/**
@@
-34,7
+34,7
@@
public abstract class AbstractRequestProxy<T extends WritableIdentifier, C exten
// For Externalizable
}
// For Externalizable
}
- protected AbstractRequestProxy(final @Non
n
ull C request) {
+ protected AbstractRequestProxy(final @Non
N
ull C request) {
super(request);
this.replyTo = request.getReplyTo();
}
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);
@Override
public void writeExternal(final ObjectOutput out) throws IOException {
super.writeExternal(out);
- out.write
UTF
(Serialization.serializedActorPath(replyTo));
+ out.write
Object
(Serialization.serializedActorPath(replyTo));
}
@Override
public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal(in);
}
@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
}
@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);
+}