Fix OpenApi ignoring min-elements for list

Replace orElse(null).get() with orElseThrow().get() because
it can produce NullPointerException

JIRA: NETCONF-1172
Change-Id: If0b48b474f6a3e6ed4f6b939b9f5a0709c0244a7
Signed-off-by: Matej Sramcik <matej.sramcik@pantheon.tech>

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/DefinitionGenerator.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/DefinitionGenerator.java
index b39116a080aa3f681e100bf618c7fc1e2d5e3da7..ce05f95bcc581e76a9a1b3ccb603a80d605b26db 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/DefinitionGenerator.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/DefinitionGenerator.java
@@ -245,9 +245,9 @@ public final class DefinitionGenerator {
             dataNodeProperties.items(items);
             dataNodeProperties.description(schemaNode.getDescription().orElse(""));
             if (node.getElementCountConstraint().isPresent()) {
-                final var minElements = node.getElementCountConstraint().orElse(null).getMinElements();
+                final var minElements = node.getElementCountConstraint().orElseThrow().getMinElements();
                 dataNodeProperties.minItems(minElements);
-                dataNodeProperties.maxItems(node.getElementCountConstraint().orElse(null).getMaxElements());
+                dataNodeProperties.maxItems(node.getElementCountConstraint().orElseThrow().getMaxElements());
                 if (minElements != null) {
                     dataNodeProperties.example(createExamples(node, minElements));
                 }