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%2FCompositeModificationPayload.java;h=bcb45d3dd7880a66d7851fec916e8ca143e51ead;hp=075c6075a86b327775d23f4c217794700b69611f;hb=8ec73bf853a9b6708b455c0321a585992e02b125;hpb=b52893a2ff963a4a02a96190d78f62e9d261ffce 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..bcb45d3dd7 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 @@ -9,18 +9,12 @@ package org.opendaylight.controller.cluster.raft.protobuff.client.messages; import com.google.common.base.Preconditions; -import com.google.protobuf.GeneratedMessage; -import com.google.protobuf.InvalidProtocolBufferException; -import com.google.protobuf.UnknownFieldSet; import java.io.Serializable; -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; +@Deprecated public class CompositeModificationPayload extends Payload implements Serializable { - private static final long serialVersionUID = 1L; private final PersistentMessages.CompositeModification modification; @@ -31,48 +25,11 @@ public class CompositeModificationPayload extends Payload implements this.modification = (PersistentMessages.CompositeModification) Preconditions.checkNotNull(modification, "modification should not be null"); } - @Override public Map encode() { - Preconditions.checkState(modification!=null); - Map map = new HashMap<>(); - map.put( - org.opendaylight.controller.protobuff.messages.shard.CompositeModificationPayload.modification, this.modification); - 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); - - try { - modification = - PersistentMessages.CompositeModification - .parseFrom(field.getLengthDelimitedList().get(0)); - } catch (InvalidProtocolBufferException e) { - - } - } - - return new CompositeModificationPayload(modification); - } - public Object getModification(){ return this.modification; } + @Override public int size(){ return this.modification.getSerializedSize(); }