Migrate users of Optional.get()

[yangtools.git] / data / yang-data-tree-ri / src / main / java / org / opendaylight / yangtools / yang / data / tree / impl / AbstractNodeContainerModificationStrategy.java

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/AbstractNodeContainerModificationStrategy.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/AbstractNodeContainerModificationStrategy.java
index dd2a4a195514ffd095f7bb03e5a30cd66022ba8a..49d49f005cb11fb9e96d1e094c7f0ad7157f66e6 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/AbstractNodeContainerModificationStrategy.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/AbstractNodeContainerModificationStrategy.java
@@ -93,7 +93,7 @@ abstract class AbstractNodeContainerModificationStrategy<T extends WithStatus>
     AbstractNodeContainerModificationStrategy(final NormalizedNodeContainerSupport<?, ?> support,
             final DataTreeConfiguration treeConfig) {
         this.support = requireNonNull(support);
-        this.verifyChildrenStructure = treeConfig.getTreeType() == TreeType.CONFIGURATION;
+        verifyChildrenStructure = treeConfig.getTreeType() == TreeType.CONFIGURATION;
     }
 
     @Override
@@ -218,7 +218,7 @@ abstract class AbstractNodeContainerModificationStrategy<T extends WithStatus>
 
             final Optional<? extends TreeNode> result = resolveChildOperation(id).apply(mod, cm, nodeVersion);
             if (result.isPresent()) {
-                final TreeNode tn = result.get();
+                final TreeNode tn = result.orElseThrow();
                 meta.putChild(tn);
                 data.addChild(tn.getData());
             } else {
@@ -292,7 +292,7 @@ abstract class AbstractNodeContainerModificationStrategy<T extends WithStatus>
                     final Optional<? extends TreeNode> current = apply(modification, modification.getOriginal(),
                         Version.initial());
                     if (current.isPresent()) {
-                        modification.updateValue(LogicalOperation.WRITE, current.get().getData());
+                        modification.updateValue(LogicalOperation.WRITE, current.orElseThrow().getData());
                         mergeChildrenIntoModification(modification, children, version);
                         return;
                     }
@@ -368,7 +368,7 @@ abstract class AbstractNodeContainerModificationStrategy<T extends WithStatus>
                     "Node was deleted by other transaction.");
             }
         } else {
-            currentNode = current.get();
+            currentNode = current.orElseThrow();
         }
 
         checkChildPreconditions(path, modification, currentNode, version);
@@ -393,7 +393,7 @@ abstract class AbstractNodeContainerModificationStrategy<T extends WithStatus>
     protected final void checkMergeApplicable(final ModificationPath path, final NodeModification modification,
             final Optional<? extends TreeNode> current, final Version version) throws DataValidationFailedException {
         if (current.isPresent()) {
-            checkChildPreconditions(path, modification, current.get(), version);
+            checkChildPreconditions(path, modification, current.orElseThrow(), version);
         }
     }