Migrate most of CDS to use java.util.Optional

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java
index aaef33e4af97ce035120b7a6aa189aef7dff737d..f425167f494e9001de322d879c5d0061aaf5f6c0 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java
@@ -291,7 +291,7 @@ public abstract class AbstractShardTest extends AbstractActorTest {
 
     public static NormalizedNode<?,?> readStore(final TestActorRef<? extends Shard> shard,
             final YangInstanceIdentifier id) {
 
     public static NormalizedNode<?,?> readStore(final TestActorRef<? extends Shard> shard,
             final YangInstanceIdentifier id) {

-        return shard.underlyingActor().getDataStore().readNode(id).orNull();
+        return shard.underlyingActor().getDataStore().readNode(id).orElse(null);

     }
 
     public static NormalizedNode<?,?> readStore(final DataTree store, final YangInstanceIdentifier id) {
     }
 
     public static NormalizedNode<?,?> readStore(final DataTree store, final YangInstanceIdentifier id) {