Migrate users of Optional.get()
[yangtools.git] / data / yang-data-tree-ri / src / test / java / org / opendaylight / yangtools / yang / data / tree / impl / ModificationMetadataTreeTest.java
index 87d15a9516532285a4e08330cdf081f483358969..0495d89e7c660db2e5e0bbea46650789a9663626 100644 (file)
@@ -138,7 +138,7 @@ public class ModificationMetadataTreeTest extends AbstractTestModelTest {
                 TreeNode.of(createDocumentOne(), Version.initial()), rootOper), rootOper);
         final Optional<NormalizedNode> originalBarNode = modificationTree.readNode(OUTER_LIST_2_PATH);
         assertTrue(originalBarNode.isPresent());
-        assertSame(BAR_NODE, originalBarNode.get());
+        assertSame(BAR_NODE, originalBarNode.orElseThrow());
 
         // writes node to /outer-list/1/inner_list/two/value
         modificationTree.write(TWO_TWO_VALUE_PATH, ImmutableNodes.leafNode(TestModel.VALUE_QNAME, "test"));
@@ -147,7 +147,7 @@ public class ModificationMetadataTreeTest extends AbstractTestModelTest {
         // and checks if node is already present
         final Optional<NormalizedNode> barTwoCModified = modificationTree.readNode(TWO_TWO_VALUE_PATH);
         assertTrue(barTwoCModified.isPresent());
-        assertEquals(ImmutableNodes.leafNode(TestModel.VALUE_QNAME, "test"), barTwoCModified.get());
+        assertEquals(ImmutableNodes.leafNode(TestModel.VALUE_QNAME, "test"), barTwoCModified.orElseThrow());
 
         // delete node to /outer-list/1/inner_list/two/value
         modificationTree.delete(TWO_TWO_VALUE_PATH);
@@ -218,7 +218,7 @@ public class ModificationMetadataTreeTest extends AbstractTestModelTest {
     private static <T> T assertPresentAndType(final Optional<?> potential, final Class<T> type) {
         assertNotNull(potential);
         assertTrue(potential.isPresent());
-        assertTrue(type.isInstance(potential.get()));
-        return type.cast(potential.get());
+        assertTrue(type.isInstance(potential.orElseThrow()));
+        return type.cast(potential.orElseThrow());
     }
 }