Adjust to yangtools-2.0.0 changes

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / Shard.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
index 402bf4822b01a1f56a12ebfcbf1a2296c24d4fb2..d7bbc1ca3c19a7ffb59f8424635fcfc153ecd0cc 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
@@ -103,8 +103,8 @@ import org.opendaylight.controller.cluster.raft.messages.RequestLeadership;
 import org.opendaylight.controller.cluster.raft.messages.ServerRemoved;
 import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
 import org.opendaylight.yangtools.concepts.Identifier;
 import org.opendaylight.controller.cluster.raft.messages.ServerRemoved;
 import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
 import org.opendaylight.yangtools.concepts.Identifier;

+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;

 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;

-import org.opendaylight.yangtools.yang.data.api.schema.tree.TipProducingDataTree;

 import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;


@@ -1025,7 +1025,7 @@ public class Shard extends RaftActor {
         private DatastoreContext datastoreContext;
         private SchemaContextProvider schemaContextProvider;
         private DatastoreSnapshot.ShardSnapshot restoreFromSnapshot;
         private DatastoreContext datastoreContext;
         private SchemaContextProvider schemaContextProvider;
         private DatastoreSnapshot.ShardSnapshot restoreFromSnapshot;

-        private TipProducingDataTree dataTree;
+        private DataTree dataTree;

         private volatile boolean sealed;
 
         protected AbstractBuilder(final Class<S> shardClass) {
         private volatile boolean sealed;
 
         protected AbstractBuilder(final Class<S> shardClass) {


@@ -1059,9 +1059,9 @@ public class Shard extends RaftActor {
             return self();
         }
 
             return self();
         }
 

-        public T schemaContextProvider(final SchemaContextProvider schemaContextProvider) {
+        public T schemaContextProvider(final SchemaContextProvider newSchemaContextProvider) {

             checkSealed();
             checkSealed();

-            this.schemaContextProvider = Preconditions.checkNotNull(schemaContextProvider);
+            this.schemaContextProvider = Preconditions.checkNotNull(newSchemaContextProvider);

             return self();
         }
 
             return self();
         }
 


@@ -1071,7 +1071,7 @@ public class Shard extends RaftActor {
             return self();
         }
 
             return self();
         }
 

-        public T dataTree(final TipProducingDataTree newDataTree) {
+        public T dataTree(final DataTree newDataTree) {

             checkSealed();
             this.dataTree = newDataTree;
             return self();
             checkSealed();
             this.dataTree = newDataTree;
             return self();


@@ -1097,7 +1097,7 @@ public class Shard extends RaftActor {
             return restoreFromSnapshot;
         }
 
             return restoreFromSnapshot;
         }
 

-        public TipProducingDataTree getDataTree() {
+        public DataTree getDataTree() {

             return dataTree;
         }
 
             return dataTree;
         }
 


@@ -1128,7 +1128,7 @@ public class Shard extends RaftActor {
     }
 
     public static class Builder extends AbstractBuilder<Builder, Shard> {
     }
 
     public static class Builder extends AbstractBuilder<Builder, Shard> {

-        private Builder() {
+        Builder() {

             super(Shard.class);
         }
     }
             super(Shard.class);
         }
     }