Migrate users of Optional.get()

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContextFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContextFactory.java
index 6941d1904c665827938d54f68defc423a70eb9e3..fa77b5fdb000610daf9e4fcde8da0d1e0efe7eaf 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContextFactory.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContextFactory.java
@@ -24,7 +24,7 @@ import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.ReadOnlyDataTree;
+import org.opendaylight.yangtools.yang.data.tree.api.ReadOnlyDataTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import scala.concurrent.Future;
@@ -171,7 +171,8 @@ abstract class AbstractTransactionContextFactory<F extends LocalTransactionFacto
             if (!knownLocal.containsKey(shardName)) {
                 LOG.debug("Shard {} resolved to local data tree - adding local factory", shardName);
 
-                F factory = factoryForShard(shardName, primaryShardInfo.getPrimaryShardActor(), maybeDataTree.get());
+                F factory = factoryForShard(shardName, primaryShardInfo.getPrimaryShardActor(),
+                    maybeDataTree.orElseThrow());
                 knownLocal.putIfAbsent(shardName, factory);
             }
         } else if (knownLocal.containsKey(shardName)) {
@@ -232,11 +233,10 @@ abstract class AbstractTransactionContextFactory<F extends LocalTransactionFacto
 
     private static TransactionContext createLocalTransactionContext(final LocalTransactionFactory factory,
                                                                     final TransactionProxy parent) {
-
-        switch (parent.getType()) {
-            case READ_ONLY:
+        return switch (parent.getType()) {
+            case READ_ONLY -> {
                 final DOMStoreReadTransaction readOnly = factory.newReadOnlyTransaction(parent.getIdentifier());
-                return new LocalTransactionContext(readOnly, parent.getIdentifier(), factory) {
+                yield new LocalTransactionContext(readOnly, parent.getIdentifier(), factory) {
                     @Override
                     DOMStoreWriteTransaction getWriteDelegate() {
                         throw new UnsupportedOperationException();
@@ -247,9 +247,10 @@ abstract class AbstractTransactionContextFactory<F extends LocalTransactionFacto
                         return readOnly;
                     }
                 };
-            case READ_WRITE:
+            }
+            case READ_WRITE -> {
                 final DOMStoreReadWriteTransaction readWrite = factory.newReadWriteTransaction(parent.getIdentifier());
-                return new LocalTransactionContext(readWrite, parent.getIdentifier(), factory) {
+                yield new LocalTransactionContext(readWrite, parent.getIdentifier(), factory) {
                     @Override
                     DOMStoreWriteTransaction getWriteDelegate() {
                         return readWrite;
@@ -260,9 +261,10 @@ abstract class AbstractTransactionContextFactory<F extends LocalTransactionFacto
                         return readWrite;
                     }
                 };
-            case WRITE_ONLY:
+            }
+            case WRITE_ONLY -> {
                 final DOMStoreWriteTransaction writeOnly = factory.newWriteOnlyTransaction(parent.getIdentifier());
-                return new LocalTransactionContext(writeOnly, parent.getIdentifier(), factory) {
+                yield new LocalTransactionContext(writeOnly, parent.getIdentifier(), factory) {
                     @Override
                     DOMStoreWriteTransaction getWriteDelegate() {
                         return writeOnly;
@@ -273,8 +275,8 @@ abstract class AbstractTransactionContextFactory<F extends LocalTransactionFacto
                         throw new UnsupportedOperationException();
                     }
                 };
-            default:
-                throw new IllegalArgumentException("Invalid transaction type: " + parent.getType());
-        }
+            }
+            default -> throw new IllegalArgumentException("Invalid transaction type: " + parent.getType());
+        };
     }
 }