Undo yang-common JDT annotation in parameters

Using @NonNull for arguments to construction methods causes massive
amounts of warnings downstreams, disable them for now.

Change-Id: I940793d9ec0a899c04027d947f129130c88634d6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
index 4b52c0a2fd05322aa49ef18cc6459d92073a1fe3..ffdf08bb87663dd03e68b6cb36ff1520bf6f01ce 100644 (file)
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
@@ -75,7 +75,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
     private final @NonNull String localName;
     private transient int hash = 0;
 
-    private QName(final @NonNull QNameModule module, final @NonNull String localName) {
+    private QName(final QNameModule module, final @NonNull String localName) {
         this.module = requireNonNull(module);
         this.localName = requireNonNull(localName);
     }
@@ -88,11 +88,11 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @param localName
      *            YANG schema identifier
      */
-    private QName(final @NonNull URI namespace, final @NonNull String localName) {
+    private QName(final URI namespace, final String localName) {
         this(QNameModule.create(namespace), checkLocalName(localName));
     }
 
-    private static @NonNull String checkLocalName(final @NonNull String localName) {
+    private static @NonNull String checkLocalName(final String localName) {
         checkArgument(localName != null, "Parameter 'localName' may not be null.");
         checkArgument(!localName.isEmpty(), "Parameter 'localName' must be a non-empty string.");
 
@@ -105,7 +105,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
         return localName;
     }
 
-    public static @NonNull QName create(final @NonNull String input) {
+    public static @NonNull QName create(final String input) {
         Matcher matcher = QNAME_PATTERN_FULL.matcher(input);
         if (matcher.matches()) {
             final String namespace = matcher.group(1);
@@ -122,7 +122,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
         throw new IllegalArgumentException("Invalid input: " + input);
     }
 
-    public static @NonNull QName create(final @NonNull QName base, final @NonNull String localName) {
+    public static @NonNull QName create(final QName base, final String localName) {
         return create(base.getModule(), localName);
     }
 
@@ -135,7 +135,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      *            Local name part of QName. MUST NOT BE null.
      * @return Instance of QName
      */
-    public static @NonNull QName create(final @NonNull QNameModule qnameModule, final @NonNull String localName) {
+    public static @NonNull QName create(final QNameModule qnameModule, final String localName) {
         return new QName(requireNonNull(qnameModule, "module may not be null"), checkLocalName(localName));
     }
 
@@ -147,8 +147,8 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @param localName Local name part of QName. MUST NOT BE null.
      * @return Instance of QName
      */
-    public static @NonNull QName create(final @NonNull URI namespace, final @Nullable Revision revision,
-            final @NonNull String localName) {
+    public static @NonNull QName create(final URI namespace, final @Nullable Revision revision,
+            final String localName) {
         return create(QNameModule.create(namespace, revision), localName);
     }
 
@@ -160,8 +160,8 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @param localName Local name part of QName. MUST NOT BE null.
      * @return Instance of QName
      */
-    public static QName create(final @NonNull URI namespace, final @NonNull Optional<Revision> revision,
-            final @NonNull String localName) {
+    public static @NonNull QName create(final URI namespace, final Optional<Revision> revision,
+            final String localName) {
         return create(QNameModule.create(namespace, revision), localName);
     }
 
@@ -173,8 +173,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @param localName Local name part of QName. MUST NOT BE null.
      * @return Instance of QName
      */
-    public static @NonNull QName create(final @NonNull String namespace, final @NonNull String localName,
-            final Revision revision) {
+    public static @NonNull QName create(final String namespace, final String localName, final Revision revision) {
         return create(QNameModule.create(parseNamespace(namespace), revision), localName);
     }
 
@@ -189,8 +188,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @throws IllegalArgumentException If {@code namespace} is not valid URI or {@code revision} does not conform
      *         to {@code YYYY-mm-dd}.
      */
-    public static @NonNull QName create(final @NonNull String namespace, final @NonNull String revision,
-            final @NonNull String localName) {
+    public static @NonNull QName create(final String namespace, final String revision, final String localName) {
         return create(parseNamespace(namespace), Revision.of(revision), localName);
     }
 
@@ -203,7 +201,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @throws NullPointerException If any of parameters is null.
      * @throws IllegalArgumentException If {@code namespace} is not valid URI.
      */
-    public static @NonNull QName create(final @NonNull String namespace, final @NonNull String localName) {
+    public static @NonNull QName create(final String namespace, final String localName) {
         return create(parseNamespace(namespace), localName);
     }
 
@@ -216,7 +214,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @throws NullPointerException If any of parameters is null.
      * @throws IllegalArgumentException If <code>namespace</code> is not valid URI.
      */
-    public static @NonNull QName create(final @NonNull URI namespace, final @NonNull String localName) {
+    public static @NonNull QName create(final URI namespace, final String localName) {
         return new QName(namespace, localName);
     }
 
@@ -227,7 +225,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @return A QName instance
      * @throws IOException if I/O error occurs
      */
-    public static QName readFrom(final @NonNull DataInput in) throws IOException {
+    public static QName readFrom(final DataInput in) throws IOException {
         final QNameModule module = QNameModule.readFrom(in);
         return new QName(module, checkLocalName(in.readUTF()));
     }
@@ -315,7 +313,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
         return Objects.equals(localName, other.localName) && module.equals(other.module);
     }
 
-    private static @NonNull URI parseNamespace(final @NonNull String namespace) {
+    private static @NonNull URI parseNamespace(final String namespace) {
         try {
             return new URI(namespace);
         } catch (final URISyntaxException ue) {
@@ -345,7 +343,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @param newModule New QNameModule to use
      * @return a QName with specified QNameModule and same local name as this one
      */
-    public @NonNull QName withModule(final @NonNull QNameModule newModule) {
+    public @NonNull QName withModule(final QNameModule newModule) {
         return new QName(newModule, localName);
     }
 
@@ -369,7 +367,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @param revision Date object to format
      * @return String representation or null if the input was null.
      */
-    public static @Nullable String formattedRevision(final @NonNull Optional<Revision> revision) {
+    public static @Nullable String formattedRevision(final Optional<Revision> revision) {
         return revision.map(Revision::toString).orElse(null);
     }
 
@@ -384,7 +382,7 @@ public final class QName implements Immutable, Serializable, Comparable<QName>,
      * @return true if this instance and other have equals localName and namespace.
      * @throws NullPointerException if {@code other} is null.
      */
-    public boolean isEqualWithoutRevision(final @NonNull QName other) {
+    public boolean isEqualWithoutRevision(final QName other) {
         return localName.equals(other.getLocalName()) && Objects.equals(getNamespace(), other.getNamespace());
     }
 

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java
index 5f47e77803f05ca1ff4f3bf318a68cd7fed1e975..a626348f507eb4efefbe86146c4ccc9c73247a7f 100644 (file)
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java
@@ -35,7 +35,7 @@ public final class QNameModule implements Comparable<QNameModule>, Immutable, Se
 
     private transient int hash = 0;
 
-    private QNameModule(final @NonNull URI namespace, final @Nullable Revision revision) {
+    private QNameModule(final URI namespace, final @Nullable Revision revision) {
         this.namespace = requireNonNull(namespace);
         this.revision = revision;
     }
@@ -57,19 +57,18 @@ public final class QNameModule implements Comparable<QNameModule>, Immutable, Se
      * @return A new, potentially shared, QNameModule instance
      * @throws NullPointerException if any argument is null
      */
-    public static @NonNull QNameModule create(final @NonNull URI namespace,
-            final @NonNull Optional<Revision> revision) {
+    public static @NonNull QNameModule create(final URI namespace, final Optional<Revision> revision) {
         return new QNameModule(namespace, revision.orElse(null));
     }
 
     /**
-     * Create a new QName module instance with specified namespace and norevision.
+     * Create a new QName module instance with specified namespace and no revision.
      *
      * @param namespace Module namespace
      * @return A new, potentially shared, QNameModule instance
      * @throws NullPointerException if {@code namespace} is null
      */
-    public static @NonNull QNameModule create(final @NonNull URI namespace) {
+    public static @NonNull QNameModule create(final URI namespace) {
         return new QNameModule(namespace, null);
     }
 
@@ -81,7 +80,7 @@ public final class QNameModule implements Comparable<QNameModule>, Immutable, Se
      * @return A new, potentially shared, QNameModule instance
      * @throws NullPointerException if any argument is null
      */
-    public static @NonNull QNameModule create(final @NonNull URI namespace, @Nullable final Revision revision) {
+    public static @NonNull QNameModule create(final URI namespace, final @Nullable Revision revision) {
         return new QNameModule(namespace, revision);
     }
 
@@ -93,7 +92,7 @@ public final class QNameModule implements Comparable<QNameModule>, Immutable, Se
      * @return A QNameModule instance
      * @throws IOException if I/O error occurs
      */
-    public static @NonNull QNameModule readFrom(final @NonNull DataInput in) throws IOException {
+    public static @NonNull QNameModule readFrom(final DataInput in) throws IOException {
         final String namespace = in.readUTF();
         final String revision = in.readUTF();
         return new QNameModule(URI.create(namespace), revision.isEmpty() ? null : Revision.of(revision));