Bump odlparent to 10.0.0

[yangtools.git] / common / util / src / main / java / org / opendaylight / yangtools / util / ImmutableOffsetMapTemplate.java

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) {