add clear() method for dictionary

Author: JavaSaBr

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

@@ -45,5 +45,7 @@ static <V> MutableIntToRefDictionary<V> ofTypes(Class<V> valueType) {
  */
  Optional<V> removeOptional(int key);
 
+ void clear();
+
  IntToRefDictionary<V> toReadOnly();
 }

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

@@ -45,5 +45,7 @@ static <V> MutableLongToRefDictionary<V> ofTypes(Class<V> valueType) {
  */
  Optional<V> removeOptional(long key);
 
+ void clear();
+
  LongToRefDictionary<V> toReadOnly();
 }

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

@@ -46,5 +46,7 @@ static <K, V> MutableRefToRefDictionary<K, V> ofTypes(
  */
  Optional<V> removeOptional(K key);
 
+ void clear();
+
  RefToRefDictionary<K, V> toReadOnly();
 }

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/impl/AbstractLockableHashBasedRefToRefDictionary.java

@@ -53,6 +53,12 @@ protected int decrementSize() {
  return size.decrementAndGet();
  }
 
+ @Override
+ public void clear() {
+ Arrays.fill(entries(), null);
+ size.set(0);
+ }
+
  @Override
  protected void threshold(int threshold) {
  this.threshold = threshold;

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/impl/DefaultMutableHashBasedIntToRefDictionary.java

@@ -44,6 +44,12 @@ protected int decrementSize() {
  return size--;
  }
 
+ @Override
+ public void clear() {
+ Arrays.fill(entries, null);
+ size = 0;
+ }
+
  @Override
  protected void threshold(int threshold) {
  this.threshold = threshold;

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/impl/DefaultMutableHashBasedLongToRefDictionary.java

@@ -44,6 +44,12 @@ protected int decrementSize() {
  return size--;
  }
 
+ @Override
+ public void clear() {
+ Arrays.fill(entries, null);
+ size = 0;
+ }
+
  @Override
  protected void threshold(int threshold) {
  this.threshold = threshold;

rlib-collections/src/main/java/javasabr/rlib/collections/dictionary/impl/DefaultMutableHashBasedRefToRefDictionary.java

@@ -44,6 +44,12 @@ protected int decrementSize() {
  return size--;
  }
 
+ @Override
+ public void clear() {
+ Arrays.fill(entries, null);
+ size = 0;
+ }
+
  @Override
  protected void threshold(int threshold) {
  this.threshold = threshold;

rlib-collections/src/test/java/javasabr/rlib/collections/dictionary/MutableIntToRefDictionaryTest.java

@@ -136,7 +136,28 @@ void shouldAppendDictionary(MutableIntToRefDictionary<String> dictionary) {
  assertThat(dictionary.size()).isEqualTo(5);
  }
 
+ @ParameterizedTest
+ @MethodSource("generateDictionaries")
+ void shouldBeEmptyAfterClear(MutableIntToRefDictionary<String> dictionary) {
+ // when:
+ dictionary.put(1, "val1");
+ dictionary.put(4, "val4");
+
+ // then:
+ assertThat(dictionary.isEmpty()).isFalse();
+
+ // when:
+ dictionary.clear();
+
+ // then:
+ assertThat(dictionary.isEmpty()).isTrue();
+ assertThat(dictionary.get(1)).isNull();
+ assertThat(dictionary.containsKey(1)).isFalse();
+ }
+
  private static Stream<Arguments> generateDictionaries() {
- return Stream.of(Arguments.of(DictionaryFactory.mutableIntToRefDictionary()));
+ return Stream.of(
+ Arguments.of(MutableIntToRefDictionary.ofTypes(String.class)),
+ Arguments.of(DictionaryFactory.mutableIntToRefDictionary()));
  }
 }

rlib-collections/src/test/java/javasabr/rlib/collections/dictionary/MutableLongToRefDictionaryTest.java

@@ -136,7 +136,28 @@ void shouldAppendDictionary(MutableLongToRefDictionary<String> dictionary) {
  assertThat(dictionary.size()).isEqualTo(5);
  }
 
+ @ParameterizedTest
+ @MethodSource("generateDictionaries")
+ void shouldBeEmptyAfterClear(MutableLongToRefDictionary<String> dictionary) {
+ // when:
+ dictionary.put(1, "val1");
+ dictionary.put(4, "val4");
+
+ // then:
+ assertThat(dictionary.isEmpty()).isFalse();
+
+ // when:
+ dictionary.clear();
+
+ // then:
+ assertThat(dictionary.isEmpty()).isTrue();
+ assertThat(dictionary.get(1)).isNull();
+ assertThat(dictionary.containsKey(1)).isFalse();
+ }
+
  private static Stream<Arguments> generateDictionaries() {
- return Stream.of(Arguments.of(DictionaryFactory.mutableLongToRefDictionary()));
+ return Stream.of(
+ Arguments.of(MutableLongToRefDictionary.ofTypes(String.class)),
+ Arguments.of(DictionaryFactory.mutableLongToRefDictionary()));
  }
 }

rlib-collections/src/test/java/javasabr/rlib/collections/dictionary/MutableRefToRefDictionaryTest.java

@@ -112,6 +112,25 @@ void shouldCorrectlyComputeOnGet(MutableRefToRefDictionary<String, String> dicti
  assertThat(dictionary.size()).isEqualTo(3);
  }
 
+ @ParameterizedTest
+ @MethodSource("generateDictionaries")
+ void shouldBeEmptyAfterClear(MutableRefToRefDictionary<String, String> dictionary) {
+ // when:
+ dictionary.put("key1", "val1");
+ dictionary.put("key4", "val4");
+
+ // then:
+ assertThat(dictionary.isEmpty()).isFalse();
+
+ // when:
+ dictionary.clear();
+
+ // then:
+ assertThat(dictionary.isEmpty()).isTrue();
+ assertThat(dictionary.get("key1")).isNull();
+ assertThat(dictionary.containsKey("key1")).isFalse();
+ }
+
  @ParameterizedTest
  @MethodSource("generateDictionaries")
  void shouldAppendDictionary(MutableRefToRefDictionary<String, String> dictionary) {
@@ -138,6 +157,7 @@ void shouldAppendDictionary(MutableRefToRefDictionary<String, String> dictionary
 
  private static Stream<Arguments> generateDictionaries() {
  return Stream.of(
+ Arguments.of(MutableRefToRefDictionary.ofTypes(String.class, String.class)),
  Arguments.of(DictionaryFactory.mutableRefToRefDictionary()),
  Arguments.of(DictionaryFactory.stampedLockBasedRefToRefDictionary()));
  }