Fix warnings in yang-model-api

[yangtools.git] / yang / yang-model-api / src / main / java / org / opendaylight / yangtools / yang / model / api / stmt / ModuleStatement.java

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java
index bea4422b59072bcb521ef465c357f5f7395ad14f..3f629c550f58caa64f741c71bfcba5e390ff2b6c 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java
@@ -22,16 +22,13 @@ public interface ModuleStatement extends MetaDeclaredStatement<String>, ModuleHe
         return opt.isPresent() ? opt.get() : null;
     }
 
-    @Nonnull
     @Override
     default NamespaceStatement getNamespace() {
-        final Optional<NamespaceStatement> opt = findFirstDeclaredSubstatement(NamespaceStatement.class);
-        return opt.isPresent() ? opt.get() : null;
+        return findFirstDeclaredSubstatement(NamespaceStatement.class).get();
     }
 
     @Override
     default PrefixStatement getPrefix() {
-        final Optional<PrefixStatement> opt = findFirstDeclaredSubstatement(PrefixStatement.class);
-        return opt.isPresent() ? opt.get() : null;
+        return findFirstDeclaredSubstatement(PrefixStatement.class).get();
     }
 }