Migrate users of Optional.get()

[yangtools.git] / parser / yang-parser-rfc7950 / src / test / java / org / opendaylight / yangtools / yang / stmt / Bug5396Test.java

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java
index a4b6d86925d176c92652fed9b0f01e30bb866189..24d292caee2e3f626af7de99d79aad46834f1eb0 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java
@@ -11,13 +11,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
-import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaNode;
-import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
 
@@ -29,44 +25,42 @@ class Bug5396Test extends AbstractYangTest {
         QName root = QName.create("foo", "root");
         QName myLeaf2 = QName.create("foo", "my-leaf2");
 
-        SchemaNode findDataSchemaNode = context.findDataTreeChild(root, myLeaf2).get();
+        var findDataSchemaNode = context.findDataTreeChild(root, myLeaf2).orElseThrow();
 
-        LeafSchemaNode leaf2 = assertInstanceOf(LeafSchemaNode.class, findDataSchemaNode);
-        TypeDefinition<?> type = leaf2.getType();
-
-        UnionTypeDefinition union = assertInstanceOf(UnionTypeDefinition.class, type);
-        List<TypeDefinition<?>> types = union.getTypes();
+        var leaf2 = assertInstanceOf(LeafSchemaNode.class, findDataSchemaNode);
+        var union = assertInstanceOf(UnionTypeDefinition.class, leaf2.getType());
+        var types = union.getTypes();
 
         assertEquals(4, types.size());
 
-        TypeDefinition<?> type0 = types.get(0);
-        TypeDefinition<?> type1 = types.get(1);
-        TypeDefinition<?> type2 = types.get(2);
-        TypeDefinition<?> type3 = types.get(3);
+        var type0 = types.get(0);
+        var type1 = types.get(1);
+        var type2 = types.get(2);
+        var type3 = types.get(3);
 
         assertNotEquals(type0, type1);
         assertNotEquals(type0, type2);
         assertNotEquals(type0, type3);
 
-        StringTypeDefinition stringType0 = assertInstanceOf(StringTypeDefinition.class, type0);
-        StringTypeDefinition stringType1 = assertInstanceOf(StringTypeDefinition.class, type1);
-        StringTypeDefinition stringType2 = assertInstanceOf(StringTypeDefinition.class, type2);
-        StringTypeDefinition stringType3 = assertInstanceOf(StringTypeDefinition.class, type3);
+        var stringType0 = assertInstanceOf(StringTypeDefinition.class, type0);
+        var stringType1 = assertInstanceOf(StringTypeDefinition.class, type1);
+        var stringType2 = assertInstanceOf(StringTypeDefinition.class, type2);
+        var stringType3 = assertInstanceOf(StringTypeDefinition.class, type3);
 
-        final List<PatternConstraint> patternConstraints0 = stringType0.getPatternConstraints();
-        final List<PatternConstraint> patternConstraints1 = stringType1.getPatternConstraints();
-        final List<PatternConstraint> patternConstraints2 = stringType2.getPatternConstraints();
-        final List<PatternConstraint> patternConstraints3 = stringType3.getPatternConstraints();
+        final var patternConstraints0 = stringType0.getPatternConstraints();
+        final var patternConstraints1 = stringType1.getPatternConstraints();
+        final var patternConstraints2 = stringType2.getPatternConstraints();
+        final var patternConstraints3 = stringType3.getPatternConstraints();
 
         assertEquals(1, patternConstraints0.size());
         assertEquals(1, patternConstraints1.size());
         assertEquals(1, patternConstraints2.size());
         assertEquals(1, patternConstraints3.size());
 
-        final PatternConstraint patternConstraint0 = patternConstraints0.get(0);
-        final PatternConstraint patternConstraint1 = patternConstraints1.get(0);
-        final PatternConstraint patternConstraint2 = patternConstraints2.get(0);
-        final PatternConstraint patternConstraint3 = patternConstraints3.get(0);
+        final var patternConstraint0 = patternConstraints0.get(0);
+        final var patternConstraint1 = patternConstraints1.get(0);
+        final var patternConstraint2 = patternConstraints2.get(0);
+        final var patternConstraint3 = patternConstraints3.get(0);
 
         assertEquals("^(?:dp[0-9]+o[0-9]+(d[0-9]+)?)$", patternConstraint0.getJavaPatternString());
         assertEquals("^(?:dp[0-9]+s[0-9]+(f[0-9]+)?(d[0-9]+)?)$", patternConstraint1.getJavaPatternString());