Bump odlparent to 10.0.0

Adopt odlparent-10, addressing a few issues flushed out.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 2b2e54c09e932c7bb977ee3be08b22e7ace4f065..76bfe2c08ad357f117d3f4164cb410980a494b8b 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>9.0.13</version>
+      <version>10.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 01b7a902ef1cc1029155b780fec9c59b9564192d..07a264145e65fb1cb94a87049fe600da463ac92f 100644 (file)
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/bnd-parent/pom.xml b/bnd-parent/pom.xml
index cef814662e8018dce14c94449e357b2855a78f25..00de724b670770c9034d46efa23a273a76d80c7a 100644 (file)
--- a/bnd-parent/pom.xml
+++ b/bnd-parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bnd-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index 0874eceb85f29bae991cf045e9bbbf587732e7b0..42055335e0b4a26c6fb4f7750b8116bf9b1fd302 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/codec/pom.xml b/codec/pom.xml
index 7c116cdc72e63bedc4fa7c27b824639768e7f6a3..f48050f58256950b5012267b709e055e98fb7b41 100644 (file)
--- a/codec/pom.xml
+++ b/codec/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactorySupplier.java b/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactorySupplier.java
index abe389fd0827230688e45bda87b8147cff43c93a..8e0667158575be11ee32a713f8c7561662b3aaa7 100644 (file)
--- a/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactorySupplier.java
+++ b/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactorySupplier.java
@@ -15,6 +15,7 @@ import com.google.common.base.Stopwatch;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Optional;
 import java.util.function.BiFunction;
 import org.eclipse.jdt.annotation.NonNull;
