Bug2268: Deprecate legacy Payload classes

Mark CompositeModificationByteStringPayload and
CompositeModificationPayload as deprecated.

Change-Id: I788baab09770d305c9fde9b4988fad9e58663ded
Signed-off-by: tpantelis <tpanteli@brocade.com>

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationByteStringPayload.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationByteStringPayload.java
index 99de5dde358ecb17ada94f8761f050c3c11ce6c7..83e10cf6afdf882a9df33e8de10f503536f0bba1 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationByteStringPayload.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationByteStringPayload.java
@@ -24,6 +24,7 @@ import org.opendaylight.controller.protobuff.messages.persistent.PersistentMessa
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Deprecated
 public class CompositeModificationByteStringPayload extends Payload implements
         Serializable {
     private static final long serialVersionUID = 1L;
@@ -96,6 +97,7 @@ public class CompositeModificationByteStringPayload extends Payload implements
         return null;
     }
 
+    @Override
     public int size(){
         return byteString.size();
     }

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationPayload.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationPayload.java
index 075c6075a86b327775d23f4c217794700b69611f..fe5043e73d3593ac4b2966c8cfac6148d909d0d0 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationPayload.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationPayload.java
@@ -18,9 +18,9 @@ import java.util.Map;
 import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages;
 import org.opendaylight.controller.protobuff.messages.persistent.PersistentMessages;
 
+@Deprecated
 public class CompositeModificationPayload extends Payload implements
     Serializable {
-    private static final long serialVersionUID = 1L;
 
     private final PersistentMessages.CompositeModification modification;
 
@@ -73,6 +73,7 @@ public class CompositeModificationPayload extends Payload implements
         return this.modification;
     }
 
+    @Override
     public int size(){
         return this.modification.getSerializedSize();
     }

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/Payload.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/Payload.java
index 7df53082948d0c69f4ea2c1223025821bd5946bd..d721494e15fcde76eb9b4f4e4f42a8e3e41bdd87 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/Payload.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/Payload.java
@@ -51,16 +51,11 @@ import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntries
  *
  */
 public abstract class Payload {
-    private String clientPayloadClassName;
 
     public String getClientPayloadClassName() {
         return this.getClass().getName();
     }
 
-    public void setClientPayloadClassName(String clientPayloadClassName) {
-        this.clientPayloadClassName = clientPayloadClassName;
-    }
-
     /**
      * Encode the payload data as a protocol buffer extension.
      * <p>
@@ -68,6 +63,7 @@ public abstract class Payload {
      * @param <T>
      * @return Map of <GeneratedMessage.GeneratedExtension, T>
      */
+    @Deprecated
     public abstract <T extends Object> Map<GeneratedMessage.GeneratedExtension, T> encode();
 
     /**
@@ -77,11 +73,9 @@ public abstract class Payload {
      * @param payload The payload in protocol buffer format
      * @return
      */
+    @Deprecated
     public abstract Payload decode(
         AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.Payload payload);
 
     public abstract int size();
-
-
-
 }

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java
index 5a5387f3bc57c680978fe6ba9b53a6b0dadda0ab..5b7002eda2aafe923c0ad5d3b20addfd095b8a3e 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java
@@ -24,6 +24,7 @@ import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
+@Deprecated
 public class CompositeModificationByteStringPayloadTest {
 
     private static final SchemaContext SCHEMA_CONTEXT = TestModel.createTestContext();

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayloadTest.java
index 6fca38a4d83cdae125f9822b7b39c49414ae5f60..a55f6b865d127b9f6f4abe33cd9cbb227ab2839f 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayloadTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayloadTest.java
@@ -18,6 +18,7 @@ import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
 import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 
+@Deprecated
 public class CompositeModificationPayloadTest {
 
     @Test