Migrate AbstractDeclaredStatement to JDT annotations

Baseline yang-model-apis have been migrated, move over to JDT
annotations here, too.

Change-Id: I8de262e3730ec616b2158dc25f4bbe4171a37e70
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/meta/DeclaredStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement.java
index 11167a01f7e45a6b90d79d589f8103f9ed674468..22089dd26a0f62c9fb2c4bce8042796fb59a5735 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement.java
@@ -14,7 +14,6 @@ import com.google.common.collect.Collections2;
 import java.util.Collection;
 import java.util.Optional;
 import java.util.stream.Stream;
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.eclipse.jdt.annotation.NonNull;
 
@@ -37,7 +36,7 @@ public interface DeclaredStatement<A> extends ModelStatement<A> {
      *
      * @return Collection of statements, which were explicitly declared in source of model.
      */
-    @Nonnull Collection<? extends DeclaredStatement<?>> declaredSubstatements();
+    @NonNull Collection<? extends DeclaredStatement<?>> declaredSubstatements();
 
     /**
      * Returns collection of explicitly declared child statements, while preserving its original ordering from original

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/EmptyConfigStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/EmptyConfigStatement.java
index 41e751a1d9cd9de49c02ed96b8d426a10d5276a0..5749275fb799276a12f5f9a193ea066f7b099498 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/EmptyConfigStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/EmptyConfigStatement.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.config;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.Objects;
-import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -45,13 +44,11 @@ abstract class EmptyConfigStatement implements ConfigStatement {
 
     abstract EffectiveStatement<Boolean, ConfigStatement> toEffective();
 
-    @Nonnull
     @Override
     public final Collection<? extends DeclaredStatement<?>> declaredSubstatements() {
         return ImmutableList.of();
     }
 
-    @Nonnull
     @Override
     public final StatementDefinition statementDefinition() {
         return YangStmtMapping.CONFIG;
@@ -62,7 +59,6 @@ abstract class EmptyConfigStatement implements ConfigStatement {
         return Boolean.toString(getValue());
     }
 
-    @Nonnull
     @Override
     public final StatementSource getStatementSource() {
         return StatementSource.DECLARATION;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/EmptyMandatoryStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/EmptyMandatoryStatement.java
index d1e94a1a3cac7e7493a4d7bb65d3de90e47370b7..6e1fc947bfd77823d86bcd2330e917786f473d39 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/EmptyMandatoryStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/EmptyMandatoryStatement.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.mandatory;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.Objects;
-import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -45,13 +44,11 @@ abstract class EmptyMandatoryStatement implements MandatoryStatement {
 
     abstract EffectiveStatement<Boolean, MandatoryStatement> toEffective();
 
-    @Nonnull
     @Override
     public final Collection<? extends DeclaredStatement<?>> declaredSubstatements() {
         return ImmutableList.of();
     }
 
-    @Nonnull
     @Override
     public final StatementDefinition statementDefinition() {
         return YangStmtMapping.MANDATORY;
@@ -62,7 +59,6 @@ abstract class EmptyMandatoryStatement implements MandatoryStatement {
         return getValue().toString();
     }
 
-    @Nonnull
     @Override
     public final StatementSource getStatementSource() {
         return StatementSource.DECLARATION;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java
index 86830fee26ce1c8ba8791f82870be05049ed6b9f..9a6d6043212731ec39176ebd5b9e37f06786a642 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java
@@ -14,7 +14,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import java.util.Collection;
 import java.util.Map;
-import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
@@ -74,19 +73,16 @@ final class BuiltinTypeStatement implements TypeStatement {
         return argument;
     }
 
-    @Nonnull
     @Override
     public Collection<? extends DeclaredStatement<?>> declaredSubstatements() {
         return ImmutableList.of();
     }
 
-    @Nonnull
     @Override
     public StatementDefinition statementDefinition() {
         return YangStmtMapping.TYPE;
     }
 
-    @Nonnull
     @Override
     public StatementSource getStatementSource() {
         return StatementSource.DECLARATION;

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractDeclaredStatement.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractDeclaredStatement.java
index cd10de86ca09558d6de0ac9899f5c6fdfb2a5f8e..7f4c451d503f1d32ba9092eeb9ea1fa71ab11229 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractDeclaredStatement.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractDeclaredStatement.java
@@ -5,13 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.parser.spi.meta;
 
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
@@ -22,13 +21,14 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
  * @param <A> Argument type.
  */
 public abstract class AbstractDeclaredStatement<A> implements DeclaredStatement<A> {
+    private final @NonNull ImmutableList<? extends DeclaredStatement<?>> substatements;
+    private final @NonNull StatementDefinition definition;
+    private final @NonNull StatementSource source;
+
     private final A argument;
     private final String rawArgument;
-    private final ImmutableList<? extends DeclaredStatement<?>> substatements;
-    private final StatementDefinition definition;
-    private final StatementSource source;
 
-    protected AbstractDeclaredStatement(final StmtContext<A,?,?> context) {
+    protected AbstractDeclaredStatement(final StmtContext<A, ?, ?> context) {
         rawArgument = context.rawStatementArgument();
         argument = context.getStatementArgument();
         source = context.getStatementSource();
@@ -63,19 +63,16 @@ public abstract class AbstractDeclaredStatement<A> implements DeclaredStatement<
         return argument;
     }
 
-    @Nonnull
     @Override
     public StatementDefinition statementDefinition() {
         return definition;
     }
 
-    @Nonnull
     @Override
     public Collection<? extends DeclaredStatement<?>> declaredSubstatements() {
         return substatements;
     }
 
-    @Nonnull
     @Override
     public StatementSource getStatementSource() {
         return source;