From 6e8b8fd5d84bb1186ef11cf0dd06d7298cb181a7 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 11 Sep 2018 11:56:33 +0200
Subject: [PATCH] Fix warnings in yang-model-api

This fixes warnings reported in yang-model-api and enables findbugs
enforcement.

Change-Id: Iad35b5ba7c4b9c0373dbcf7be2d696cb66755600
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 yang/yang-model-api/pom.xml                                | 7 +++++++
 .../yangtools/yang/model/api/stmt/BelongsToStatement.java  | 4 +---
 .../yangtools/yang/model/api/stmt/ImportStatement.java     | 3 +--
 .../yangtools/yang/model/api/stmt/ModuleStatement.java     | 7 ++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml
index e1758dd531..7a71e00701 100644
--- a/yang/yang-model-api/pom.xml
+++ b/yang/yang-model-api/pom.xml
@@ -60,6 +60,13 @@
                     <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <configuration>
+                    <failOnError>true</failOnError>
+                </configuration>
+           </plugin>
         </plugins>
     </build>
 
diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToStatement.java
index 30600e10a0..8a7df9685b 100644
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import java.util.Optional;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 
@@ -17,8 +16,7 @@ public interface BelongsToStatement extends DeclaredStatement<String> {
     }
 
     default @Nonnull PrefixStatement getPrefix() {
-        final Optional<PrefixStatement> opt = findFirstDeclaredSubstatement(PrefixStatement.class);
-        return opt.isPresent() ? opt.get() : null;
+        return findFirstDeclaredSubstatement(PrefixStatement.class).get();
     }
 }
 
diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportStatement.java
index fd5443ce78..460a80b281 100644
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportStatement.java
@@ -17,8 +17,7 @@ public interface ImportStatement extends DocumentedDeclaredStatement<String> {
     }
 
     default @Nonnull PrefixStatement getPrefix() {
-        final Optional<PrefixStatement> opt = findFirstDeclaredSubstatement(PrefixStatement.class);
-        return opt.isPresent() ? opt.get() : null;
+        return findFirstDeclaredSubstatement(PrefixStatement.class).get();
     }
 
     default @Nullable RevisionDateStatement getRevisionDate() {
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 bea4422b59..3f629c550f 100644
--- 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();
     }
 }
-- 
2.36.6