Migrate common/util to use JDT annotations

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

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java
index 8e36661c3ac61b146d64985076cb417d73cad798..8fa39312390cfdf2df6b3955a639f2316c750a1c 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java
@@ -17,7 +17,7 @@ import com.google.common.cache.LoadingCache;
 import java.io.Serializable;
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Map;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Implementation of the {@link Map} interface which stores a single mapping. The key set is shared among all instances
@@ -35,9 +35,8 @@ public abstract class SharedSingletonMap<K, V> implements Serializable, Unmodifi
             super(key, value);
         }
 
-        @Nonnull
         @Override
-        public ModifiableMapPhase<K, V> toModifiableMap() {
+        public @NonNull ModifiableMapPhase<K, V> toModifiableMap() {
             return MutableOffsetMap.orderedCopyOf(this);
         }
     }
@@ -49,9 +48,8 @@ public abstract class SharedSingletonMap<K, V> implements Serializable, Unmodifi
             super(key, value);
         }
 
-        @Nonnull
         @Override
-        public ModifiableMapPhase<K, V> toModifiableMap() {
+        public @NonNull ModifiableMapPhase<K, V> toModifiableMap() {
             return MutableOffsetMap.unorderedCopyOf(this);
         }
     }
@@ -60,7 +58,7 @@ public abstract class SharedSingletonMap<K, V> implements Serializable, Unmodifi
     private static final LoadingCache<Object, SingletonSet<Object>> CACHE = CacheBuilder.newBuilder().weakValues()
             .build(new CacheLoader<Object, SingletonSet<Object>>() {
                 @Override
-                public SingletonSet<Object> load(@Nonnull final Object key) {
+                public SingletonSet<Object> load(final Object key) {
                     return SingletonSet.of(key);
                 }
             });
@@ -96,21 +94,18 @@ public abstract class SharedSingletonMap<K, V> implements Serializable, Unmodifi
         return new Unordered<>(e.getKey(), e.getValue());
     }
 
-    @Nonnull
     @Override
-    public final SingletonSet<Entry<K, V>> entrySet() {
+    public final @NonNull SingletonSet<Entry<K, V>> entrySet() {
         return SingletonSet.of(new SimpleImmutableEntry<>(keySet.getElement(), value));
     }
 
-    @Nonnull
     @Override
-    public final SingletonSet<K> keySet() {
+    public final @NonNull SingletonSet<K> keySet() {
         return keySet;
     }
 
-    @Nonnull
     @Override
-    public final SingletonSet<V> values() {
+    public final @NonNull SingletonSet<V> values() {
         return SingletonSet.of(value);
     }
 
@@ -153,7 +148,7 @@ public abstract class SharedSingletonMap<K, V> implements Serializable, Unmodifi
 
     @Override
     @SuppressWarnings("checkstyle:parameterName")
-    public final void putAll(@Nonnull final Map<? extends K, ? extends V> m) {
+    public final void putAll(final Map<? extends K, ? extends V> m) {
         throw new UnsupportedOperationException();
     }