Fix CS warnings in cds-access-api and enable enforcement

[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..8a5916813629a00539d5d23f3ff4ea356181bd80 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
@@ -29,37 +29,35 @@ abstract class AbstractMessageProxy<T extends WritableIdentifier, C extends Mess
     private static final long serialVersionUID = 1L;
     private T target;
     private long sequence;
-    private long retry;
 
     protected AbstractMessageProxy() {
         // For Externalizable
     }
 
-    AbstractMessageProxy(final @Nonnull C message) {
+    AbstractMessageProxy(@Nonnull final C message) {
         this.target = message.getTarget();
         this.sequence = message.getSequence();
-        this.retry = message.getRetry();
     }
 
     @Override
     public void writeExternal(final ObjectOutput out) throws IOException {
         target.writeTo(out);
-        WritableObjects.writeLongs(out, sequence, retry);
+        WritableObjects.writeLong(out, sequence);
     }
 
     @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);
+        sequence = WritableObjects.readLong(in);
     }
 
     protected final Object readResolve() {
-        return Verify.verifyNotNull(createMessage(target, sequence, retry));
+        return Verify.verifyNotNull(createMessage(target, sequence));
     }
 
-    protected abstract @Nonnull T readTarget(@Nonnull DataInput in) throws IOException;
-    abstract @Nonnull C createMessage(@Nonnull T target, long sequence, long retry);
-}
\ No newline at end of file
+    @Nonnull
+    protected abstract T readTarget(@Nonnull DataInput in) throws IOException;
+
+    @Nonnull
+    abstract C createMessage(@Nonnull T msgTarget, long msgSequence);
+}