#464 SyncMap

yegor256 · Nov 18, 2017 · e14c0d2 · e14c0d2
1 parent 801ff4f
commit e14c0d2
Show file tree

Hide file tree

Showing 6 changed files with 230 additions and 152 deletions.
diff --git a/src/main/java/org/cactoos/list/Joined.java b/src/main/java/org/cactoos/list/Joined.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.list;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -53,9 +54,11 @@ public Joined(final List<X>... src) {
      * @param src Source lists
      */
     public Joined(final Iterable<List<X>> src) {
-        super(() -> new ListOf<>(src).stream()
-            .flatMap(List::stream)
-            .collect(Collectors.toList())
+        super(() -> Collections.unmodifiableList(
+            new ListOf<>(src).stream()
+                .flatMap(List::stream)
+                .collect(Collectors.toList())
+            )
         );
     }
 

diff --git a/src/main/java/org/cactoos/list/StickyList.java b/src/main/java/org/cactoos/list/StickyList.java
@@ -24,13 +24,12 @@
 package org.cactoos.list;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ListIterator;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.scalar.StickyScalar;
-import org.cactoos.scalar.UncheckedScalar;
 
 /**
  * List decorator that goes through the list only once.
@@ -44,13 +43,7 @@
  * @param <X> Type of item
  * @since 0.8
  */
-@SuppressWarnings("PMD.TooManyMethods")
-public final class StickyList<X> implements List<X> {
-
-    /**
-     * The gate.
-     */
-    private final UncheckedScalar<List<X>> gate;
+public final class StickyList<X> extends ListEnvelope<X> {
 
     /**
      * Ctor.
@@ -83,151 +76,15 @@ public StickyList(final Iterator<X> items) {
      * @param list The iterable
      */
     public StickyList(final Collection<X> list) {
-        this.gate = new UncheckedScalar<>(
+        super(
             new StickyScalar<>(
                 () -> {
                     final List<X> temp = new LinkedList<>();
                     temp.addAll(list);
-                    return temp;
+                    return Collections.unmodifiableList(temp);
                 }
             )
         );
     }
 
-    @Override
-    public int size() {
-        return this.gate.value().size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return this.gate.value().isEmpty();
-    }
-
-    @Override
-    public boolean contains(final Object object) {
-        return this.gate.value().contains(object);
-    }
-
-    @Override
-    public Iterator<X> iterator() {
-        return this.gate.value().iterator();
-    }
-
-    @Override
-    public Object[] toArray() {
-        return this.gate.value().toArray();
-    }
-
-    @Override
-    @SuppressWarnings("PMD.UseVarargs")
-    public <Y> Y[] toArray(final Y[] array) {
-        return this.gate.value().toArray(array);
-    }
-
-    @Override
-    public boolean add(final X element) {
-        throw new UnsupportedOperationException(
-            "#add(final T element) is not supported"
-        );
-    }
-
-    @Override
-    public boolean remove(final Object object) {
-        throw new UnsupportedOperationException(
-            "#remove(final Object object) is not supported"
-        );
-    }
-
-    @Override
-    public boolean containsAll(final Collection<?> collection) {
-        return this.gate.value().containsAll(collection);
-    }
-
-    @Override
-    public boolean addAll(final Collection<? extends X> collection) {
-        throw new UnsupportedOperationException(
-            "#addAll(final Collection<? extends T> collection) is not supported"
-        );
-    }
-
-    @Override
-    public boolean addAll(final int index,
-        final Collection<? extends X> collection) {
-        throw new UnsupportedOperationException(
-            "#addAll() is not supported"
-        );
-    }
-
-    @Override
-    public boolean removeAll(final Collection<?> collection) {
-        throw new UnsupportedOperationException(
-            "#removeAll(final Collection<?> collection) is not supported"
-        );
-    }
-
-    @Override
-    public boolean retainAll(final Collection<?> collection) {
-        throw new UnsupportedOperationException(
-            "#retainAll(final Collection<?> collection) is not supported"
-        );
-    }
-
-    @Override
-    public void clear() {
-        throw new UnsupportedOperationException(
-            "#clear() is not supported"
-        );
-    }
-
-    @Override
-    public X get(final int index) {
-        return this.gate.value().get(index);
-    }
-
-    @Override
-    public X set(final int index, final X element) {
-        throw new UnsupportedOperationException(
-            "#set() is not supported"
-        );
-    }
-
-    @Override
-    public void add(final int index, final X element) {
-        throw new UnsupportedOperationException(
-            "#add(final int index, final T element) is not supported"
-        );
-    }
-
-    @Override
-    public X remove(final int index) {
-        throw new UnsupportedOperationException(
-            "#remove(final int index) is not supported"
-        );
-    }
-
-    @Override
-    public int indexOf(final Object object) {
-        return this.gate.value().indexOf(object);
-    }
-
-    @Override
-    public int lastIndexOf(final Object object) {
-        return this.gate.value().lastIndexOf(object);
-    }
-
-    @Override
-    public ListIterator<X> listIterator() {
-        return this.gate.value().listIterator();
-    }
-
-    @Override
-    public ListIterator<X> listIterator(final int index) {
-        return this.gate.value().listIterator(index);
-    }
-
-    @Override
-    public List<X> subList(final int fromindex, final int toindex) {
-        return this.gate.value().subList(fromindex, toindex);
-    }
 }
diff --git a/src/main/java/org/cactoos/map/MapOf.java b/src/main/java/org/cactoos/map/MapOf.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.map;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -163,7 +164,7 @@ public MapOf(final Iterable<Map.Entry<X, Y>> entries) {
             for (final Map.Entry<X, Y> entry : entries) {
                 temp.put(entry.getKey(), entry.getValue());
             }
-            return temp;
+            return Collections.unmodifiableMap(temp);
         });
     }
 

diff --git a/src/main/java/org/cactoos/map/StickyMap.java b/src/main/java/org/cactoos/map/StickyMap.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.map;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -161,7 +162,7 @@ public StickyMap(final Map<X, Y> map) {
                 () -> {
                     final Map<X, Y> temp = new HashMap<>(0);
                     temp.putAll(map);
-                    return temp;
+                    return Collections.unmodifiableMap(temp);
                 }
             )
         );