X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FAbstractTransactionProxyTest.java;h=d3ae761b599198a06b12b63774d51d955c19af7b;hb=546cd1fd100dbaa36908b22c2f422320dbd8c4b2;hp=51435475753dbc73419f03e8dd6fb847bcba635c;hpb=abaef4a5ae37f27542155457fe7306a4662b1eeb;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java index 5143547575..d3ae761b59 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java @@ -76,7 +76,6 @@ import org.opendaylight.controller.cluster.datastore.utils.MockConfiguration; import org.opendaylight.controller.cluster.raft.utils.DoNothingActor; import org.opendaylight.controller.md.cluster.datastore.model.CarsModel; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; -import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.ReadFailedException; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -105,22 +104,12 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { public String findShard(final YangInstanceIdentifier path) { return TestModel.JUNK_QNAME.getLocalName(); } - - @Override - public YangInstanceIdentifier getPrefixForPath(final YangInstanceIdentifier path) { - return YangInstanceIdentifier.empty(); - } }).put( CarsModel.BASE_QNAME.getLocalName(), new ShardStrategy() { @Override public String findShard(final YangInstanceIdentifier path) { return CarsModel.BASE_QNAME.getLocalName(); } - - @Override - public YangInstanceIdentifier getPrefixForPath(final YangInstanceIdentifier path) { - return YangInstanceIdentifier.empty(); - } }).build(); @Override @@ -178,8 +167,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { doReturn(getSystem()).when(mockActorContext).getActorSystem(); doReturn(getSystem().dispatchers().defaultGlobalDispatcher()).when(mockActorContext).getClientDispatcher(); doReturn(MemberName.forName(memberName)).when(mockActorContext).getCurrentMemberName(); - doReturn(new ShardStrategyFactory(configuration, - LogicalDatastoreType.CONFIGURATION)).when(mockActorContext).getShardStrategyFactory(); + doReturn(new ShardStrategyFactory(configuration)).when(mockActorContext).getShardStrategyFactory(); doReturn(SCHEMA_CONTEXT).when(mockActorContext).getSchemaContext(); doReturn(new Timeout(operationTimeoutInSeconds, TimeUnit.SECONDS)).when(mockActorContext).getOperationTimeout(); doReturn(mockClusterWrapper).when(mockActorContext).getClusterWrapper();