Bump upstreams

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
index 43bf09eb8aceee72089911717bd8d6b5e6c2c556..d9fc2df8ac0050755f8e0323c9b1c9c0be62816e 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
@@ -55,7 +55,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction<TransactionIde
     }
 
     private static final Logger LOG = LoggerFactory.getLogger(TransactionProxy.class);
-    private static final DeleteOperation ROOT_DELETE_OPERATION = new DeleteOperation(YangInstanceIdentifier.empty());
+    private static final DeleteOperation ROOT_DELETE_OPERATION = new DeleteOperation(YangInstanceIdentifier.of());
 
     private final Map<String, AbstractTransactionContextWrapper> txContextWrappers = new TreeMap<>();
     private final AbstractTransactionContextFactory<?> txContextFactory;
@@ -111,7 +111,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction<TransactionIde
     private FluentFuture<Optional<NormalizedNode>> readAllData() {
         final var actorUtils = getActorUtils();
         return RootScatterGather.gather(actorUtils, actorUtils.getConfiguration().getAllShardNames().stream()
-            .map(shardName -> singleShardRead(shardName, YangInstanceIdentifier.empty())));
+            .map(shardName -> singleShardRead(shardName, YangInstanceIdentifier.of())));
     }
 
     @Override
@@ -146,7 +146,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction<TransactionIde
         if (!rootData.isEmpty()) {
             RootScatterGather.scatterTouched(rootData, this::wrapperFromRootChild).forEach(
                 scattered -> scattered.shard().maybeExecuteTransactionOperation(
-                    new MergeOperation(YangInstanceIdentifier.empty(), scattered.container())));
+                    new MergeOperation(YangInstanceIdentifier.of(), scattered.container())));
         }
     }
 
@@ -165,7 +165,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction<TransactionIde
         RootScatterGather.scatterAll(rootData, this::wrapperFromRootChild,
             getActorUtils().getConfiguration().getAllShardNames().stream().map(this::wrapperFromShardName)).forEach(
                 scattered -> scattered.shard().maybeExecuteTransactionOperation(
-                    new WriteOperation(YangInstanceIdentifier.empty(), scattered.container())));
+                    new WriteOperation(YangInstanceIdentifier.of(), scattered.container())));
     }
 
     private void executeModification(final TransactionModificationOperation operation) {
@@ -217,20 +217,15 @@ public class TransactionProxy extends AbstractDOMStoreTransaction<TransactionIde
 
         LOG.debug("Tx {} Readying {} components for commit", getIdentifier(), txContextWrappers.size());
 
-        final AbstractThreePhaseCommitCohort<?> ret;
-        switch (txContextWrappers.size()) {
-            case 0:
-                ret = NoOpDOMStoreThreePhaseCommitCohort.INSTANCE;
-                break;
-            case 1:
+        final AbstractThreePhaseCommitCohort<?> ret = switch (txContextWrappers.size()) {
+            case 0 -> NoOpDOMStoreThreePhaseCommitCohort.INSTANCE;
+            case 1 -> {
                 final Entry<String, AbstractTransactionContextWrapper> e = Iterables.getOnlyElement(
                         txContextWrappers.entrySet());
-                ret = createSingleCommitCohort(e.getKey(), e.getValue());
-                break;
-            default:
-                ret = createMultiCommitCohort();
-        }
-
+                yield createSingleCommitCohort(e.getKey(), e.getValue());
+            }
+            default -> createMultiCommitCohort();
+        };
         txContextFactory.onTransactionReady(getIdentifier(), ret.getCohortFutures());
 
         final Throwable debugContext = getDebugContext();
@@ -300,7 +295,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction<TransactionIde
     }
 
     private AbstractTransactionContextWrapper wrapperFromRootChild(final PathArgument childId) {
-        return wrapperFromShardName(shardNameFromIdentifier(YangInstanceIdentifier.create(childId)));
+        return wrapperFromShardName(shardNameFromIdentifier(YangInstanceIdentifier.of(childId)));
     }
 
     private AbstractTransactionContextWrapper wrapperFromShardName(final String shardName) {