X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FShardLeaderStateChanged.java;h=cbf2cf9e0fb189d5b2c3ea2e090dca6dd29d111a;hb=b65e66f7b1bafb0d0c5fbe1c569835eb890f672a;hp=d9a55ab1e98e7c0f752e73035d8f25494e9f34d1;hpb=2890d49fb524bf060f7e95c83bc025df0b6980ed;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java
index d9a55ab1e9..cbf2cf9e0f 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java
@@ -7,11 +7,13 @@
  */
 package org.opendaylight.controller.cluster.datastore.messages;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import javax.annotation.Nonnull;
+import static java.util.Objects.requireNonNull;
+
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.controller.cluster.notifications.LeaderStateChanged;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.ReadOnlyDataTree;
 
 /**
  * A local message derived from LeaderStateChanged containing additional Shard-specific info that is sent
@@ -21,16 +23,21 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
  * @author Thomas Pantelis
  */
 public class ShardLeaderStateChanged extends LeaderStateChanged {
+    private final ReadOnlyDataTree localShardDataTree;
 
-    private final Optional<DataTree> localShardDataTree;
+    public ShardLeaderStateChanged(@NonNull String memberId, @Nullable String leaderId,
+            @NonNull ReadOnlyDataTree localShardDataTree, short leaderPayloadVersion) {
+        super(memberId, leaderId, leaderPayloadVersion);
+        this.localShardDataTree = requireNonNull(localShardDataTree);
+    }
 
-    public ShardLeaderStateChanged(@Nonnull String memberId, @Nonnull String leaderId,
-            @Nonnull Optional<DataTree> localShardDataTree) {
-        super(memberId, leaderId);
-        this.localShardDataTree = Preconditions.checkNotNull(localShardDataTree);
+    public ShardLeaderStateChanged(@NonNull String memberId, @Nullable String leaderId,
+            short leaderPayloadVersion) {
+        super(memberId, leaderId, leaderPayloadVersion);
+        this.localShardDataTree = null;
     }
 
-    public @Nonnull Optional<DataTree> getLocalShardDataTree() {
-        return localShardDataTree;
+    public @NonNull Optional<ReadOnlyDataTree> getLocalShardDataTree() {
+        return Optional.ofNullable(localShardDataTree);
     }
 }