Fix warnings in odlext support

This fixes warnings reported in odlext-model-api and odlext-parser-support,
and enables findbugs enforcement.

Change-Id: I97d0f98052d36fbbbee1590abbc33ad4e9db07a8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/odlext-model-api/pom.xml b/yang/odlext-model-api/pom.xml
index 7cfd60c4a409bd79d4ce75aa020dafc09d41aaf3..198b185a501f3e80ee24390f4e7ea8951d2e101b 100644 (file)
--- a/yang/odlext-model-api/pom.xml
+++ b/yang/odlext-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/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsStatements.java b/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsStatements.java
index 5fd1acbc4e66aebec004eba6739efadc6558bf5a..6a9da2f8674a5137aa2a57935bd41698e1f8297f 100644 (file)
--- a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsStatements.java
+++ b/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsStatements.java
@@ -42,16 +42,6 @@ public enum OpenDaylightExtensionsStatements implements StatementDefinition {
         this.effectiveRepresentation = requireNonNull(effectiveRepresentation);
     }
 
-    @Nonnull
-    private static QName createQName(final String namespace, final String localName) {
-        return QName.create(namespace, localName).intern();
-    }
-
-    @Nonnull
-    private static QName createQName(final String namespace, final String revision, final String localName) {
-        return QName.create(namespace, revision, localName).intern();
-    }
-
     @Nonnull
     @Override
     public QName getStatementName() {

diff --git a/yang/odlext-parser-support/pom.xml b/yang/odlext-parser-support/pom.xml
index 862ce5b7baec03e0e760027f4e1e0b84062168bd..77871666e5a80fb04f19fb954e049f12de1cdc54 100644 (file)
--- a/yang/odlext-parser-support/pom.xml
+++ b/yang/odlext-parser-support/pom.xml
@@ -66,6 +66,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/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlStatementSupportOverride.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlStatementSupportOverride.java
index 2a1700c80b63d4b64d6c19a46753034c86e24ef9..86c88734320d709a25964597cf1fd73d6cd936a2 100644 (file)
--- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlStatementSupportOverride.java
+++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlStatementSupportOverride.java
@@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier;
-import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.SchemaNodeIdentifierBuildNamespace;
+import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.ChildSchemaNodeNamespace;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.anyxml.AnyxmlStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ForwardingStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport;
@@ -69,7 +69,7 @@ public final class AnyxmlStatementSupportOverride
     private static Optional<ContainerSchemaNode> getAnyXmlSchema(
             final StmtContext<QName, AnyxmlStatement, AnyxmlEffectiveStatement> ctx,
             final SchemaNodeIdentifier contentSchemaPath) {
-        return SchemaNodeIdentifierBuildNamespace.findNode(ctx.getRoot(), contentSchemaPath)
+        return ChildSchemaNodeNamespace.findNode(ctx.getRoot(), contentSchemaPath)
                 .map(StmtContext::buildEffective)
                 .filter(ContainerSchemaNode.class::isInstance).map(ContainerSchemaNode.class::cast);
     }

diff --git a/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java b/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java
index fb5e14f6621fb594fa21a8f6fa37222f67389770..e48baba6066f395ba7f77fa8a686eaedfa019660 100644 (file)
--- a/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java
+++ b/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java
@@ -63,7 +63,7 @@ public class Bug3874ExtensionTest {
         QName myContainer2QName = QName.create(foo, "my-container-2");
         QName myAnyXmlDataQName = QName.create(foo, "my-anyxml-data");
 
-        DataSchemaNode dataChildByName = context.getDataChildByName(myAnyXmlDataQName);
+        DataSchemaNode dataChildByName = context.findDataChildByName(myAnyXmlDataQName).get();
         assertTrue(dataChildByName instanceof YangModeledAnyXmlSchemaNode);
         YangModeledAnyXmlSchemaNode yangModeledAnyXml = (YangModeledAnyXmlSchemaNode) dataChildByName;