X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2Fprotobuff%2Fclient%2Fmessages%2FCompositeModificationByteStringPayload.java;h=1dae675d3ca684fe58caa814b1ce8ae9521077f4;hp=99de5dde358ecb17ada94f8761f050c3c11ce6c7;hb=8ec73bf853a9b6708b455c0321a585992e02b125;hpb=40e45134508bcbcbcf2aa188c8770e8366d92b82

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..1dae675d3c 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
@@ -11,19 +11,15 @@ package org.opendaylight.controller.cluster.raft.protobuff.client.messages;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.protobuf.ByteString;
-import com.google.protobuf.GeneratedMessage;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.UnknownFieldSet;
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.ref.SoftReference;
-import java.util.HashMap;
-import java.util.Map;
-import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages;
 import org.opendaylight.controller.protobuff.messages.persistent.PersistentMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Deprecated
 public class CompositeModificationByteStringPayload extends Payload implements
         Serializable {
     private static final long serialVersionUID = 1L;
@@ -44,39 +40,6 @@ public class CompositeModificationByteStringPayload extends Payload implements
         this.byteString = Preconditions.checkNotNull(byteString, "byteString should not be null");
     }
 
-
-    @Override
-    public Map<GeneratedMessage.GeneratedExtension, PersistentMessages.CompositeModification> encode() {
-        Preconditions.checkState(byteString!=null);
-        Map<GeneratedMessage.GeneratedExtension, PersistentMessages.CompositeModification> map = new HashMap<>();
-        map.put(org.opendaylight.controller.protobuff.messages.shard.CompositeModificationPayload.modification,
-                getModificationInternal());
-        return map;
-    }
-
-    @Override
-    public Payload decode(
-            AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.Payload payload) {
-        PersistentMessages.CompositeModification modification = payload
-                .getExtension(
-                        org.opendaylight.controller.protobuff.messages.shard.CompositeModificationPayload.modification);
-
-        // The extension was put in the unknown field.
-        // This is because extensions need to be registered
-        // see org.opendaylight.controller.mdsal.CompositeModificationPayload.registerAllExtensions
-        // also see https://developers.google.com/protocol-buffers/docs/reference/java/com/google/protobuf/ExtensionRegistry
-        // If that is not done then on the other end the extension shows up as an unknown field
-        // Need to figure out a better way to do this
-        if(payload.getUnknownFields().hasField(2)){
-            UnknownFieldSet.Field field =
-                    payload.getUnknownFields().getField(2);
-
-            return new CompositeModificationByteStringPayload(field.getLengthDelimitedList().get(0));
-        }
-
-        return new CompositeModificationByteStringPayload(modification);
-    }
-
     public Object getModification(){
         return getModificationInternal();
     }
@@ -96,6 +59,7 @@ public class CompositeModificationByteStringPayload extends Payload implements
         return null;
     }
 
+    @Override
     public int size(){
         return byteString.size();
     }