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%2Fdatabroker%2Factors%2Fdds%2FShardBackendInfo.java;h=0958aade7156a304dbbb41fbac9755b2f8d79c34;hb=abaef4a5ae37f27542155457fe7306a4662b1eeb;hp=c906e1accc31204943c09d19481ec4d6207811b8;hpb=5737a84d651e42563da69c9d725eb653024ccde0;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ShardBackendInfo.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ShardBackendInfo.java
index c906e1accc..0958aade71 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ShardBackendInfo.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ShardBackendInfo.java
@@ -7,57 +7,51 @@
  */
 package org.opendaylight.controller.cluster.databroker.actors.dds;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
 import akka.actor.ActorRef;
 import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Preconditions;
 import com.google.common.primitives.UnsignedLong;
 import java.util.Optional;
-import javax.annotation.concurrent.ThreadSafe;
 import org.opendaylight.controller.cluster.access.ABIVersion;
 import org.opendaylight.controller.cluster.access.client.BackendInfo;
 import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.ReadOnlyDataTree;
 
 /**
  * Combined backend tracking. Aside from usual {@link BackendInfo}, this object also tracks the cookie assigned
- * to the shard. This assignment remains constant for as long as the client is not restarted.
+ * to the shard. This assignment remains constant for as long as the client is not restarted. This class is thread-safe.
  *
  * @author Robert Varga
  */
-@ThreadSafe
 final class ShardBackendInfo extends BackendInfo {
-    private final Optional<DataTree> dataTree;
+    private final Optional<ReadOnlyDataTree> dataTree;
     private final UnsignedLong cookie;
-    private final String shardName;
 
     ShardBackendInfo(final ActorRef actor, final long sessionId, final ABIVersion version, final String shardName,
-        final UnsignedLong cookie, final Optional<DataTree> dataTree, final int maxMessages) {
-        super(actor, sessionId, version, maxMessages);
-        this.shardName = Preconditions.checkNotNull(shardName);
-        this.cookie = Preconditions.checkNotNull(cookie);
-        this.dataTree = Preconditions.checkNotNull(dataTree);
+        final UnsignedLong cookie, final Optional<ReadOnlyDataTree> dataTree, final int maxMessages) {
+        super(actor, shardName, sessionId, version, maxMessages);
+        this.cookie = requireNonNull(cookie);
+        this.dataTree = requireNonNull(dataTree);
     }
 
     UnsignedLong getCookie() {
         return cookie;
     }
 
-    Optional<DataTree> getDataTree() {
+    Optional<ReadOnlyDataTree> getDataTree() {
         return dataTree;
     }
 
-    String getShardName() {
-        return shardName;
-    }
-
     LocalHistoryIdentifier brandHistory(final LocalHistoryIdentifier id) {
-        Preconditions.checkArgument(id.getCookie() == 0, "History %s is already branded", id);
+        checkArgument(id.getCookie() == 0, "History %s is already branded", id);
         return new LocalHistoryIdentifier(id.getClientId(), id.getHistoryId(), cookie.longValue());
     }
 
     @Override
     protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
-        return super.addToStringAttributes(toStringHelper).add("cookie", cookie).add("shard", shardName)
-                .add("dataTree", dataTree.orElse(null));
+        return super.addToStringAttributes(toStringHelper).add("cookie", cookie).add("shard", getName())
+                .add("dataTree", getDataTree().isPresent() ? "present" : "absent");
     }
 }