From c5de1e25107fc18357ab54f04396b72293028881 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 8 Oct 2018 07:22:10 +0200 Subject: [PATCH] Do not import java.annotation Nullable JSR305 annotations have runtime retention scope, which is causing javax.annotation being imported by our bundles, which is not correct as we do not need the annotation. Reduce the use of these and suppress javax.annotation imports. JIRA: YANGTOOLS-907 Change-Id: I0e1f384880e148c707037f8afd4b8cb9d2e00e72 Signed-off-by: Robert Varga --- common/concepts/pom.xml | 9 +++++++++ common/util/pom.xml | 9 +++++++++ yang/odlext-model-api/pom.xml | 9 +++++++++ ...AnyxmlSchemaLocationEffectiveStatementImpl.java | 10 ++++------ .../YangModeledAnyxmlEffectiveStatementImpl.java | 11 +++++------ yang/openconfig-model-api/pom.xml | 9 +++++++++ .../parser/YangDataEffectiveStatementImpl.java | 14 +++++--------- yang/yang-common/pom.xml | 1 + yang/yang-data-api/pom.xml | 9 +++++++++ yang/yang-data-codec-gson/pom.xml | 9 +++++++++ yang/yang-data-codec-xml/pom.xml | 9 +++++++++ yang/yang-data-impl/pom.xml | 1 + yang/yang-data-jaxen/pom.xml | 1 + yang/yang-data-transform/pom.xml | 9 +++++++++ yang/yang-data-util/pom.xml | 9 +++++++++ yang/yang-model-api/pom.xml | 9 +++++++++ yang/yang-model-export/pom.xml | 9 +++++++++ yang/yang-model-immutable/pom.xml | 14 ++++++++++++++ yang/yang-model-util/pom.xml | 9 +++++++++ yang/yang-parser-api/pom.xml | 9 +++++++++ yang/yang-parser-impl/pom.xml | 1 + yang/yang-parser-reactor/pom.xml | 9 +++++++++ yang/yang-parser-rfc7950/pom.xml | 9 +++++++++ yang/yang-parser-spi/pom.xml | 9 +++++++++ 24 files changed, 176 insertions(+), 21 deletions(-) diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml index 648dffa66b..0ba50f1cc7 100644 --- a/common/concepts/pom.xml +++ b/common/concepts/pom.xml @@ -49,6 +49,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/common/util/pom.xml b/common/util/pom.xml index 3f9a2e2ea6..e9bc11ef57 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -71,6 +71,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/odlext-model-api/pom.xml b/yang/odlext-model-api/pom.xml index 1568c2e852..e99d45b4fd 100644 --- a/yang/odlext-model-api/pom.xml +++ b/yang/odlext-model-api/pom.xml @@ -53,6 +53,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationEffectiveStatementImpl.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationEffectiveStatementImpl.java index fe6b988b3c..24b3b34288 100644 --- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationEffectiveStatementImpl.java +++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationEffectiveStatementImpl.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.odlext.parser; import com.google.common.annotations.VisibleForTesting; import java.util.Objects; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.odlext.model.api.AnyxmlSchemaLocationEffectiveStatement; import org.opendaylight.yangtools.odlext.model.api.AnyxmlSchemaLocationStatement; import org.opendaylight.yangtools.yang.common.QName; @@ -23,7 +23,7 @@ public final class AnyxmlSchemaLocationEffectiveStatementImpl extends UnknownEffectiveStatementBase implements AnyxmlSchemaLocationEffectiveStatement { - private final SchemaPath path; + private final @NonNull SchemaPath path; AnyxmlSchemaLocationEffectiveStatementImpl( final StmtContext ctx) { @@ -31,15 +31,13 @@ public final class AnyxmlSchemaLocationEffectiveStatementImpl path = ctx.getParentContext().getSchemaPath().get().createChild(getNodeType()); } - @Nonnull @Override - public QName getQName() { + public @NonNull QName getQName() { return getNodeType(); } - @Nonnull @Override - public SchemaPath getPath() { + public @NonNull SchemaPath getPath() { return path; } diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java index f201f7c484..66ca9fa095 100644 --- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java +++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java @@ -13,7 +13,7 @@ import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.Optional; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; @@ -30,8 +30,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; final class YangModeledAnyxmlEffectiveStatementImpl extends ForwardingEffectiveStatement implements YangModeledAnyXmlSchemaNode, AnyxmlEffectiveStatement { - private final AnyxmlEffectiveStatement delegate; - private final ContainerSchemaNode contentSchema; + private final @NonNull AnyxmlEffectiveStatement delegate; + private final @NonNull ContainerSchemaNode contentSchema; YangModeledAnyxmlEffectiveStatementImpl(final AnyxmlEffectiveStatement delegate, final ContainerSchemaNode contentSchema) { @@ -40,13 +40,12 @@ final class YangModeledAnyxmlEffectiveStatementImpl } @Override - protected AnyxmlEffectiveStatement delegate() { + protected @NonNull AnyxmlEffectiveStatement delegate() { return delegate; } - @Nonnull @Override - public ContainerSchemaNode getSchemaOfAnyXmlData() { + public @NonNull ContainerSchemaNode getSchemaOfAnyXmlData() { return contentSchema; } diff --git a/yang/openconfig-model-api/pom.xml b/yang/openconfig-model-api/pom.xml index 712f426d61..1799b760ed 100644 --- a/yang/openconfig-model-api/pom.xml +++ b/yang/openconfig-model-api/pom.xml @@ -53,6 +53,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java b/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java index 60efdef86e..6a4cad48d2 100644 --- a/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java +++ b/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java @@ -11,7 +11,6 @@ import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects; import com.google.common.base.Verify; import java.util.Objects; -import javax.annotation.Nonnull; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.rfc8040.model.api.YangDataEffectiveStatement; import org.opendaylight.yangtools.rfc8040.model.api.YangDataStatement; @@ -27,8 +26,8 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; final class YangDataEffectiveStatementImpl extends UnknownEffectiveStatementBase implements YangDataEffectiveStatement { - private final SchemaPath path; - private final QName maybeQNameArgument; + private final @NonNull SchemaPath path; + private final @NonNull QName maybeQNameArgument; private final @NonNull ContainerEffectiveStatement container; YangDataEffectiveStatementImpl(final StmtContext ctx) { @@ -50,15 +49,13 @@ final class YangDataEffectiveStatementImpl extends UnknownEffectiveStatementBase Verify.verify(container instanceof ContainerSchemaNode); } - @Nonnull @Override - public QName getQName() { + public @NonNull QName getQName() { return maybeQNameArgument; } - @Nonnull @Override - public SchemaPath getPath() { + public @NonNull SchemaPath getPath() { return path; } @@ -67,9 +64,8 @@ final class YangDataEffectiveStatementImpl extends UnknownEffectiveStatementBase return container; } - @Nonnull @Override - public ContainerSchemaNode getContainerSchemaNode() { + public @NonNull ContainerSchemaNode getContainerSchemaNode() { // Verified in the constructor return (ContainerSchemaNode) container; } diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml index 2c7ccc52ab..b99c8a5c6c 100644 --- a/yang/yang-common/pom.xml +++ b/yang/yang-common/pom.xml @@ -59,6 +59,7 @@ true + !javax.annotation,* {META-INF/services=${project.build.directory}/classes/META-INF/services} diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml index 487ae96f2b..7b4e9fd067 100644 --- a/yang/yang-data-api/pom.xml +++ b/yang/yang-data-api/pom.xml @@ -61,6 +61,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/yang-data-codec-gson/pom.xml b/yang/yang-data-codec-gson/pom.xml index 878f2dfceb..d03bf9fc43 100644 --- a/yang/yang-data-codec-gson/pom.xml +++ b/yang/yang-data-codec-gson/pom.xml @@ -76,6 +76,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/yang-data-codec-xml/pom.xml b/yang/yang-data-codec-xml/pom.xml index 6a097f2344..7756c25d97 100644 --- a/yang/yang-data-codec-xml/pom.xml +++ b/yang/yang-data-codec-xml/pom.xml @@ -70,6 +70,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index 314c2b74ed..33a0988dc9 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -72,6 +72,7 @@ org.opendaylight.yangtools.yang.data.impl.*, ;-split-package:=error + !javax.annotation,* {META-INF/services=${project.build.directory}/classes/META-INF/services} org.opendaylight.yangtools.yang.data.impl.osgi.Activator diff --git a/yang/yang-data-jaxen/pom.xml b/yang/yang-data-jaxen/pom.xml index 12bca6a488..e691e8c956 100644 --- a/yang/yang-data-jaxen/pom.xml +++ b/yang/yang-data-jaxen/pom.xml @@ -93,6 +93,7 @@ true + !javax.annotation,* {META-INF/services=${project.build.directory}/classes/META-INF/services} org.opendaylight.yangtools.yang.data.jaxen.osgi.Activator diff --git a/yang/yang-data-transform/pom.xml b/yang/yang-data-transform/pom.xml index 85c535b2ba..3d7fedb00f 100644 --- a/yang/yang-data-transform/pom.xml +++ b/yang/yang-data-transform/pom.xml @@ -49,6 +49,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index 7966d27c69..fb54e93b61 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -63,6 +63,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml index 2955a4eb0e..da20efb93e 100644 --- a/yang/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -53,6 +53,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/yang-model-export/pom.xml b/yang/yang-model-export/pom.xml index 1243330907..9ee279ee86 100644 --- a/yang/yang-model-export/pom.xml +++ b/yang/yang-model-export/pom.xml @@ -63,6 +63,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/yang-model-immutable/pom.xml b/yang/yang-model-immutable/pom.xml index d6f6ff5c9f..0c762294a9 100644 --- a/yang/yang-model-immutable/pom.xml +++ b/yang/yang-model-immutable/pom.xml @@ -47,4 +47,18 @@ value + + + + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + + + diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index 507d9dec64..1904262e41 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -56,6 +56,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml index e44b61798e..33f2a40f42 100644 --- a/yang/yang-parser-api/pom.xml +++ b/yang/yang-parser-api/pom.xml @@ -45,6 +45,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index df596f37ad..4242e2cb48 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -154,6 +154,7 @@ true + !javax.annotation,* {META-INF/services=${project.build.directory}/classes/META-INF/services} org.opendaylight.yangtools.yang.parser.impl.osgi.Activator diff --git a/yang/yang-parser-reactor/pom.xml b/yang/yang-parser-reactor/pom.xml index d31e439369..735d727f94 100644 --- a/yang/yang-parser-reactor/pom.xml +++ b/yang/yang-parser-reactor/pom.xml @@ -69,6 +69,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml index e9730df735..2a1b61eca4 100644 --- a/yang/yang-parser-rfc7950/pom.xml +++ b/yang/yang-parser-rfc7950/pom.xml @@ -105,6 +105,15 @@ true + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.codehaus.mojo build-helper-maven-plugin diff --git a/yang/yang-parser-spi/pom.xml b/yang/yang-parser-spi/pom.xml index 94780ef6c6..31dfe3afba 100644 --- a/yang/yang-parser-spi/pom.xml +++ b/yang/yang-parser-spi/pom.xml @@ -59,6 +59,15 @@ + + org.apache.felix + maven-bundle-plugin + + + !javax.annotation,* + + + org.apache.maven.plugins maven-checkstyle-plugin -- 2.36.6