Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump upstream versions
[controller.git]
/
opendaylight
/
md-sal
/
cds-access-api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
access
/
concepts
/
AbstractMessageProxy.java
diff --git
a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractMessageProxy.java
b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractMessageProxy.java
index 04e70379a1e10ed83458320253b31c7bbf21c74f..0367527a5e67eb2ce796720786df1adeae733f1d 100644
(file)
--- a/
opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractMessageProxy.java
+++ b/
opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractMessageProxy.java
@@
-7,13
+7,14
@@
*/
package org.opendaylight.controller.cluster.access.concepts;
*/
package org.opendaylight.controller.cluster.access.concepts;
-import com.google.common.base.Verify;
+import static com.google.common.base.Verify.verifyNotNull;
+
import java.io.DataInput;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.DataInput;
import java.io.Externalizable;
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.WritableObjects;
import org.opendaylight.yangtools.concepts.WritableIdentifier;
import org.opendaylight.yangtools.concepts.WritableObjects;
@@
-29,37
+30,33
@@
abstract class AbstractMessageProxy<T extends WritableIdentifier, C extends Mess
private static final long serialVersionUID = 1L;
private T target;
private long sequence;
private static final long serialVersionUID = 1L;
private T target;
private long sequence;
- private long retry;
protected AbstractMessageProxy() {
// For Externalizable
}
protected AbstractMessageProxy() {
// For Externalizable
}
- AbstractMessageProxy(final @Non
n
ull C message) {
+ AbstractMessageProxy(final @Non
N
ull C message) {
this.target = message.getTarget();
this.sequence = message.getSequence();
this.target = message.getTarget();
this.sequence = message.getSequence();
- this.retry = message.getRetry();
}
@Override
public void writeExternal(final ObjectOutput out) throws IOException {
target.writeTo(out);
}
@Override
public void writeExternal(final ObjectOutput out) throws IOException {
target.writeTo(out);
- WritableObjects.writeLong
s(out, sequence, retry
);
+ WritableObjects.writeLong
(out, sequence
);
}
@Override
public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
}
@Override
public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
- target = Verify.verifyNotNull(readTarget(in));
-
- final byte header = WritableObjects.readLongHeader(in);
- sequence = WritableObjects.readFirstLong(in, header);
- retry = WritableObjects.readSecondLong(in, header);
+ target = verifyNotNull(readTarget(in));
+ sequence = WritableObjects.readLong(in);
}
protected final Object readResolve() {
}
protected final Object readResolve() {
- return
Verify.verifyNotNull(createMessage(target, sequence, retry
));
+ return
verifyNotNull(createMessage(target, sequence
));
}
}
- protected abstract @Non
null T readTarget(@Nonn
ull DataInput in) throws IOException;
- abstract @Nonnull C createMessage(@Nonnull T target, long sequence, long retry);
-}
\ No newline at end of file
+ protected abstract @Non
Null T readTarget(@NonN
ull DataInput in) throws IOException;
+
+ abstract @NonNull C createMessage(@NonNull T msgTarget, long msgSequence);
+}