Migrate mdsal-binding-generator-impl to JDT annotations

This removes the use of javax.annotation nullable annotations
to remove import-package.

JIRA: MDSAL-373
Change-Id: I51519c4587dfe6a06fb9f875c6e6e410192c0cc9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java
index f40ff9cd69f0566b90cccefa6378e4d39689dbc7..55b8114d5dfe1d4f9f02f07cf0c6921aeb189e46 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java
@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.binding.generator.api.BindingRuntimeTypes;
 import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy;
 import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl;

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/YangSchemaUtils.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/YangSchemaUtils.java
index 651c391edcc6a00c041b7bc010cbe8d2df269321..9b9680f17302bfdfc3a7a36c05244afecead006b 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/YangSchemaUtils.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/YangSchemaUtils.java
@@ -14,7 +14,7 @@ import com.google.common.base.Preconditions;
 import java.net.URI;
 import java.util.Iterator;
 import java.util.Optional;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
@@ -38,19 +38,19 @@ public final class YangSchemaUtils {
     public static QName getAugmentationQName(final AugmentationSchemaNode augmentation) {
         checkNotNull(augmentation, "Augmentation must not be null.");
         final QName identifier = getAugmentationIdentifier(augmentation);
-        if(identifier != null) {
+        if (identifier != null) {
             return identifier;
         }
         URI namespace = null;
         Optional<Revision> revision = null;
-        if(augmentation instanceof NamespaceRevisionAware) {
+        if (augmentation instanceof NamespaceRevisionAware) {
             namespace = ((NamespaceRevisionAware) augmentation).getNamespace();
             revision = ((NamespaceRevisionAware) augmentation).getRevision();
         }
-        if(namespace == null || revision == null) {
-            for(final DataSchemaNode child : augmentation.getChildNodes()) {
+        if (namespace == null || revision == null) {
+            for (DataSchemaNode child : augmentation.getChildNodes()) {
                 // Derive QName from child nodes
-                if(!child.isAugmenting()) {
+                if (!child.isAugmenting()) {
                     namespace = child.getQName().getNamespace();
                     revision = child.getQName().getRevision();
                     break;
@@ -72,8 +72,7 @@ public final class YangSchemaUtils {
         return null;
     }
 
-    @Nullable
-    public static TypeDefinition<?> findTypeDefinition(final SchemaContext context, final SchemaPath path) {
+    public static @Nullable TypeDefinition<?> findTypeDefinition(final SchemaContext context, final SchemaPath path) {
         final Iterator<QName> arguments = path.getPathFromRoot().iterator();
         Preconditions.checkArgument(arguments.hasNext(), "Type Definition path must contain at least one element.");
 
@@ -83,10 +82,10 @@ public final class YangSchemaUtils {
             return null;
         }
         // Last argument is type definition, so we need to cycle until we hit last argument.
-        while(arguments.hasNext()) {
+        while (arguments.hasNext()) {
             // Nested private type - we need to find container/grouping to which type belongs.
             final DataSchemaNode child = currentNode.getDataChildByName(currentArg);
-            if(child instanceof DataNodeContainer) {
+            if (child instanceof DataNodeContainer) {
                 currentNode = (DataNodeContainer) child;
             } else if (child instanceof ChoiceSchemaNode) {
                 final QName caseQName = arguments.next();
@@ -94,7 +93,7 @@ public final class YangSchemaUtils {
                 currentNode = ((ChoiceSchemaNode) child).getCaseNodeByName(caseQName);
             } else {
                 // Search in grouping
-                for (final GroupingDefinition grouping : currentNode.getGroupings()) {
+                for (GroupingDefinition grouping : currentNode.getGroupings()) {
                     if (currentArg.equals(grouping.getQName())) {
                         currentNode = grouping;
                         break;
@@ -104,8 +103,8 @@ public final class YangSchemaUtils {
             currentArg = arguments.next();
         }
 
-        for(final TypeDefinition<?> typedef : currentNode.getTypeDefinitions()) {
-            if(typedef.getQName().equals(currentArg)) {
+        for (TypeDefinition<?> typedef : currentNode.getTypeDefinitions()) {
+            if (typedef.getQName().equals(currentArg)) {
                 return typedef;
             }
         }

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/LeafrefTypeWithNullToStringInXpath.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/LeafrefTypeWithNullToStringInXpath.java
index 6c2c0b2e96c299d940ef308470f5aebab2e19fc8..d64b49ff66d6ba6a0f98c58224a59313a245b0c0 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/LeafrefTypeWithNullToStringInXpath.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/LeafrefTypeWithNullToStringInXpath.java
@@ -5,9 +5,9 @@
  * 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.mdsal.binding.yang.types;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -68,7 +68,7 @@ public class LeafrefTypeWithNullToStringInXpath implements LeafrefTypeDefinition
 
     @Override
     public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-        return null;
+        return ImmutableList.of();
     }
 
     @Override
@@ -83,7 +83,7 @@ public class LeafrefTypeWithNullToStringInXpath implements LeafrefTypeDefinition
 
     @Override
     public Status getStatus() {
-        return null;
+        return Status.CURRENT;
     }
 
     @Override

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/LeafrefTypeWithNullXpath.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/LeafrefTypeWithNullXpath.java
index 1af28845dbd60d4bd327107c72c27b68c4c397a0..00b9796a27d37ba05e95ad0216e81228e45547e3 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/LeafrefTypeWithNullXpath.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/LeafrefTypeWithNullXpath.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.mdsal.binding.yang.types;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -55,7 +56,7 @@ public class LeafrefTypeWithNullXpath implements LeafrefTypeDefinition {
 
     @Override
     public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-        return null;
+        return ImmutableList.of();
     }
 
     @Override
@@ -70,7 +71,7 @@ public class LeafrefTypeWithNullXpath implements LeafrefTypeDefinition {
 
     @Override
     public Status getStatus() {
-        return null;
+        return Status.CURRENT;
     }
 
     @Override

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TestIntegerTypeDefinition.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TestIntegerTypeDefinition.java
index 7875244713662abb7bb81e130fdca2e5e8c503bd..11e21cb4feaa0c87196028f16d333c62a6c69a55 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TestIntegerTypeDefinition.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TestIntegerTypeDefinition.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.mdsal.binding.yang.types;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -51,7 +52,7 @@ final class TestIntegerTypeDefinition implements Int8TypeDefinition {
 
     @Override
     public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-        return null;
+        return ImmutableList.of();
     }
 
     @Override
@@ -66,7 +67,7 @@ final class TestIntegerTypeDefinition implements Int8TypeDefinition {
 
     @Override
     public Status getStatus() {
-        return null;
+        return Status.CURRENT;
     }
 
     @Override

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TestLeafSchemaNode.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TestLeafSchemaNode.java
index 1df258a0e5e44a5a2a16d67e795304434369a7b9..abe2578445a577fa4919845f268bdb51d828e12a 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TestLeafSchemaNode.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TestLeafSchemaNode.java
@@ -5,9 +5,9 @@
  * 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.mdsal.binding.yang.types;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
 import java.util.List;
@@ -59,7 +59,7 @@ public class TestLeafSchemaNode implements LeafSchemaNode {
 
     @Override
     public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-        return null;
+        return ImmutableList.of();
     }
 
     @Override
@@ -72,8 +72,9 @@ public class TestLeafSchemaNode implements LeafSchemaNode {
         return Optional.empty();
     }
 
-    @Override public Status getStatus() {
-        return null;
+    @Override
+    public Status getStatus() {
+        return Status.CURRENT;
     }
 
     @Override