Merge "Move the CompositeModificatoinPayload message to proper package The package...

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/mdsal/CompositeModificationPayload.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/shard/CompositeModificationPayload.java
similarity index 91%
rename from opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/mdsal/CompositeModificationPayload.java
rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/shard/CompositeModificationPayload.java
index 87b246bd7e631f6e4d752f673137aa80c8186b95..ca578a88aad2ae6c0155a98bd949de2e09d1fa44 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/mdsal/CompositeModificationPayload.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/shard/CompositeModificationPayload.java
@@ -1,13 +1,13 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: CompositeModificationPayload.proto
 
-package org.opendaylight.controller.mdsal;
+package org.opendaylight.controller.protobuff.messages.shard;
 
 public final class CompositeModificationPayload {
   private CompositeModificationPayload() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
-    registry.add(org.opendaylight.controller.mdsal.CompositeModificationPayload.modification);
+    registry.add(org.opendaylight.controller.protobuff.messages.shard.CompositeModificationPayload.modification);
   }
   public static final int MODIFICATION_FIELD_NUMBER = 2;
   /**
@@ -36,7 +36,8 @@ public final class CompositeModificationPayload {
       "daylight.controller.cluster.raft.AppendE" +
       "ntries.ReplicatedLogEntry.Payload\030\002 \001(\0132" +
       "8.org.opendaylight.controller.mdsal.Comp" +
-      "ositeModification"
+      "ositeModificationB6\n4org.opendaylight.co" +
+      "ntroller.protobuff.messages.shard"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/resources/CompositeModificationPayload.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/CompositeModificationPayload.proto
index b571cd25c57cc09063f442491b82b6c0647e7531..e824e9e3ae3abb56c88e140ae73baf1d6e72fd71 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/resources/CompositeModificationPayload.proto
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/CompositeModificationPayload.proto
@@ -4,6 +4,8 @@ import "AppendEntriesMessages.proto";
 import "Common.proto";
 import "Persistent.proto";
 
+option java_package = "org.opendaylight.controller.protobuff.messages.shard";
+
 extend org.opendaylight.controller.cluster.raft.AppendEntries.ReplicatedLogEntry.Payload {
     optional CompositeModification modification=2;
 }

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayload.java
index d0abb20718bd87dfc13f862bbe6f4672878abc35..36c0447b6e90d35c8f54f8844cf762c3fc0e1897 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayload.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayload.java
@@ -35,7 +35,8 @@ public class CompositeModificationPayload extends Payload implements
     @Override public Map<GeneratedMessage.GeneratedExtension, PersistentMessages.CompositeModification> encode() {
         Preconditions.checkState(modification!=null);
         Map<GeneratedMessage.GeneratedExtension, PersistentMessages.CompositeModification> map = new HashMap<>();
-        map.put(org.opendaylight.controller.mdsal.CompositeModificationPayload.modification, this.modification);
+        map.put(
+            org.opendaylight.controller.protobuff.messages.shard.CompositeModificationPayload.modification, this.modification);
         return map;
     }
 
@@ -43,7 +44,7 @@ public class CompositeModificationPayload extends Payload implements
         AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.Payload payload) {
         PersistentMessages.CompositeModification modification = payload
             .getExtension(
-                org.opendaylight.controller.mdsal.CompositeModificationPayload.modification);
+                org.opendaylight.controller.protobuff.messages.shard.CompositeModificationPayload.modification);