Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump odlparent to 10.0.0
[yangtools.git]
/
common
/
util
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
util
/
ImmutableOffsetMap.java
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;
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 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;
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());
}
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());
}
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()) {
@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) {
}
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;
}
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 {
private static void setField(final @NonNull ImmutableOffsetMap<?, ?> map, final @NonNull Field field,
final Object value) throws IOException {
try {