From 25a9b4bf890e000359c46e74a13db8dbb6f0a697 Mon Sep 17 00:00:00 2001 From: tpantelis Date: Wed, 21 Jan 2015 16:18:17 -0500 Subject: [PATCH] Bug2268: Deprecate legacy Payload classes Mark CompositeModificationByteStringPayload and CompositeModificationPayload as deprecated. Change-Id: I788baab09770d305c9fde9b4988fad9e58663ded Signed-off-by: tpantelis --- .../CompositeModificationByteStringPayload.java | 2 ++ .../client/messages/CompositeModificationPayload.java | 3 ++- .../raft/protobuff/client/messages/Payload.java | 10 ++-------- .../CompositeModificationByteStringPayloadTest.java | 1 + .../datastore/CompositeModificationPayloadTest.java | 1 + 5 files changed, 8 insertions(+), 9 deletions(-) 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 99de5dde35..83e10cf6af 100644 --- 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 075c6075a8..fe5043e73d 100644 --- 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 7df5308294..d721494e15 100644 --- 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. *

@@ -68,6 +63,7 @@ public abstract class Payload { * @param * @return Map of */ + @Deprecated public abstract Map 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 5a5387f3bc..5b7002eda2 100644 --- 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 6fca38a4d8..a55f6b865d 100644 --- 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 -- 2.36.6