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 / commands / ConnectClientRequestProxyV1.java

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequestProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequestProxyV1.java
index 5fb26d071b4e59ff8f2d9a7c2aa7c0bf54daa69e..da3a601db75669ee0bc37d2ccbeeea2d69fdf5af 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequestProxyV1.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequestProxyV1.java
@@ -15,7 +15,6 @@ import java.io.ObjectOutput;
 import org.opendaylight.controller.cluster.access.ABIVersion;
 import org.opendaylight.controller.cluster.access.concepts.AbstractRequestProxy;
 import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
-import org.opendaylight.yangtools.concepts.WritableObjects;
 
 /**
  * Externalizable proxy for use with {@link ConnectClientRequest}. It implements the initial (Boron) serialization
@@ -26,8 +25,10 @@ import org.opendaylight.yangtools.concepts.WritableObjects;
 final class ConnectClientRequestProxyV1 extends AbstractRequestProxy<ClientIdentifier, ConnectClientRequest> {
     private ABIVersion minVersion;
     private ABIVersion maxVersion;
-    private long resumeSequence;
 
+    // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to
+    // be able to create instances via reflection.
+    @SuppressWarnings("checkstyle:RedundantModifier")
     public ConnectClientRequestProxyV1() {
         // for Externalizable
     }
@@ -36,7 +37,6 @@ final class ConnectClientRequestProxyV1 extends AbstractRequestProxy<ClientIdent
         super(request);
         this.minVersion = request.getMinVersion();
         this.maxVersion = request.getMaxVersion();
-        this.resumeSequence = request.getResumeSequence();
     }
 
     @Override
@@ -44,7 +44,6 @@ final class ConnectClientRequestProxyV1 extends AbstractRequestProxy<ClientIdent
         super.writeExternal(out);
         minVersion.writeTo(out);
         maxVersion.writeTo(out);
-        WritableObjects.writeLong(out, resumeSequence);
     }
 
     @Override
@@ -52,12 +51,12 @@ final class ConnectClientRequestProxyV1 extends AbstractRequestProxy<ClientIdent
         super.readExternal(in);
         minVersion = ABIVersion.inexactReadFrom(in);
         maxVersion = ABIVersion.inexactReadFrom(in);
-        resumeSequence = WritableObjects.readLong(in);
     }
 
     @Override
-    protected ConnectClientRequest createRequest(final ClientIdentifier target, final ActorRef replyTo) {
-        return new ConnectClientRequest(target, replyTo, minVersion, maxVersion, resumeSequence);
+    protected ConnectClientRequest createRequest(final ClientIdentifier target, final long sequence,
+            final ActorRef replyTo) {
+        return new ConnectClientRequest(target, sequence, replyTo, minVersion, maxVersion);
     }
 
     @Override