Migrate TypeDefinitionAware to JDT types

This migrates all implementations of TypeDefinitionAware to
JDT @NonNull annotation.

Change-Id: If3a083835f1be90063a62c3241df4f6970c97442
JIRA: YANGTOOLS-907
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeDefinitionAware.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeDefinitionAware.java
index e450055460b5bc0574a4b65d8f8c741347f6a9bb..7558ab21f2e1e2819a6d94af68e6bc270b0cf058 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeDefinitionAware.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeDefinitionAware.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
 import com.google.common.annotations.Beta;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 /**
@@ -21,5 +21,5 @@ public interface TypeDefinitionAware {
      *
      * @return Effective {@link TypeDefinition} as defined by this statement.
      */
-    @Nonnull TypeDefinition<?> getTypeDefinition();
+    @NonNull TypeDefinition<?> getTypeDefinition();
 }

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java
index 5019f271380892a212030237cc6a8c4031fc0b6a..32148793e1e7ef5f37b2abbfc2538f1db06f67c1 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java
@@ -8,6 +8,7 @@
 package org.opendaylight.yangtools.yang.model.util.type;
 
 import com.google.common.base.Preconditions;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
@@ -28,7 +29,7 @@ abstract class AbstractRestrictedTypeBuilder<T extends TypeDefinition<T>> extend
         touched = true;
     }
 