@@ -111,16 +112,18 @@ public enum JSONCodecFactorySupplier {
     private final LoadingCache<EffectiveModelContext, JSONCodecFactory> precomputed;
 
     // Weak keys to retire the entry when SchemaContext goes away and to force identity-based lookup
-    private final LoadingCache<EffectiveModelContext, JSONCodecFactory> shared;
-
-    JSONCodecFactorySupplier() {
-        precomputed = CacheBuilder.newBuilder().weakKeys().build(new EagerCacheLoader(this::createFactory));
-        shared = CacheBuilder.newBuilder().weakKeys().build(new CacheLoader<EffectiveModelContext, JSONCodecFactory>() {
+    private final LoadingCache<EffectiveModelContext, JSONCodecFactory> shared = CacheBuilder.newBuilder()
+        .weakKeys().build(new CacheLoader<EffectiveModelContext, JSONCodecFactory>() {
             @Override
             public JSONCodecFactory load(final EffectiveModelContext key) {
                 return createFactory(key, new SharedCodecCache<>());
             }
         });
+
+    @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR",
+        justification = "https://github.com/spotbugs/spotbugs/issues/1867")
+    JSONCodecFactorySupplier() {
+        precomputed = CacheBuilder.newBuilder().weakKeys().build(new EagerCacheLoader(this::createFactory));
     }
 
     /**

diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml
index 882b992a0202d43188b37301ec56fb4071194a9d..a742639f45da047a68f44f1d65162f5900189e6d 100644 (file)
--- a/common/mockito-configuration/pom.xml
+++ b/common/mockito-configuration/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index 1a09a08c97924808bc5c266ac3c221c80575f15c..19c3e06f37e57f3a1ec0a50701e0a31a39329097 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>9.0.13</version>
+      <version>10.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml
index 37c4e6200ff22a9818c5b4275d6f11cbaafb8b49..3c7364002b9770b613f02f5782fa2e2738b7bb97 100644 (file)
--- a/common/testutils/pom.xml
+++ b/common/testutils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java
index 66b20fbdf1ec9be8cdb47ef557bc897be1b08d38..bba914f7ea42f4c4211b877726e8db7ffff56f03 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java
@@ -8,12 +8,12 @@
 package org.opendaylight.yangtools.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verifyNotNull;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.UnmodifiableIterator;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -137,13 +137,7 @@ public abstract class ImmutableOffsetMap<K, V> implements UnmodifiableMapPhase<K
         }
 
         final ImmutableMap<K, Integer> offsets = OffsetMapCache.orderedOffsets(map.keySet());
-        @SuppressWarnings("unchecked")
-        final V[] array = (V[]) new Object[offsets.size()];
-        for (Entry<K, V> e : map.entrySet()) {
-            array[offsets.get(e.getKey())] = e.getValue();
-        }
-
-        return new Ordered<>(offsets, array);
+        return new Ordered<>(offsets, createArray(offsets, map));
     }
 
     /**
@@ -173,13 +167,16 @@ public abstract class ImmutableOffsetMap<K, V> implements UnmodifiableMapPhase<K
         }
 
         final ImmutableMap<K, Integer> offsets = OffsetMapCache.unorderedOffsets(map.keySet());
+        return new Unordered<>(offsets, createArray(offsets, map));
+    }
+
+    private static <K, V> V[] createArray(final ImmutableMap<K, Integer> offsets, final Map<K, V> map) {
         @SuppressWarnings("unchecked")
         final V[] array = (V[]) new Object[offsets.size()];
         for (Entry<K, V> e : map.entrySet()) {
-            array[offsets.get(e.getKey())] = e.getValue();
+            array[verifyNotNull(offsets.get(e.getKey()))] = e.getValue();
         }
-
-        return new Unordered<>(offsets, array);
+        return array;
     }
 
     private static <K, V> @Nullable Map<K, V> commonCopy(final @NonNull Map<K, V> map) {
@@ -397,8 +394,6 @@ public abstract class ImmutableOffsetMap<K, V> implements UnmodifiableMapPhase<K
         return f;
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static void setField(final @NonNull ImmutableOffsetMap<?, ?> map, final @NonNull Field field,
             final Object value) throws IOException {
         try {

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMapTemplate.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMapTemplate.java
index 091b40a4e8e95ec740b6ce52f933292bd6db14c1..c171a82f7e62e5650a0bef8cc258809876c919d6 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMapTemplate.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMapTemplate.java
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
@@ -105,15 +106,20 @@ public abstract class ImmutableOffsetMapTemplate<K> extends ImmutableMapTemplate
         final V[] objects = (V[]) new Object[size];
         for (Entry<K, T> entry : fromMap.entrySet()) {
             final K key = requireNonNull(entry.getKey());
-            final Integer offset = offsets.get(key);
-            checkArgument(offset != null, "Key %s present in input, but not in offsets %s", key, offsets);
-
-            objects[offset.intValue()] = transformValue(key, entry.getValue(), valueTransformer);
+            objects[offsetOf(key)] = transformValue(key, entry.getValue(), valueTransformer);
         }
 
         return createMap(offsets, objects);
     }
 
+    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE",
+        justification = "SpotBugs does not grok checkArgument()")
+    private int offsetOf(final K key) {
+        final Integer offset = offsets.get(key);
+        checkArgument(offset != null, "Key %s present in input, but not in offsets %s", key, offsets);
+        return offset;
+    }
+
     @Override
     @SafeVarargs
     public final <V> @NonNull ImmutableOffsetMap<K, V> instantiateWithValues(final V... values) {

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java
index 60f52396de4abe8e3231a1d9f75322fe44a6622f..9f755d405907cea3036223ceb675559b25123bee 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java
@@ -8,6 +8,7 @@
 package org.opendaylight.yangtools.util;
 
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verifyNotNull;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
@@ -150,7 +151,7 @@ public abstract class MutableOffsetMap<K, V> extends AbstractMap<K, V> implement
         this(offsets, new Object[offsets.size()]);
 
         for (Entry<K, V> e : source.entrySet()) {
-            objects[offsets.get(e.getKey())] = requireNonNull(e.getValue());
+            objects[verifyNotNull(offsets.get(e.getKey()))] = requireNonNull(e.getValue());
         }
 
         this.needClone = false;

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java b/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java
index 51f65dfac6abd060a8e3ae4fdb188b8acddfe389..c14a6fe968fff71c1f3835777f877946ec15f236 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java
@@ -11,6 +11,7 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
 import com.google.common.collect.Iterators;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Iterator;
@@ -168,6 +169,8 @@ public abstract class SingletonSet<E> implements Set<E>, Immutable, Serializable
         return s.size() == 1 && otherContains(s);
     }
 
+    @SuppressFBWarnings(value = "DCN_NULLPOINTER_EXCEPTION",
+        justification = "https://github.com/spotbugs/spotbugs/issues/1954")
     private boolean otherContains(final @NonNull Collection<?> other) {
         try {
             return other.contains(getElement());

diff --git a/data/pom.xml b/data/pom.xml
index c8bbc21c9982515dbc994100ae9ef1e59ca590a3..0738c2155b9e64c4d5e7f44c0d79b894dcfc7c4e 100644 (file)
--- a/data/pom.xml
+++ b/data/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/data/rfc8528-data-util/src/main/java/module-info.java b/data/rfc8528-data-util/src/main/java/module-info.java
index 77de84111bd1143bacb7a59ac8421960fde211e9..f58d13121277e3983885dd3355c3b10929a31cc1 100644 (file)
--- a/data/rfc8528-data-util/src/main/java/module-info.java
+++ b/data/rfc8528-data-util/src/main/java/module-info.java
@@ -25,4 +25,5 @@ module org.opendaylight.yangtools.rfc8528.data.util {
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
+    requires static com.github.spotbugs.annotations;
 }

diff --git a/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/MountPointNormalizedNodeWriter.java b/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/MountPointNormalizedNodeWriter.java
index 2d023b00febafb6fc7846c8034a5958da0cdbccd..3f3e544d657f46f18411aec4c91bb7116b79395c 100644 (file)
--- a/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/MountPointNormalizedNodeWriter.java
+++ b/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/MountPointNormalizedNodeWriter.java
@@ -11,6 +11,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointNode;
@@ -70,6 +71,8 @@ public abstract class MountPointNormalizedNodeWriter extends NormalizedNodeWrite
         return new Filtering(writer);
     }
 
+    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE",
+        justification = "SpotBugs does not grok checkArgument()")
     public static @NonNull MountPointNormalizedNodeWriter forwardingFor(final NormalizedNodeStreamWriter writer) {
         final StreamWriterMountPointExtension mountWriter = writer.getExtensions()
             .getInstance(StreamWriterMountPointExtension.class);

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
index a2ff3b598bf57300570a771a019461fb57780f95..8c2204dd6d1a3890553833d834f2c2f531ef9303 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
@@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.Serializable;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
@@ -386,8 +385,6 @@ public abstract class YangInstanceIdentifier implements HierarchicalIdentifier<Y
         return hash;
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static int hashCode(final Object value) {
         if (value == null) {
             return 0;

diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java
index 7c593ecfa50b1302546fe43ed14e49047c7aa872..403722c41965740290197f3f3c4c42f82e23697a 100644 (file)
--- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java
+++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.yang.data.impl.schema.builder.impl;
 
 import com.google.common.collect.Iterables;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -163,8 +162,6 @@ public class ImmutableUserLeafSetNodeBuilder<T> implements ListNodeBuilder<T, Us
             return children.equals(((ImmutableUserLeafSetNode<?>) other).children);
         }
 
-        @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
         private Map<NodeWithValue, LeafSetEntryNode<T>> getChildren() {
             return Collections.unmodifiableMap(children);
         }

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/UniqueValidator.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/UniqueValidator.java
index 14242d095e3f1650103f84fcd002b7d68f23c3a3..b502a90d4d651633debda4b5480d6e611ad8d8c4 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/UniqueValidator.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/UniqueValidator.java
@@ -16,7 +16,6 @@ import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -122,8 +121,6 @@ abstract class UniqueValidator<T> implements Immutable {
      * @param path Path to encode
      * @return Encoded path.
      */
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-        justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static Object encodePath(final List<NodeIdentifier> path) {
         return path.size() == 1 ? path.get(0) : ImmutableList.copyOf(path);
     }
@@ -139,8 +136,6 @@ abstract class UniqueValidator<T> implements Immutable {
             : (ImmutableList<NodeIdentifier>) obj;
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-        justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static @NonNull Descendant decodeDescendant(final Object obj) {
         return Descendant.of(Collections2.transform(decodePath(obj), NodeIdentifier::getNodeType));
     }
@@ -153,8 +148,6 @@ abstract class UniqueValidator<T> implements Immutable {
      * @param path Descendant path
      * @return Value for the descendant
      */
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-        justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static @Nullable Object extractValue(final Map<List<NodeIdentifier>, Object> valueCache,
             final DataContainerNode data, final List<NodeIdentifier> path) {
         return valueCache.computeIfAbsent(path, key -> extractValue(data, key));

diff --git a/docs/pom.xml b/docs/pom.xml
index e2a273708b312591d95b540f4cd87a9c51bac1d2..3dbf2ca3405a92ccb9c23c6e7f7bfdf6dc1c95cb 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -385,7 +385,7 @@
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.10/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/9.0.13/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/10.0.0/</link>
                     </links>
                     <groups>
                         <group>

diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml
index 45784a432495f7352e2b446421fed595e38a4d24..d4a3eddff774eb87142f44943dc7e6fd5996d7ec 100644 (file)
--- a/features/features-yangtools-experimental/pom.xml
+++ b/features/features-yangtools-experimental/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml
index c602732c2137df47f932ec67b5837b00c641fcb2..87eaf71ac76aad07930c608b9ac8334592c066d9 100644 (file)
--- a/features/features-yangtools/pom.xml
+++ b/features/features-yangtools/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml
index 76663e1b21b719b444a8001a4659cf2f72d32166..89e41f2465dce924deb931cba99c08fe436c8fc7 100644 (file)
--- a/features/odl-yangtools-codec/pom.xml
+++ b/features/odl-yangtools-codec/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-codec/src/main/feature/feature.xml b/features/odl-yangtools-codec/src/main/feature/feature.xml
index 97a8e9536481d8ef40cfc753a9eefdd2159e9db1..c7122de582ec6df32913323845cca65cb9f814e8 100644 (file)
--- a/features/odl-yangtools-codec/src/main/feature/feature.xml
+++ b/features/odl-yangtools-codec/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-codec">
     <feature name="odl-yangtools-codec">
-        <feature version="[9,10)">odl-gson</feature>
-        <feature version="[9,10)">odl-stax2-api</feature>
+        <feature version="[10,11)">odl-gson</feature>
+        <feature version="[10,11)">odl-stax2-api</feature>
     </feature>
 </features>

diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml
index 2866a8db8d96e760e00078fb8a1f4c9d65a7dafc..6cd73637a4978980f481aee552da7e302389e14e 100644 (file)
--- a/features/odl-yangtools-common/pom.xml
+++ b/features/odl-yangtools-common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml
index 6fe57e79c08432801321666072e5ea89c7b6d484..ec2c6db9475ddde3c191a447bdd712605088958e 100644 (file)
--- a/features/odl-yangtools-data-api/pom.xml
+++ b/features/odl-yangtools-data-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index e5a2c51b966501be4b649204474264d1a3e3ec3d..1978160efb97189a5a966633b9535ca056f5a600 100644 (file)
--- a/features/odl-yangtools-data/pom.xml
+++ b/features/odl-yangtools-data/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-data/src/main/feature/feature.xml b/features/odl-yangtools-data/src/main/feature/feature.xml
index 29da8eea1b440cc34bb752ffe472a9ecd70dba8a..9ea3ca68dab8ba528f3755d862c6f3f9fc637b5a 100644 (file)
--- a/features/odl-yangtools-data/src/main/feature/feature.xml
+++ b/features/odl-yangtools-data/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-data">
     <feature name="odl-yangtools-data">
-        <feature version="[9,10)">odl-antlr4</feature>
+        <feature version="[10,11)">odl-antlr4</feature>
     </feature>
 </features>

diff --git a/features/odl-yangtools-exp-data-xpath-api/pom.xml b/features/odl-yangtools-exp-data-xpath-api/pom.xml
index 22d914e0acfe7fa96d6cd24610023bc45643e344..f24c7b5c77c75faeb7c7d6c47abba2d8ae8da684 100644 (file)
--- a/features/odl-yangtools-exp-data-xpath-api/pom.xml
+++ b/features/odl-yangtools-exp-data-xpath-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-exp-data-xpath/pom.xml b/features/odl-yangtools-exp-data-xpath/pom.xml
index e4eb64039e83ed8623186d31d10e0e9fcdc721ba..8f3ada4432349950b0e3a62bc9238b9ffcbe0f4d 100644 (file)
--- a/features/odl-yangtools-exp-data-xpath/pom.xml
+++ b/features/odl-yangtools-exp-data-xpath/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml
index 4c86e3ccd7f4cd638c14bf38ab76703b0281d26e..c8400a6ad04f3550d92153b7b8afbee8059a545a 100644 (file)
--- a/features/odl-yangtools-export/pom.xml
+++ b/features/odl-yangtools-export/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml
index 01cb2887bdbb8aac4fe43b02f9e4c4307c038940..4a39a90c1a83f7b08a4ee01f2c7973b41eed2a2b 100644 (file)
--- a/features/odl-yangtools-netty/pom.xml
+++ b/features/odl-yangtools-netty/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-netty/src/main/feature/feature.xml b/features/odl-yangtools-netty/src/main/feature/feature.xml
index dc798c447e652903a9c229923110be0725f7f509..84b16e43b389cc0235db3c1558a622dff61f8082 100644 (file)
--- a/features/odl-yangtools-netty/src/main/feature/feature.xml
+++ b/features/odl-yangtools-netty/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-netty">
     <feature name="odl-yangtools-netty">
-        <feature version="[9,10)">odl-netty-4</feature>
+        <feature version="[10,11)">odl-netty-4</feature>
     </feature>
 </features>

diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml
index d731f3cb11c52499842a7c04309817fce07b4e1b..14995d19cff1fd77d6d795173da9a3b3c3b90ec4 100644 (file)
--- a/features/odl-yangtools-parser-api/pom.xml
+++ b/features/odl-yangtools-parser-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml
index 6bc736e6524f7fcc09e00cb4be91e4116c43e4b4..d9d632c02123604c6f7590eee96ddf4bba097ced 100644 (file)
--- a/features/odl-yangtools-parser/pom.xml
+++ b/features/odl-yangtools-parser/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-parser/src/main/feature/feature.xml b/features/odl-yangtools-parser/src/main/feature/feature.xml
index b12e8e4279f04226c355ac45513af70a80a7c97a..8575f5284ec3440cc6118c031fb0ccb84b264ce9 100644 (file)
--- a/features/odl-yangtools-parser/src/main/feature/feature.xml
+++ b/features/odl-yangtools-parser/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-parser">
     <feature name="odl-yangtools-parser">
-        <feature version="[9,10)">odl-antlr4</feature>
+        <feature version="[10,11)">odl-antlr4</feature>
     </feature>
 </features>

diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml
index 18fa6a9db8f2d94e758f0faf2d4bcce6dfbb4203..40453e3d26ddeedf4c898855e17580beda98cea4 100644 (file)
--- a/features/odl-yangtools-util/pom.xml
+++ b/features/odl-yangtools-util/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-util/src/main/feature/feature.xml b/features/odl-yangtools-util/src/main/feature/feature.xml
index 3bd7f37663a6a94066bbf7c74703f5228e1581e0..7b8a427f04cfee60d57a53f41b3e1a14b51e768e 100644 (file)
--- a/features/odl-yangtools-util/src/main/feature/feature.xml
+++ b/features/odl-yangtools-util/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-util">
     <feature name="odl-yangtools-util">
-        <feature version="[9,10)">odl-guava</feature>
+        <feature version="[10,11)">odl-guava</feature>
         <feature version="[1,2)">pt-triemap</feature>
     </feature>
 </features>

diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml
index fc030532c29646290b6c09283667285bc842dc93..c50b3f4ea3632c51dc436f3bcf6d2f0af8c7c007 100644 (file)
--- a/features/odl-yangtools-xpath-api/pom.xml
+++ b/features/odl-yangtools-xpath-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml
index 9d26d375ded3dd1f9286040630ec729c970ebb7a..0b4ccef1230b630df7cf06c006ea63acfd38248e 100644 (file)
--- a/features/odl-yangtools-xpath/pom.xml
+++ b/features/odl-yangtools-xpath/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-xpath/src/main/feature/feature.xml b/features/odl-yangtools-xpath/src/main/feature/feature.xml
index 8e7483cee24469af9e4e1613297ceaaffcdabb43..e6732601c8bdb5e4fc426ee87980edd1dfec7090 100644 (file)
--- a/features/odl-yangtools-xpath/src/main/feature/feature.xml
+++ b/features/odl-yangtools-xpath/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-xpath">
     <feature name="odl-yangtools-xpath">
-        <feature version="[9,10)">odl-antlr4</feature>
+        <feature version="[10,11)">odl-antlr4</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 419a898c062a1bf67a409f5d304511534d76b4a5..c64819e69a86c6ecdb4dc26bfb2a853d47de0f85 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 3fab9fe7cd134f3c80980db48f8f7e0adc256f33..c32bdc150817c321e11d71761e1e291473045d60 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index 1a60ec4594243b7bae5ee7ec276165b9f1793b3b..25d6bf8a4bd06d791029b0f7808c6f21b29f7d7e 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java
index b5f9be9e8d05096033158d50eeb47e3b7acab827..728d8ea68af18920a3a952ba4595cb8cfef209e0 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java
@@ -14,7 +14,6 @@ import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -293,8 +292,6 @@ public abstract class SchemaNodeIdentifier implements Immutable {
         return ids.size() < 2 ? ids : simplifyQNames(ids);
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static ImmutableList<QName> checkQNames(final Collection<QName> qnames) {
         final ImmutableList<QName> ret = ImmutableList.copyOf(qnames);
         checkArgument(!ret.isEmpty(), "SchemaNodeIdentifier has to have at least one node identifier");

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java
index 578a9250639b2e9f29aca2025af4b34c97935a03..ee4b21fe83f46b24657827488fc7954b2b000d7b 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java
@@ -11,7 +11,6 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.annotations.Beta;
 import com.google.common.collect.Range;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.Immutable;
 
@@ -97,8 +96,6 @@ public abstract class UnresolvedNumber extends Number implements Immutable {
         throw new UnsupportedOperationException();
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static <T extends Number> T resolve(final T number) {
         checkArgument(!(number instanceof UnresolvedNumber));
         return number;

diff --git a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractSchemaContext.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractSchemaContext.java
index 5c2b570e62b231a22593ee0aad948b7d32a6c07e..05c1eb6687e25345b8d377d5ea9e3175a9d34408 100644 (file)
--- a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractSchemaContext.java
+++ b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractSchemaContext.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.spi;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableMap;
@@ -228,7 +227,9 @@ public abstract class AbstractSchemaContext implements SchemaContext {
             local = loadDerivedIdentities();
         }
         final ImmutableSet<IdentitySchemaNode> result = local.get(requireNonNull(identity));
-        checkArgument(result != null, "Identity %s not found", identity);
+        if (result == null) {
+            throw new IllegalArgumentException("Identity " + identity + " not found");
+        }
         return result;
     }
 

diff --git a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java
index 0d8cbf53067ac3b86f177554d59f5f2b3875c3dd..5c5b9bbd60833df410f3e223140760cbfdbc1cbc 100644 (file)
--- a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java
+++ b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.model.spi.meta;
 
+import static com.google.common.base.Verify.verifyNotNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
@@ -329,7 +331,7 @@ public final class EffectiveStatementMixins {
             extends DocumentedNodeMixin.WithStatus<A, D>, CopyableMixin<A, D>, UnknownSchemaNode {
         @Override
         default String getNodeParameter() {
-            return Strings.nullToEmpty(getDeclared().rawArgument());
+            return Strings.nullToEmpty(verifyNotNull(getDeclared()).rawArgument());
         }
     }
 

diff --git a/parser/pom.xml b/parser/pom.xml
index 650f89a3e61df4e46a2372eb036d93027645a30e..9f6ad14ab497e7ef38840d40da8c9f8277e50bf4 100644 (file)
--- a/parser/pom.xml
+++ b/parser/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java
index 699a80611b3f63da776f869c64cd96467c686856..5598129ede65c96a055b1d738f2cd9dcc3a7eac0 100644 (file)
--- a/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java
+++ b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java
@@ -182,7 +182,7 @@ abstract class DependencyResolver {
 
         @Override
         public String getPrefix() {
-            return null;
+            throw new UnsupportedOperationException();
         }
 
         @Override

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
index c81bf3a8843bd07eeff1e9cba0a1f0d2709f492f..42b9e38a0b2d3a7301a2a4dde53eaafc62c1bad0 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
@@ -316,7 +316,10 @@ public abstract class YangModelDependencyInfo {
     static String safeStringArgument(final SourceIdentifier source, final IRStatement stmt, final String desc) {
         final StatementSourceReference ref = getReference(source, stmt);
         final IRArgument arg = stmt.argument();
-        checkArgument(arg != null, "Missing %s at %s", desc, ref);
+        if (arg == null) {
+            throw new IllegalArgumentException("Missing " + desc + " at " + ref);
+        }
+
         // TODO: we probably need to understand yang version first....
         return ArgumentContextUtils.rfc6020().stringFromStringContext(arg, ref);
     }
@@ -410,7 +413,7 @@ public abstract class YangModelDependencyInfo {
 
         @Override
         public String getPrefix() {
-            return null;
+            throw new UnsupportedOperationException();
         }
 
         @Override

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java
index f3b314384d4bd5a4fc988ba31b39954fc6088345..11dc737e53faf71429dfb4bc795b894a75fc0a1f 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java
@@ -13,7 +13,6 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -258,8 +257,6 @@ abstract class AbstractDeviateStatementSupport
         return false;
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static void performDeviateAdd(final StmtContext<?, ?, ?> deviateStmtCtx,
             final Mutable<?, ?, ?> targetCtx) {
         for (StmtContext<?, ?, ?> originalStmtCtx : deviateStmtCtx.declaredSubstatements()) {
@@ -286,8 +283,6 @@ abstract class AbstractDeviateStatementSupport
         copyStatement(stmtCtxToBeAdded, targetCtx);
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static void performDeviateReplace(final StmtContext<?, ?, ?> deviateStmtCtx,
             final Mutable<?, ?, ?> targetCtx) {
         for (StmtContext<?, ?, ?> originalStmtCtx : deviateStmtCtx.declaredSubstatements()) {
@@ -337,8 +332,6 @@ abstract class AbstractDeviateStatementSupport
             stmtToBeReplaced.getStatementName(), targetCtx.argument());
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static void performDeviateDelete(final StmtContext<?, ?, ?> deviateStmtCtx,
                 final Mutable<?, ?, ?> targetCtx) {
         for (StmtContext<?, ?, ?> originalStmtCtx : deviateStmtCtx.declaredSubstatements()) {

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java
index 48c78e54fb189d9c5f65f8ca8c49b9f60a09742b..51d8fed36bb52486b3a9c5dd47bc11ea064804a5 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java
@@ -12,7 +12,6 @@ import static org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPha
 import static org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils.firstAttributeOf;
 
 import com.google.common.base.MoreObjects.ToStringHelper;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collection;
 import java.util.Optional;
 import org.opendaylight.yangtools.concepts.SemVer;
@@ -167,14 +166,10 @@ final class SemanticVersionImport {
         return Optional.ofNullable(stmt.getFromNamespace(SemanticVersionNamespace.class, stmt));
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static String getRequestedImportVersionString(final StmtContext<?, ?, ?> stmt) {
         return getRequestedImportVersion(stmt).map(SemVer::toString).orElse("<any>");
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static SemVerSourceIdentifier createSemVerModuleIdentifier(
             final SourceIdentifier importedModuleIdentifier, final SemVer semVer) {
         return SemVerSourceIdentifier.create(importedModuleIdentifier.getName(),

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java
index f2d2f24a8f7da699936424a0e256a97817501caa..b2be7e546521c3c7df7f24378eb28942e685840b 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java
@@ -12,7 +12,6 @@ import static com.google.common.base.Verify.verifyNotNull;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -191,8 +190,6 @@ public final class UsesStatementSupport
      * @throws SourceException
      *             instance of SourceException
      */
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static void copyFromSourceToTarget(final StmtContext<?, ?, ?> sourceGrpStmtCtx,
             final Mutable<?, ?, ?> targetCtx, final Mutable<QName, UsesStatement, UsesEffectiveStatement> usesNode) {
         final var declared = sourceGrpStmtCtx.declaredSubstatements();
@@ -275,8 +272,6 @@ public final class UsesStatementSupport
         return null;
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static void resolveUsesNode(final Mutable<QName, UsesStatement, UsesEffectiveStatement> usesNode,
             final StmtContext<?, ?, ?> targetNodeStmtCtx) {
         for (Mutable<?, ?, ?> subStmtCtx : usesNode.mutableDeclaredSubstatements()) {

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 56146bd1bacda1f6b0803c7705651bc79aa10dfd..2b419be9157b492ab94778d67b797b3608462402 100644 (file)
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/plugin/yang-maven-plugin-it/pom.xml b/plugin/yang-maven-plugin-it/pom.xml
index 9c5be345132755e50ed4519ea41421737f84cd2d..488bfa44ec92462e47eef1145a2f70bb1f021594 100644 (file)
--- a/plugin/yang-maven-plugin-it/pom.xml
+++ b/plugin/yang-maven-plugin-it/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/plugin/yang-maven-plugin-spi/pom.xml b/plugin/yang-maven-plugin-spi/pom.xml
index 2be892286bc165088c36ac56f29d7aaa8451b2b6..253d97423eee2a943ef49db3db72458d7ff69840 100644 (file)
--- a/plugin/yang-maven-plugin-spi/pom.xml
+++ b/plugin/yang-maven-plugin-spi/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/plugin/yang-maven-plugin/pom.xml b/plugin/yang-maven-plugin/pom.xml
index 24a3c731f9516e395ff6cf53def0fff0ca59cc91..773c8ff9b3ff3602238f5dd63789b28a577dd84a 100644 (file)
--- a/plugin/yang-maven-plugin/pom.xml
+++ b/plugin/yang-maven-plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index e4d88319b4405d6d8004d6861a04987386330772..ce4775058899ec16e48b8ffd4c094fd8c8d59bf7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>9.0.13</version>
+      <version>10.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/tools/pom.xml b/tools/pom.xml
index e730520740fb8c3c9c4768f9476385a11c472967..3e39599bccef22d424f449627d85627ae312627c 100644 (file)
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/tools/yang-model-validator/pom.xml b/tools/yang-model-validator/pom.xml
index 33a3244c0e16d9b67b12985321d3b989cf9dbe9e..419daa62c648a322cddb20c35c2877917a8b6475 100644 (file)
--- a/tools/yang-model-validator/pom.xml
+++ b/tools/yang-model-validator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/tools/yang-validation-tool/pom.xml b/tools/yang-validation-tool/pom.xml
index 6eb48041972e45c381ce5b18f9aa03499e61647f..d6ee42ad832a9004675f96a4459fafb118daf06d 100644 (file)
--- a/tools/yang-validation-tool/pom.xml
+++ b/tools/yang-validation-tool/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/xpath/pom.xml b/xpath/pom.xml
index d3314a3e4b02a605bb1ce6a0490bd1b29555d888..f7bb76dc116ae88b23ca12294f9f88a4646e7d4c 100644 (file)
--- a/xpath/pom.xml
+++ b/xpath/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/yang/pom.xml b/yang/pom.xml
index 314a9adaeffd92b1223fc93fe85c117b3c88c3b3..4b8055db40d503f968e9b9c2ae85952cbcc10643 100644 (file)
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.13</version>
+        <version>10.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/yang/yang-repo-spi/src/main/java/org/opendaylight/yangtools/yang/model/repo/spi/AbstractSchemaRepository.java b/yang/yang-repo-spi/src/main/java/org/opendaylight/yangtools/yang/model/repo/spi/AbstractSchemaRepository.java
index d889bf63377674a401cea628a698d0b5e2750eb5..33d0c01e7a40665df33e83bcedc41666c8ec6866 100644 (file)
--- a/yang/yang-repo-spi/src/main/java/org/opendaylight/yangtools/yang/model/repo/spi/AbstractSchemaRepository.java
+++ b/yang/yang-repo-spi/src/main/java/org/opendaylight/yangtools/yang/model/repo/spi/AbstractSchemaRepository.java
@@ -18,7 +18,6 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -137,8 +136,6 @@ public abstract class AbstractSchemaRepository implements SchemaRepository, Sche
         }
     }
 
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private synchronized <T extends SchemaSourceRepresentation> void removeSource(final PotentialSchemaSource<?> source,
             final SchemaSourceRegistration<?> reg) {
         final Multimap<Class<? extends SchemaSourceRepresentation>, AbstractSchemaSourceRegistration<?>> m =