Remove JSR305 annotations from yang-data-codec-gson

Ditch JSR305 annotations in favor of JDT annotations.

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

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java
index 962e785a8dcd0857c72f6ec42ee21ba295b96035..350acef4117c6e52ca807204a4e94e173918503e 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java
@@ -14,7 +14,6 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Iterator;
-import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.util.AbstractModuleStringInstanceIdentifierCodec;
 import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree;
@@ -36,18 +35,17 @@ class JSONInstanceIdentifierCodec extends AbstractModuleStringInstanceIdentifier
     }
 
     @Override
-    protected Module moduleForPrefix(@Nonnull final String prefix) {
+    protected Module moduleForPrefix(final String prefix) {
         final Iterator<Module> modules = context.findModules(prefix).iterator();
         return modules.hasNext() ? modules.next() : null;
     }
 
     @Override
-    protected String prefixForNamespace(@Nonnull final URI namespace) {
+    protected String prefixForNamespace(final URI namespace) {
         final Iterator<Module> modules = context.findModules(namespace).iterator();
         return modules.hasNext() ? modules.next().getName() : null;
     }
 
-    @Nonnull
     @Override
     protected DataSchemaContextTree getDataContextTree() {
         return dataContextTree;

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterContext.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterContext.java
index 0f02039f3fb276dd412a327f7226c62e79778371..1cc75e1c5542eea1ccf4d1d02566b56b33acf2b3 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterContext.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterContext.java
@@ -13,7 +13,7 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.Module;
@@ -89,7 +89,7 @@ abstract class JSONStreamWriterContext {
      *
      * @return Namespace as URI
      */
-    protected abstract @Nonnull URI getNamespace();
+    protected abstract @NonNull URI getNamespace();
 
     /**
      * Emit the start of an element.

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterQNameContext.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterQNameContext.java
index 183b3d21b5bfdf067ee24bfe17b5d485c3c34a28..3c00d0275303d27869dc106f90b64935503c72c9 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterQNameContext.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterQNameContext.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.data.codec.gson;
 import static java.util.Objects.requireNonNull;
 
 import java.net.URI;
-import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.common.QName;
 
 /**
@@ -34,7 +33,6 @@ abstract class JSONStreamWriterQNameContext extends JSONStreamWriterContext {
         return qname;
     }
 
-    @Nonnull
     @Override
     protected final URI getNamespace() {
         return qname.getNamespace();

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterRootContext.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterRootContext.java
index 5c02498c4604ec8d31559e8a4ea1653155dde8f1..1d5b340fab5d787e8b85ff480623f190b1bad1ef 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterRootContext.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterRootContext.java
@@ -9,15 +9,12 @@ package org.opendaylight.yangtools.yang.data.codec.gson;
 
 import java.net.URI;
 
-
 /**
  * The root node of a particular {@link JSONNormalizedNodeStreamWriter} instance.
  * It holds the base namespace and can never be removed from the stack.
  */
 abstract class JSONStreamWriterRootContext extends JSONStreamWriterURIContext {
-
     JSONStreamWriterRootContext(final URI namespace) {
         super(null, namespace);
     }
-
 }

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterURIContext.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterURIContext.java
index cc389e295d0308ad1578acd8fdddb4fe799a9510..3c69eab073495059af5595243a9a29fc53f24af2 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterURIContext.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStreamWriterURIContext.java
@@ -10,10 +10,8 @@ package org.opendaylight.yangtools.yang.data.codec.gson;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.net.URI;
-import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
-
 /**
  * Abstract class tracking a virtual level of {@link JSONNormalizedNodeStreamWriter}
  * recursion. It only tracks the namespace associated with this node.
@@ -26,7 +24,6 @@ abstract class JSONStreamWriterURIContext extends JSONStreamWriterContext {
         this.namespace = namespace;
     }
 
-    @Nonnull
     @Override
     protected final URI getNamespace() {
         return namespace;

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RFC7951JSONInstanceIdentifierCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RFC7951JSONInstanceIdentifierCodec.java
index ff88f0dd4775d38c67abd6a797b03f8348cd62bf..de7ad7ddb87b3a2a06f2d7a7bb82ef14621bf717 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RFC7951JSONInstanceIdentifierCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/RFC7951JSONInstanceIdentifierCodec.java
@@ -9,8 +9,6 @@ package org.opendaylight.yangtools.yang.data.codec.gson;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
@@ -21,8 +19,7 @@ final class RFC7951JSONInstanceIdentifierCodec extends JSONInstanceIdentifierCod
     }
 
     @Override
-    protected StringBuilder appendQName(final StringBuilder sb, final QName qname,
-            final @Nullable QNameModule lastModule) {
+    protected StringBuilder appendQName(final StringBuilder sb, final QName qname, final QNameModule lastModule) {
         if (qname.getModule().equals(lastModule)) {
             return sb.append(qname.getLocalName());
         }
@@ -31,7 +28,7 @@ final class RFC7951JSONInstanceIdentifierCodec extends JSONInstanceIdentifierCod
     }
 
     @Override
-    protected QName createQName(final @Nonnull QNameModule lastModule, final String localName) {
+    protected QName createQName(final QNameModule lastModule, final String localName) {
         checkArgument(lastModule != null, "Unprefixed leading name %s", localName);
         return QName.create(lastModule, localName);
     }