-    abstract T buildType();
+    abstract @NonNull T buildType();
 
     @Override
     public final T build() {

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeEffectiveStatement.java
index fd41e7c6930d127380455730a2eb1ea0edfb063a..54e9e112e3800051ce5701aba2fa9eb48e2a9a1b 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeEffectiveStatement.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 
 abstract class AbstractTypeEffectiveStatement<T extends TypeDefinition<T>> extends
         DeclaredEffectiveStatementBase<String, TypeStatement> implements TypeEffectiveStatement<TypeStatement> {
-    private final T typeDefinition;
+    private final @NonNull T typeDefinition;
 
     AbstractTypeEffectiveStatement(
             final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
@@ -35,7 +35,6 @@ abstract class AbstractTypeEffectiveStatement<T extends TypeDefinition<T>> exten
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public final T getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BinaryTypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BinaryTypeEffectiveStatementImpl.java
index 0e63ad7ed54fc8d14a77abaaa0dbe36375aa55dc..002a5ff71ab3af3a8c50fe4b24d9111f4aaa7a6f 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BinaryTypeEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BinaryTypeEffectiveStatementImpl.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
 final class BinaryTypeEffectiveStatementImpl extends DeclaredEffectiveStatementBase<String, TypeStatement>
         implements TypeEffectiveStatement<TypeStatement> {
-    private final BinaryTypeDefinition typeDefinition;
+    private final @NonNull BinaryTypeDefinition typeDefinition;
 
     BinaryTypeEffectiveStatementImpl(
             final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
@@ -56,7 +56,6 @@ final class BinaryTypeEffectiveStatementImpl extends DeclaredEffectiveStatementB
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public BinaryTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationEffectiveStatement.java
index 045b19b6c3af073ea4b1e64d2097c39b8fcc6e40..7764b19f2917757d571545a0f68d5db4ed518bf1 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationEffectiveStatement.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
 import com.google.common.annotations.VisibleForTesting;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
@@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 public final class BitsSpecificationEffectiveStatement extends
         DeclaredEffectiveStatementBase<String, BitsSpecification> implements TypeEffectiveStatement<BitsSpecification> {
 
-    private final BitsTypeDefinition typeDefinition;
+    private final @NonNull BitsTypeDefinition typeDefinition;
 
     BitsSpecificationEffectiveStatement(
             final StmtContext<String, BitsSpecification, EffectiveStatement<String, BitsSpecification>> ctx) {
@@ -70,7 +70,6 @@ public final class BitsSpecificationEffectiveStatement extends
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public BitsTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsTypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsTypeEffectiveStatementImpl.java
index 8ad9d9f1ae2e769884459c4c0b3a45964a007c17..b331ab61154e7c681320b1f02258d3bfe9d65748 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsTypeEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsTypeEffectiveStatementImpl.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 final class BitsTypeEffectiveStatementImpl extends DeclaredEffectiveStatementBase<String, TypeStatement>
         implements TypeEffectiveStatement<TypeStatement> {
 
-    private final BitsTypeDefinition typeDefinition;
+    private final @NonNull BitsTypeDefinition typeDefinition;
 
     BitsTypeEffectiveStatementImpl(
             final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
@@ -70,7 +70,6 @@ final class BitsTypeEffectiveStatementImpl extends DeclaredEffectiveStatementBas
                 "Bit '%s' is not a subset of its base bits type %s.", bitName, baseType.getQName());
     }
 
-    @Nonnull
     @Override
     public BitsTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
index f5d16f9ff5ff4ffa67213295163e9e02685cd46a..838c621e7572fa84cd242043b1f8986095ceb0cd 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
@@ -13,6 +13,7 @@ import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.Map;
 import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -41,14 +42,14 @@ enum BuiltinEffectiveStatement implements TypeEffectiveStatement<TypeStatement>
     UINT32(BaseTypes.uint32Type()),
     UINT64(BaseTypes.uint64Type());
 
-    private final TypeDefinition<?> typedef;
+    private final @NonNull TypeDefinition<?> typedef;
 
     BuiltinEffectiveStatement(final TypeDefinition<?> typedef) {
         this.typedef = requireNonNull(typedef);
     }
 
     @Override
-    public @Nonnull TypeDefinition<?> getTypeDefinition() {
+    public TypeDefinition<?> getTypeDefinition() {
         return typedef;
     }
 
@@ -76,7 +77,6 @@ enum BuiltinEffectiveStatement implements TypeEffectiveStatement<TypeStatement>
         return ImmutableList.of();
     }
 
-    @Nonnull
     @Override
     public final StatementDefinition statementDefinition() {
         return YangStmtMapping.TYPE;
@@ -87,7 +87,6 @@ enum BuiltinEffectiveStatement implements TypeEffectiveStatement<TypeStatement>
         return getTypeDefinition().getQName().getLocalName();
     }
 
-    @Nonnull
     @Override
     public final StatementSource getStatementSource() {
         return StatementSource.CONTEXT;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationEffectiveStatement.java
index dc71149f3db0c0e1f07ceab94920c15c656301f4..cf14cc03046f9651f939503f8a4b901368ca72d5 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationEffectiveStatement.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
 import com.google.common.annotations.VisibleForTesting;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsEffectiveStatement;
@@ -27,7 +27,7 @@ public final class Decimal64SpecificationEffectiveStatement
         extends DeclaredEffectiveStatementBase<String, Decimal64Specification>
         implements TypeEffectiveStatement<Decimal64Specification> {
 
-    private final DecimalTypeDefinition typeDefinition;
+    private final @NonNull DecimalTypeDefinition typeDefinition;
 
     Decimal64SpecificationEffectiveStatement(
             final StmtContext<String, Decimal64Specification, EffectiveStatement<String, Decimal64Specification>> ctx) {
@@ -50,7 +50,6 @@ public final class Decimal64SpecificationEffectiveStatement
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public DecimalTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/DecimalTypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/DecimalTypeEffectiveStatementImpl.java
index f06db679d5b40a0dcd2a5ee37001b7cab8fbd634..b5f8c4ca412d6a2040e45c0236e31b5178d2c54b 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/DecimalTypeEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/DecimalTypeEffectiveStatementImpl.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
 import java.math.BigDecimal;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsEffectiveStatement;
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
 final class DecimalTypeEffectiveStatementImpl extends DeclaredEffectiveStatementBase<String, TypeStatement>
         implements TypeEffectiveStatement<TypeStatement> {
-    private final DecimalTypeDefinition typeDefinition;
+    private final @NonNull DecimalTypeDefinition typeDefinition;
 
     DecimalTypeEffectiveStatementImpl(
             final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
@@ -52,7 +52,6 @@ final class DecimalTypeEffectiveStatementImpl extends DeclaredEffectiveStatement
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public DecimalTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java
index 821320710868215183cbd0397943344c96508291..072e687f1492baeb6b234ed77fe4a66b660032c0 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java
@@ -8,6 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
 import com.google.common.annotations.Beta;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
 import org.opendaylight.yangtools.yang.model.util.type.BitBuilder;
@@ -21,7 +22,7 @@ final class EffectiveTypeUtil {
         throw new UnsupportedOperationException();
     }
 
-    static Bit buildBit(final BitEffectiveStatementImpl stmt, final long effectivePos) {
+    static @NonNull Bit buildBit(final @NonNull BitEffectiveStatementImpl stmt, final long effectivePos) {
         // TODO: code duplication with EnumPairBuilder is indicating we could use a common Builder<?> interface
         final BitBuilder builder = BitBuilder.create(stmt.getPath(), effectivePos).setStatus(stmt.getStatus());
         stmt.getDescription().ifPresent(builder::setDescription);
@@ -30,7 +31,7 @@ final class EffectiveTypeUtil {
         return builder.build();
     }
 
-    static EnumPair buildEnumPair(final EnumEffectiveStatementImpl stmt, final int effectiveValue) {
+    static @NonNull EnumPair buildEnumPair(final @NonNull EnumEffectiveStatementImpl stmt, final int effectiveValue) {
         final EnumPairBuilder builder = EnumPairBuilder.create(stmt.getName(), effectiveValue)
                 .setStatus(stmt.getStatus()).setUnknownSchemaNodes(stmt.getUnknownSchemaNodes());
         stmt.getDescription().ifPresent(builder::setDescription);

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationEffectiveStatement.java
index 29b9bdfd85293169f5ca8b0c2ec434bcf37e1803..e2bc0b8e0ef76514147d7fa14970067ed6efdb70 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationEffectiveStatement.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
 import com.google.common.annotations.VisibleForTesting;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
@@ -28,7 +28,7 @@ public final class EnumSpecificationEffectiveStatement extends
         DeclaredEffectiveStatementBase<String, EnumSpecification> implements
         TypeEffectiveStatement<EnumSpecification> {
 
-    private final EnumTypeDefinition typeDefinition;
+    private final @NonNull EnumTypeDefinition typeDefinition;
 
     EnumSpecificationEffectiveStatement(
             final StmtContext<String, EnumSpecification, EffectiveStatement<String, EnumSpecification>> ctx) {
@@ -68,7 +68,6 @@ public final class EnumSpecificationEffectiveStatement extends
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public EnumTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumTypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumTypeEffectiveStatementImpl.java
index ca9b6be31d2209466aa95f4c328d25b9d2a8d6d3..8c8e9304fa38e8f02174409dc531a103b496fab4 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumTypeEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumTypeEffectiveStatementImpl.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 final class EnumTypeEffectiveStatementImpl extends DeclaredEffectiveStatementBase<String, TypeStatement>
         implements TypeEffectiveStatement<TypeStatement> {
 
-    private final EnumTypeDefinition typeDefinition;
+    private final @NonNull EnumTypeDefinition typeDefinition;
 
     EnumTypeEffectiveStatementImpl(
             final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
@@ -72,7 +72,6 @@ final class EnumTypeEffectiveStatementImpl extends DeclaredEffectiveStatementBas
                 "Enum '%s' is not a subset of its base enumeration type %s.", enumName, baseType.getQName());
     }
 
-    @Nonnull
     @Override
     public EnumTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationEffectiveStatement.java
index 19a78b39ec01c8ec5673d15ad25ed36bad03418d..d1065b034b74c50292c41989c6027ed9c5809b45 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationEffectiveStatement.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
@@ -28,7 +28,7 @@ public final class IdentityRefSpecificationEffectiveStatement extends
         DeclaredEffectiveStatementBase<String, IdentityRefSpecification> implements
         TypeEffectiveStatement<IdentityRefSpecification> {
 
-    private final IdentityrefTypeDefinition typeDefinition;
+    private final @NonNull IdentityrefTypeDefinition typeDefinition;
 
     IdentityRefSpecificationEffectiveStatement(final StmtContext<String, IdentityRefSpecification,
             EffectiveStatement<String, IdentityRefSpecification>> ctx) {
@@ -50,7 +50,6 @@ public final class IdentityRefSpecificationEffectiveStatement extends
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public IdentityrefTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationEffectiveStatement.java
index a519531be62f79207f19ee777dad3fec4147736f..0dfbf4fe1eeabcd872f1a835336207437fe1ba0e 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationEffectiveStatement.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceEffectiveStatement;
@@ -24,7 +24,7 @@ final class InstanceIdentifierSpecificationEffectiveStatement
         extends DeclaredEffectiveStatementBase<String, InstanceIdentifierSpecification>
         implements TypeEffectiveStatement<InstanceIdentifierSpecification> {
 
-    private final InstanceIdentifierTypeDefinition typeDefinition;
+    private final @NonNull InstanceIdentifierTypeDefinition typeDefinition;
 
     InstanceIdentifierSpecificationEffectiveStatement(final StmtContext<String,
             InstanceIdentifierSpecification, EffectiveStatement<String, InstanceIdentifierSpecification>> ctx) {
@@ -45,7 +45,6 @@ final class InstanceIdentifierSpecificationEffectiveStatement
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public InstanceIdentifierTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierTypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierTypeEffectiveStatementImpl.java
index 28f4a6db5322cb0d8b0e8b90befae0a1ba26ee76..67f03e659c56bc697e83ff698a49053f11d76e06 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierTypeEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierTypeEffectiveStatementImpl.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceEffectiveStatement;
@@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 
 final class InstanceIdentifierTypeEffectiveStatementImpl
         extends DeclaredEffectiveStatementBase<String, TypeStatement> implements TypeEffectiveStatement<TypeStatement> {
-    private final InstanceIdentifierTypeDefinition typeDefinition;
+    private final @NonNull InstanceIdentifierTypeDefinition typeDefinition;
 
     InstanceIdentifierTypeEffectiveStatementImpl(
             final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
@@ -44,7 +44,6 @@ final class InstanceIdentifierTypeEffectiveStatementImpl
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public InstanceIdentifierTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IntegralTypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IntegralTypeEffectiveStatementImpl.java
index 9c2ad03e14ca1d6d26efd6ab67557fa056714225..f21438957ae9eb7a0c3b48d455bcb1b2bff3be48 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IntegralTypeEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IntegralTypeEffectiveStatementImpl.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
@@ -24,7 +24,7 @@ final class IntegralTypeEffectiveStatementImpl<T extends RangeRestrictedTypeDefi
         N extends Number & Comparable<N>> extends DeclaredEffectiveStatementBase<String, TypeStatement>
         implements TypeEffectiveStatement<TypeStatement> {
 
-    private final T typeDefinition;
+    private final @NonNull T typeDefinition;
 
     IntegralTypeEffectiveStatementImpl(
             final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
@@ -49,7 +49,6 @@ final class IntegralTypeEffectiveStatementImpl<T extends RangeRestrictedTypeDefi
         }
     }
 
-    @Nonnull
     @Override
     public T getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationEffectiveStatement.java
index c1431ee12b4c95c6d26bf1f1d12ba2dc7c14a7a9..828114845f8cb5568441ada557458c19aec8f241 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationEffectiveStatement.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
 import com.google.common.annotations.VisibleForTesting;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PathEffectiveStatement;
@@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 public final class LeafrefSpecificationEffectiveStatement
         extends DeclaredEffectiveStatementBase<String, LeafrefSpecification>
         implements TypeEffectiveStatement<LeafrefSpecification> {
-    private final LeafrefTypeDefinition typeDefinition;
+    private final @NonNull LeafrefTypeDefinition typeDefinition;
 
     LeafrefSpecificationEffectiveStatement(final StmtContext<String, LeafrefSpecification,
             EffectiveStatement<String, LeafrefSpecification>> ctx) {
@@ -47,7 +47,6 @@ public final class LeafrefSpecificationEffectiveStatement
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public LeafrefTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefTypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefTypeEffectiveStatementImpl.java
index 44b015b1a37fb2b495d8d19df131c3b1ed520f60..f5c9a67f7272518dd56bd0b2b81a1bab9c70573b 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefTypeEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefTypeEffectiveStatementImpl.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceEffectiveStatement;
@@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 final class LeafrefTypeEffectiveStatementImpl extends DeclaredEffectiveStatementBase<String, TypeStatement>
         implements TypeEffectiveStatement<TypeStatement> {
 
-    private final LeafrefTypeDefinition typeDefinition;
+    private final @NonNull LeafrefTypeDefinition typeDefinition;
 
     LeafrefTypeEffectiveStatementImpl(
             final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
@@ -43,7 +43,6 @@ final class LeafrefTypeEffectiveStatementImpl extends DeclaredEffectiveStatement
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public LeafrefTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/StringTypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/StringTypeEffectiveStatementImpl.java
index 5f5cb3b9d6f6f657b42e95b045f91d97034cb577..d25880fbade05aa30d8d373c4a99c1afa6ab8780 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/StringTypeEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/StringTypeEffectiveStatementImpl.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PatternEffectiveStatement;
@@ -28,7 +28,8 @@ import org.slf4j.LoggerFactory;
 final class StringTypeEffectiveStatementImpl extends DeclaredEffectiveStatementBase<String, TypeStatement>
         implements TypeEffectiveStatement<TypeStatement> {
     private static final Logger LOG = LoggerFactory.getLogger(StringTypeEffectiveStatementImpl.class);
-    private final StringTypeDefinition typeDefinition;
+
+    private final @NonNull StringTypeDefinition typeDefinition;
 
     StringTypeEffectiveStatementImpl(
             final StmtContext<String, TypeStatement, EffectiveStatement<String, TypeStatement>> ctx,
@@ -68,7 +69,6 @@ final class StringTypeEffectiveStatementImpl extends DeclaredEffectiveStatementB
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public StringTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationEffectiveStatement.java
index 6d90e2436ee83b533f47bb7880be8b2bb7858f81..37c7803fbd82574560d7edcfcddb2bbc74ec92b9 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationEffectiveStatement.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 
 import com.google.common.annotations.VisibleForTesting;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
@@ -25,7 +25,7 @@ public final class UnionSpecificationEffectiveStatement extends
         DeclaredEffectiveStatementBase<String, UnionSpecification> implements
         TypeEffectiveStatement<UnionSpecification> {
 
-    private final UnionTypeDefinition typeDefinition;
+    private final @NonNull UnionTypeDefinition typeDefinition;
 
     UnionSpecificationEffectiveStatement(
             final StmtContext<String, UnionSpecification, EffectiveStatement<String, UnionSpecification>> ctx) {
@@ -45,7 +45,6 @@ public final class UnionSpecificationEffectiveStatement extends
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public UnionTypeDefinition getTypeDefinition() {
         return typeDefinition;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java
index c2df109cec9e2867705affd108d85246692ad408..ed8967b783c6120f1f67fd62e4f0392c7d17e2ff 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java
@@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.typedef;
 import java.util.Collection;
 import java.util.Map;
 import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
@@ -40,7 +41,7 @@ final class TypedefEffectiveStatementImpl extends AbstractEffectiveSchemaNode<Ty
         TypedefEffectiveStatement {
     private static final Logger LOG = LoggerFactory.getLogger(TypedefEffectiveStatementImpl.class);
 
-    private final TypeDefinition<?> typeDefinition;
+    private final @NonNull TypeDefinition<?> typeDefinition;
 
     private volatile TypeEffectiveStatement<TypeStatement> typeStatement;
 
@@ -82,7 +83,6 @@ final class TypedefEffectiveStatementImpl extends AbstractEffectiveSchemaNode<Ty
         typeDefinition = builder.build();
     }
 
-    @Nonnull
     @Override
     public TypeDefinition<?> getTypeDefinition() {
         return typeDefinition;
@@ -126,7 +126,6 @@ final class TypedefEffectiveStatementImpl extends AbstractEffectiveSchemaNode<Ty
             return TypedefEffectiveStatementImpl.this.effectiveSubstatements();
         }
 
-        @Nonnull
         @Override
         public StatementDefinition statementDefinition() {
             return YangStmtMapping.TYPE;
@@ -137,13 +136,11 @@ final class TypedefEffectiveStatementImpl extends AbstractEffectiveSchemaNode<Ty
             return getQName().getLocalName();
         }
 
-        @Nonnull
         @Override
         public StatementSource getStatementSource() {
             return StatementSource.CONTEXT;
         }
 
-        @Nonnull
         @Override
         public TypeDefinition<?> getTypeDefinition() {
             return TypedefEffectiveStatementImpl.this.getTypeDefinition();