From 1e5e850dae0e6c5c1eb1225c9774792a17c566ff Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 11 Sep 2018 10:33:43 +0200 Subject: [PATCH] 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 --- yang/odlext-model-api/pom.xml | 7 +++++++ .../model/api/OpenDaylightExtensionsStatements.java | 10 ---------- yang/odlext-parser-support/pom.xml | 7 +++++++ .../odlext/parser/AnyxmlStatementSupportOverride.java | 4 ++-- .../yangtools/odlext/parser/Bug3874ExtensionTest.java | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/yang/odlext-model-api/pom.xml b/yang/odlext-model-api/pom.xml index 7cfd60c4a4..198b185a50 100644 --- a/yang/odlext-model-api/pom.xml +++ b/yang/odlext-model-api/pom.xml @@ -60,6 +60,13 @@ checkstyle.violationSeverity=error + + org.codehaus.mojo + findbugs-maven-plugin + + true + + 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 5fd1acbc4e..6a9da2f867 100644 --- 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 862ce5b7ba..77871666e5 100644 --- a/yang/odlext-parser-support/pom.xml +++ b/yang/odlext-parser-support/pom.xml @@ -66,6 +66,13 @@ checkstyle.violationSeverity=error + + org.codehaus.mojo + findbugs-maven-plugin + + true + + 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 2a1700c80b..86c8873432 100644 --- 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 getAnyXmlSchema( final StmtContext 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 fb5e14f662..e48baba606 100644 --- 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; -- 2.36.6