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=cef20af650e295eeb7c23f7d66ec6d0b8b85ea3d;hb=bde80dd9d3f7e9362a06d7f5e88cda501ed41387;hpb=ae11ac10dfd3579b1b685455ea642bbb08de68f1 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 cef20af650..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,13 +9,7 @@ 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 @@ -31,44 +25,6 @@ public class CompositeModificationPayload extends Payload implements this.modification = (PersistentMessages.CompositeModification) Preconditions.checkNotNull(modification, "modification should not be null"); } - @Override public Map, PersistentMessages.CompositeModification> encode() { - Preconditions.checkState(modification!=null); - Map, PersistentMessages.CompositeModification> 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; }