Replace guava immutable collections with java immutable collections (#2454)

Author: ImMorpheus

src/main/java/org/spongepowered/api/data/DataManipulator.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.api.data;
 
-import com.google.common.collect.ImmutableList;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.data.value.CopyableValueContainer;
 import org.spongepowered.api.data.value.MergeFunction;
@@ -34,11 +33,14 @@
 import org.spongepowered.api.util.annotation.eventgen.TransformWith;
 import org.spongepowered.api.world.World;
 
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Represents a changelist of data that can be applied to a {@link DataHolder.Mutable}.
@@ -367,7 +369,7 @@ default Mutable copyFrom(final ValueContainer valueContainer, final Key<?> first
          *           given {@link ValueContainer}
          */
         default Mutable copyFrom(final ValueContainer valueContainer, final MergeFunction overlap, final Key<?> first, final Key<?>... more) {
-            return this.copyFrom(valueContainer, overlap, ImmutableList.<Key<?>>builder().add(first).add(more).build());
+            return this.copyFrom(valueContainer, overlap, Stream.concat(Stream.of(first), Arrays.stream(more)).collect(Collectors.toUnmodifiableList()));
         }
 
         /**

src/main/java/org/spongepowered/api/data/DataTransactionResult.java

@@ -24,8 +24,6 @@
  */
 package org.spongepowered.api.data;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.data.value.Value;
@@ -79,7 +77,7 @@ public Function<Builder, DataTransactionResult> finisher() {
 
         @Override
         public Set<Characteristics> characteristics() {
-            return ImmutableSet.of();
+            return Set.of();
         }
     };
 
@@ -281,26 +279,26 @@ public enum Type {
     }
 
     final Type type;
-    private final ImmutableList<Value.Immutable<?>> rejected;
-    private final ImmutableList<Value.Immutable<?>> replaced;
-    private final ImmutableList<Value.Immutable<?>> success;
+    private final List<Value.Immutable<?>> rejected;
+    private final List<Value.Immutable<?>> replaced;
+    private final List<Value.Immutable<?>> success;
 
     DataTransactionResult(final Builder builder) {
         this.type = builder.resultType;
         if (builder.rejected != null) {
-            this.rejected = ImmutableList.copyOf(builder.rejected);
+            this.rejected = List.copyOf(builder.rejected);
         } else {
-            this.rejected = ImmutableList.of();
+            this.rejected = List.of();
         }
         if (builder.replaced != null) {
-            this.replaced = ImmutableList.copyOf(builder.replaced);
+            this.replaced = List.copyOf(builder.replaced);
         } else {
-            this.replaced = ImmutableList.of();
+            this.replaced = List.of();
         }
         if (builder.successful != null) {
-            this.success = ImmutableList.copyOf(builder.successful);
+            this.success = List.copyOf(builder.successful);
         } else {
-            this.success = ImmutableList.of();
+            this.success = List.of();
         }
     }
 

src/main/java/org/spongepowered/api/data/persistence/DataQuery.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.api.data.persistence;
 
-import com.google.common.collect.ImmutableList;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 import java.util.Iterator;
@@ -34,6 +33,8 @@
 import java.util.StringJoiner;
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Represents a query that can be done on views. Queries do not depend on
@@ -46,9 +47,9 @@ public final class DataQuery implements Iterable<String> {
     /**
      * The parts that make up this query.
      */
-    private final ImmutableList<String> parts;
+    private final List<String> parts;
 
-    private @MonotonicNonNull ImmutableList<DataQuery> queryParts; //lazy loaded
+    private @MonotonicNonNull List<DataQuery> queryParts; //lazy loaded
 
     /**
      * Constructs a query using the given separator character and path.
@@ -70,7 +71,7 @@ private DataQuery(final char separator, final String path) {
      * @param parts The parts
      */
     private DataQuery(final String... parts) {
-        this.parts = ImmutableList.copyOf(parts);
+        this.parts = List.of(parts);
     }
 
     /**
@@ -79,7 +80,7 @@ private DataQuery(final String... parts) {
      * @param parts The parts
      */
     private DataQuery(final List<String> parts) {
-        this.parts = ImmutableList.copyOf(parts);
+        this.parts = List.copyOf(parts);
     }
 
     /**
@@ -151,12 +152,8 @@ public List<String> parts() {
      * @return The constructed query
      */
     public DataQuery then(final DataQuery that) {
-        final ImmutableList.Builder<String> builder = new ImmutableList.Builder<>();
-
-        builder.addAll(this.parts);
-        builder.addAll(that.parts);
-
-        return new DataQuery(builder.build());
+        final var parts = Stream.concat(this.parts.stream(), that.parts.stream()).collect(Collectors.toUnmodifiableList());
+        return new DataQuery(parts);
     }
 
     /**
@@ -167,13 +164,8 @@ public DataQuery then(final DataQuery that) {
      * @return The constructed query
      */
     public DataQuery then(final String that) {
-        final ImmutableList.Builder<String> builder =
-            new ImmutableList.Builder<>();
-
-        builder.addAll(this.parts);
-        builder.add(that);
-
-        return new DataQuery(builder.build());
+        final var parts = Stream.concat(this.parts.stream(), Stream.of(that)).collect(Collectors.toUnmodifiableList());
+        return new DataQuery(parts);
     }
 
     /**
@@ -184,11 +176,7 @@ public DataQuery then(final String that) {
      */
     public List<DataQuery> queryParts() {
         if (this.queryParts == null) {
-            final ImmutableList.Builder<DataQuery> builder = ImmutableList.builder();
-            for (final String part : this.parts()) {
-                builder.add(new DataQuery(part));
-            }
-            this.queryParts = builder.build();
+            this.queryParts = this.parts().stream().map(DataQuery::new).collect(Collectors.toUnmodifiableList());
         }
         return this.queryParts;
     }
@@ -204,11 +192,8 @@ public DataQuery pop() {
         if (this.parts.size() <= 1) {
             return DataQuery.of();
         }
-        final ImmutableList.Builder<String> builder = ImmutableList.builder();
-        for (int i = 0; i < this.parts.size() - 1; i++) {
-            builder.add(this.parts.get(i));
-        }
-        return new DataQuery(builder.build());
+        final var parts = this.parts.stream().limit(this.parts.size() - 1L).collect(Collectors.toUnmodifiableList());
+        return new DataQuery(parts);
     }
 
     /**
@@ -222,11 +207,8 @@ public DataQuery popFirst() {
         if (this.parts.size() <= 1) {
             return DataQuery.of();
         }
-        final ImmutableList.Builder<String> builder = ImmutableList.builder();
-        for (int i = 1; i < this.parts.size(); i++) {
-            builder.add(this.parts.get(i));
-        }
-        return new DataQuery(builder.build());
+        final var parts = this.parts.stream().skip(1L).collect(Collectors.toUnmodifiableList());
+        return new DataQuery(parts);
     }
 
     /**

src/main/java/org/spongepowered/api/data/value/ValueContainer.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.api.data.value;
 
-import com.google.common.collect.ImmutableSet;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.data.DataHolder;
 import org.spongepowered.api.data.DataManipulator;
@@ -210,7 +209,7 @@ default boolean supports(final Value<?> value) {
      * Gets all applicable {@link Key}s for this {@link ValueContainer}.
      * Changes can not be made to the set to alter the {@link ValueContainer},
      * nor can the {@link Value}s be changed with the provided
-     * {@link ImmutableSet}.
+     * {@link Set}.
      *
      * @return An immutable set of known {@link Key}s
      */

src/main/java/org/spongepowered/api/event/Cause.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.api.event;
 
-import com.google.common.collect.ImmutableList;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.DoNotStore;
@@ -37,6 +36,7 @@
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.StringJoiner;
+import java.util.stream.Collectors;
 
 /**
  * A cause represents the reason or initiator of an event.
@@ -116,7 +116,7 @@ public static Cause of(final EventContext ctx, final Iterable<Object> iterable)
     private final EventContext context;
 
     // lazy load
-    @Nullable private ImmutableList<Object> immutableCauses;
+    @Nullable private List<Object> immutableCauses;
 
     /**
      * Constructs a new cause.
@@ -281,21 +281,15 @@ public boolean contains(final Object object) {
     }
 
     /**
-     * Gets an {@link ImmutableList} of all objects that are instances of the
+     * Gets an immutable {@link List} of all objects that are instances of the
      * given {@link Class} type <code>T</code>.
      *
      * @param <T> The type of objects to query for
      * @param target The class of the target type
      * @return An immutable list of the objects queried
      */
     public <T> List<T> allOf(final Class<T> target) {
-        final ImmutableList.Builder<T> builder = ImmutableList.builder();
-        for (final Object aCause : this.cause) {
-            if (target.isInstance(aCause)) {
-                builder.add((T) aCause);
-            }
-        }
-        return builder.build();
+        return Arrays.stream(this.cause).filter(target::isInstance).map(entry -> (T) entry).collect(Collectors.toUnmodifiableList());
     }
 
     /**
@@ -306,13 +300,7 @@ public <T> List<T> allOf(final Class<T> target) {
      * @return The list of objects not an instance of the provided class
      */
     public List<Object> noneOf(final Class<?> ignoredClass) {
-        final ImmutableList.Builder<Object> builder = ImmutableList.builder();
-        for (final Object cause : this.cause) {
-            if (!ignoredClass.isInstance(cause)) {
-                builder.add(cause);
-            }
-        }
-        return builder.build();
+        return Arrays.stream(this.cause).filter(entry -> !ignoredClass.isInstance(entry)).collect(Collectors.toUnmodifiableList());
     }
 
     /**
@@ -322,7 +310,7 @@ public List<Object> noneOf(final Class<?> ignoredClass) {
      */
     public List<Object> all() {
         if (this.immutableCauses == null) {
-            this.immutableCauses = ImmutableList.copyOf(this.cause);
+            this.immutableCauses = List.of(this.cause);
         }
         return this.immutableCauses;
     }

src/main/java/org/spongepowered/api/event/EventContext.java

@@ -24,13 +24,11 @@
  */
 package org.spongepowered.api.event;
 
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.DoNotStore;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Objects;
@@ -46,7 +44,7 @@
 @DoNotStore
 public final class EventContext {
 
-    private static final EventContext EMPTY_CONTEXT = new EventContext(ImmutableMap.of());
+    private static final EventContext EMPTY_CONTEXT = new EventContext(Map.of());
 
     /**
      * Gets an empty context.
@@ -83,7 +81,7 @@ public static Builder builder() {
     private final Map<EventContextKey<?>, Object> entries;
 
     EventContext(Map<EventContextKey<?>, Object> values) {
-        this.entries = ImmutableMap.copyOf(values);
+        this.entries = Map.copyOf(values);
     }
 
     /**
@@ -226,7 +224,7 @@ public String toString() {
     public static final class Builder implements org.spongepowered.api.util.Builder<EventContext, Builder>, CopyableBuilder<EventContext,
         Builder> {
 
-        private final Map<EventContextKey<?>, Object> entries = Maps.newHashMap();
+        private final Map<EventContextKey<?>, Object> entries = new HashMap<>();
 
         Builder() {
 

src/main/java/org/spongepowered/api/event/entity/AttackEntityEvent.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.api.event.entity;
 
-import com.google.common.collect.ImmutableMap;
 import org.spongepowered.api.block.entity.carrier.Dispenser;
 import org.spongepowered.api.effect.potion.PotionEffect;
 import org.spongepowered.api.entity.Entity;
@@ -252,7 +251,7 @@ public interface AttackEntityEvent extends Event, Cancellable {
     double originalFinalDamage();
 
     /**
-     * Gets an {@link ImmutableMap} of all original {@link DamageModifier}s
+     * Gets an immutable {@link Map} of all original {@link DamageModifier}s
      * and their associated "modified" damage. Note that ordering is not
      * retained.
      *

src/main/java/org/spongepowered/api/event/entity/DamageEntityEvent.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.api.event.entity;
 
-import com.google.common.collect.ImmutableMap;
 import org.spongepowered.api.block.entity.carrier.Dispenser;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.living.monster.skeleton.Skeleton;
@@ -171,7 +170,7 @@ public interface DamageEntityEvent extends Event, Cancellable {
     double originalFinalDamage();
 
     /**
-     * Gets an {@link ImmutableMap} of all original {@link DamageModifier}s
+     * Gets an immutable {@link Map} of all original {@link DamageModifier}s
      * and their associated "modified" damage. Note that ordering is not
      * retained.
      *

src/main/java/org/spongepowered/api/event/impl/entity/AbstractAffectEntityEvent.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.api.event.impl.entity;
 
-import com.google.common.collect.ImmutableList;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.EntitySnapshot;
 import org.spongepowered.api.event.Order;
@@ -35,6 +34,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 public abstract class AbstractAffectEntityEvent extends AbstractEvent implements AffectEntityEvent {
 
@@ -47,11 +47,7 @@ public abstract class AbstractAffectEntityEvent extends AbstractEvent implements
     public List<EntitySnapshot> entitySnapshots() {
         if (this.entitySnapshots == null) {
             if (this.currentOrder == Order.PRE) {
-                final ImmutableList.Builder<EntitySnapshot> builder = ImmutableList.builder();
-                for (Entity entity : this.entities) {
-                    builder.add(entity.createSnapshot());
-                }
-                this.entitySnapshots = builder.build();
+                this.entitySnapshots = this.entities.stream().map(Entity::createSnapshot).collect(Collectors.toUnmodifiableList());
             } else {
                 throw new IllegalStateException("Can't initialize entity snapshots after PRE!");
             }