update dictionary interfaces

Author: JavaSaBr

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/Dictionary.java

@@ -24,7 +24,6 @@ public interface Dictionary<K, V> extends Iterable<V> {
 
   Optional<V> getOptional(K key);
 
-  @Nullable
   V getOrDefault(K key, V def);
 
   <C extends Collection<K>> C keys(C container);

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/IntToRefDictionary.java

@@ -10,24 +10,24 @@
 
 public interface IntToRefDictionary<V> extends Dictionary<Integer, V> {
 
-  static <V> IntToRefEntry<V> entry(int key, @Nullable V value) {
+  static <V> IntToRefEntry<V> entry(int key, V value) {
     return new SimpleIntToRefEntry<>(key, value);
   }
 
   static <V> IntToRefDictionary<V> empty() {
     return ImmutableHashBasedIntToRefDictionary.empty();
   }
 
-  static <K, V> IntToRefDictionary<V> of(int key, @Nullable V value) {
+  static <V> IntToRefDictionary<V> of(int key, V value) {
     return ofEntries(entry(key, value));
   }
 
-  static <K, V> IntToRefDictionary<V> of(int k1, @Nullable V v1, int k2, @Nullable V v2) {
+  static <V> IntToRefDictionary<V> of(int k1, V v1, int k2, V v2) {
     return ofEntries(entry(k1, v1), entry(k2, v2));
   }
 
   @SafeVarargs
-  static <K, V> IntToRefDictionary<V> ofEntries(IntToRefEntry<V>... entries) {
+  static <V> IntToRefDictionary<V> ofEntries(IntToRefEntry<V>... entries) {
     MutableIntToRefDictionary<V> mutable = DictionaryFactory.mutableIntToRefDictionary();
     for (var entry : entries) {
       mutable.put(entry.key(), entry.value());
@@ -42,7 +42,6 @@ static <K, V> IntToRefDictionary<V> ofEntries(IntToRefEntry<V>... entries) {
 
   Optional<V> getOptional(int key);
 
-  @Nullable
   V getOrDefault(int key, V def);
 
   MutableIntArray keys(MutableIntArray container);

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/LongToRefDictionary.java

@@ -10,24 +10,24 @@
 
 public interface LongToRefDictionary<V> extends Dictionary<Long, V> {
 
-  static <V> LongToRefEntry<V> entry(long key, @Nullable V value) {
+  static <V> LongToRefEntry<V> entry(long key, V value) {
     return new SimpleLongToRefEntry<>(key, value);
   }
 
-  static <K, V> LongToRefDictionary<V> empty() {
+  static <V> LongToRefDictionary<V> empty() {
     return ImmutableHashBasedLongToRefDictionary.empty();
   }
 
-  static <K, V> LongToRefDictionary<V> of(long key, @Nullable V value) {
+  static <V> LongToRefDictionary<V> of(long key, V value) {
     return ofEntries(entry(key, value));
   }
 
-  static <K, V> LongToRefDictionary<V> of(long k1, @Nullable V v1, long k2, @Nullable V v2) {
+  static <V> LongToRefDictionary<V> of(long k1, V v1, long k2, V v2) {
     return ofEntries(entry(k1, v1), entry(k2, v2));
   }
 
   @SafeVarargs
-  static <K, V> LongToRefDictionary<V> ofEntries(LongToRefEntry<V>... entries) {
+  static <V> LongToRefDictionary<V> ofEntries(LongToRefEntry<V>... entries) {
     MutableLongToRefDictionary<V> mutable = DictionaryFactory.mutableLongToRefDictionary();
     for (var entry : entries) {
       mutable.put(entry.key(), entry.value());
@@ -42,7 +42,6 @@ static <K, V> LongToRefDictionary<V> ofEntries(LongToRefEntry<V>... entries) {
 
   Optional<V> getOptional(long key);
 
-  @Nullable
   V getOrDefault(long key, V def);
 
   MutableLongArray keys(MutableLongArray container);

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/MutableIntToRefDictionary.java

@@ -13,20 +13,17 @@ static <V> MutableIntToRefDictionary<V> ofTypes(Class<V> valueType) {
     return new DefaultMutableHashBasedIntToRefDictionary<>();
   }
 
-  @Nullable
   V getOrCompute(int key, Supplier<V> factory);
 
-  @Nullable
   V getOrCompute(int key, IntFunction<V> factory);
 
-  @Nullable
   <T> V getOrCompute(int key, T arg1, Function<T, V> factory);
 
   /**
    * @return the previous value for the key or null.
    */
   @Nullable
-  V put(int key, @Nullable V value);
+  V put(int key, V value);
 
   void putAll(IntToRefDictionary<? extends V> dictionary);
 
@@ -35,7 +32,7 @@ static <V> MutableIntToRefDictionary<V> ofTypes(Class<V> valueType) {
   /**
    * @return the optional value of the previous value for the key.
    */
-  Optional<V> putOptional(int key, @Nullable V value);
+  Optional<V> putOptional(int key, V value);
 
   /**
    * @return the previous value for the key or null.

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/MutableLongToRefDictionary.java

@@ -13,20 +13,17 @@ static <V> MutableLongToRefDictionary<V> ofTypes(Class<V> valueType) {
     return new DefaultMutableHashBasedLongToRefDictionary<>();
   }
 
-  @Nullable
   V getOrCompute(long key, Supplier<V> factory);
 
-  @Nullable
   V getOrCompute(long key, LongFunction<V> factory);
 
-  @Nullable
   <T> V getOrCompute(long key, T arg1, Function<T, V> factory);
 
   /**
    * @return the previous value for the key or null.
    */
   @Nullable
-  V put(long key, @Nullable V value);
+  V put(long key, V value);
 
   void putAll(LongToRefDictionary<? extends V> dictionary);
 
@@ -35,7 +32,7 @@ static <V> MutableLongToRefDictionary<V> ofTypes(Class<V> valueType) {
   /**
    * @return the optional value of the previous value for the key.
    */
-  Optional<V> putOptional(long key, @Nullable V value);
+  Optional<V> putOptional(long key, V value);
 
   /**
    * @return the previous value for the key or null.

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/MutableRefToRefDictionary.java

@@ -24,7 +24,7 @@ static <K, V> MutableRefToRefDictionary<K, V> ofTypes(
    * @return the previous value for the key or null.
    */
   @Nullable
-  V put(K key, @Nullable V value);
+  V put(K key, V value);
 
   void putAll(RefToRefDictionary<? extends K, ? extends V> dictionary);
 
@@ -33,7 +33,7 @@ static <K, V> MutableRefToRefDictionary<K, V> ofTypes(
   /**
    * @return the optional value of the previous value for the key.
    */
-  Optional<V> putOptional(K key, @Nullable V value);
+  Optional<V> putOptional(K key, V value);
 
   /**
    * @return the previous value for the key or null.

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/RefToRefDictionary.java

@@ -7,19 +7,19 @@
 
 public interface RefToRefDictionary<K, V> extends Dictionary<K, V> {
 
-  static <K, V> RefToRefEntry<K, V> entry(K key, @Nullable V value) {
+  static <K, V> RefToRefEntry<K, V> entry(K key, V value) {
     return new SimpleRefToRefEntry<>(key, value);
   }
 
   static <K, V> RefToRefDictionary<K, V> empty() {
     return ImmutableHashBasedRefToRefDictionary.empty();
   }
 
-  static <K, V> RefToRefDictionary<K, V> of(K key, @Nullable V value) {
+  static <K, V> RefToRefDictionary<K, V> of(K key, V value) {
     return ofEntries(entry(key, value));
   }
 
-  static <K, V> RefToRefDictionary<K, V> of(K k1, @Nullable V v1, K k2, @Nullable V v2) {
+  static <K, V> RefToRefDictionary<K, V> of(K k1, V v1, K k2, V v2) {
     return ofEntries(entry(k1, v1), entry(k2, v2));
   }