From 1b9be1da3365ee4b2f41a913eab1c42205136d10 Mon Sep 17 00:00:00 2001
From: KingSimon <19822231+KingOfSquares@users.noreply.github.com>
Date: Wed, 1 Sep 2021 11:47:00 +0200
Subject: [PATCH] Change SingetonImmutableList to native singleton Collection -
 Change semantics in MultiFilterFunction#getRelevantEvents

Signed-off-by: KingSimon <19822231+KingOfSquares@users.noreply.github.com>
---
 .../main/java/tc/oc/pgm/filters/CarryingFlagFilter.java   | 4 ++--
 core/src/main/java/tc/oc/pgm/filters/FlagStateFilter.java | 4 ++--
 core/src/main/java/tc/oc/pgm/filters/FlyingFilter.java    | 4 ++--
 core/src/main/java/tc/oc/pgm/filters/GoalFilter.java      | 4 ++--
 core/src/main/java/tc/oc/pgm/filters/GroundedFilter.java  | 4 ++--
 .../src/main/java/tc/oc/pgm/filters/KillStreakFilter.java | 4 ++--
 .../src/main/java/tc/oc/pgm/filters/MatchPhaseFilter.java | 4 ++--
 .../main/java/tc/oc/pgm/filters/MultiFilterFunction.java  | 8 ++++----
 .../main/java/tc/oc/pgm/filters/PlayerMovementFilter.java | 4 ++--
 core/src/main/java/tc/oc/pgm/filters/ScoreFilter.java     | 4 ++--
 core/src/main/java/tc/oc/pgm/regions/AbstractRegion.java  | 4 ++--
 .../main/java/tc/oc/pgm/regions/XMLRegionReference.java   | 4 ++--
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/tc/oc/pgm/filters/CarryingFlagFilter.java b/core/src/main/java/tc/oc/pgm/filters/CarryingFlagFilter.java
index 891411c219..fef70005a7 100644
--- a/core/src/main/java/tc/oc/pgm/filters/CarryingFlagFilter.java
+++ b/core/src/main/java/tc/oc/pgm/filters/CarryingFlagFilter.java
@@ -1,7 +1,7 @@
 package tc.oc.pgm.filters;
 
-import com.google.common.collect.ImmutableList;
 import java.util.Collection;
+import java.util.Collections;
 import org.bukkit.event.Event;
 import tc.oc.pgm.api.feature.FeatureReference;
 import tc.oc.pgm.api.filter.query.PartyQuery;
@@ -24,7 +24,7 @@ public CarryingFlagFilter(FeatureReference<? extends FlagDefinition> flag) {
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(FlagStateChangeEvent.class);
+    return Collections.singleton(FlagStateChangeEvent.class);
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/filters/FlagStateFilter.java b/core/src/main/java/tc/oc/pgm/filters/FlagStateFilter.java
index 3fd0ece3f5..d14785974a 100644
--- a/core/src/main/java/tc/oc/pgm/filters/FlagStateFilter.java
+++ b/core/src/main/java/tc/oc/pgm/filters/FlagStateFilter.java
@@ -1,7 +1,7 @@
 package tc.oc.pgm.filters;
 
-import com.google.common.collect.ImmutableList;
 import java.util.Collection;
+import java.util.Collections;
 import javax.annotation.Nullable;
 import org.bukkit.event.Event;
 import tc.oc.pgm.api.feature.FeatureReference;
@@ -29,7 +29,7 @@ public FlagStateFilter(
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(FlagStateChangeEvent.class);
+    return Collections.singleton(FlagStateChangeEvent.class);
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/filters/FlyingFilter.java b/core/src/main/java/tc/oc/pgm/filters/FlyingFilter.java
index 4698c511a8..4cd3f3ffde 100644
--- a/core/src/main/java/tc/oc/pgm/filters/FlyingFilter.java
+++ b/core/src/main/java/tc/oc/pgm/filters/FlyingFilter.java
@@ -1,7 +1,7 @@
 package tc.oc.pgm.filters;
 
-import com.google.common.collect.ImmutableList;
 import java.util.Collection;
+import java.util.Collections;
 import org.bukkit.event.Event;
 import tc.oc.pgm.api.filter.query.PlayerQuery;
 import tc.oc.pgm.api.player.MatchPlayer;
@@ -11,7 +11,7 @@ public class FlyingFilter extends ParticipantFilter {
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(PlayerCoarseMoveEvent.class);
+    return Collections.singleton(PlayerCoarseMoveEvent.class);
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/filters/GoalFilter.java b/core/src/main/java/tc/oc/pgm/filters/GoalFilter.java
index 24d7298853..3c1429c72c 100644
--- a/core/src/main/java/tc/oc/pgm/filters/GoalFilter.java
+++ b/core/src/main/java/tc/oc/pgm/filters/GoalFilter.java
@@ -1,8 +1,8 @@
 package tc.oc.pgm.filters;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
 import java.util.Collection;
+import java.util.Collections;
 import javax.annotation.Nullable;
 import org.bukkit.event.Event;
 import tc.oc.pgm.api.feature.FeatureReference;
@@ -44,7 +44,7 @@ public GoalFilter(
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(GoalCompleteEvent.class);
+    return Collections.singleton(GoalCompleteEvent.class);
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/filters/GroundedFilter.java b/core/src/main/java/tc/oc/pgm/filters/GroundedFilter.java
index 41b22c0537..fd2557094c 100644
--- a/core/src/main/java/tc/oc/pgm/filters/GroundedFilter.java
+++ b/core/src/main/java/tc/oc/pgm/filters/GroundedFilter.java
@@ -1,7 +1,7 @@
 package tc.oc.pgm.filters;
 
-import com.google.common.collect.ImmutableList;
 import java.util.Collection;
+import java.util.Collections;
 import org.bukkit.event.Event;
 import tc.oc.pgm.api.filter.query.PlayerQuery;
 import tc.oc.pgm.api.player.MatchPlayer;
@@ -13,7 +13,7 @@ public class GroundedFilter extends ParticipantFilter {
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(PlayerCoarseMoveEvent.class);
+    return Collections.singleton(PlayerCoarseMoveEvent.class);
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/filters/KillStreakFilter.java b/core/src/main/java/tc/oc/pgm/filters/KillStreakFilter.java
index 0c5ed0eba9..6d8c275ad4 100644
--- a/core/src/main/java/tc/oc/pgm/filters/KillStreakFilter.java
+++ b/core/src/main/java/tc/oc/pgm/filters/KillStreakFilter.java
@@ -1,9 +1,9 @@
 package tc.oc.pgm.filters;
 
 import com.google.common.collect.BoundType;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
 import java.util.Collection;
+import java.util.Collections;
 import org.bukkit.event.Event;
 import tc.oc.pgm.api.filter.query.PlayerQuery;
 import tc.oc.pgm.api.player.MatchPlayer;
@@ -21,7 +21,7 @@ public KillStreakFilter(Range<Integer> range, boolean repeat) {
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(MatchPlayerDeathEvent.class);
+    return Collections.singleton(MatchPlayerDeathEvent.class);
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/filters/MatchPhaseFilter.java b/core/src/main/java/tc/oc/pgm/filters/MatchPhaseFilter.java
index f1f96fa2b2..83150bed58 100644
--- a/core/src/main/java/tc/oc/pgm/filters/MatchPhaseFilter.java
+++ b/core/src/main/java/tc/oc/pgm/filters/MatchPhaseFilter.java
@@ -1,7 +1,7 @@
 package tc.oc.pgm.filters;
 
-import com.google.common.collect.ImmutableList;
 import java.util.Collection;
+import java.util.Collections;
 import org.bukkit.event.Event;
 import tc.oc.pgm.api.filter.Filter;
 import tc.oc.pgm.api.filter.query.MatchQuery;
@@ -26,7 +26,7 @@ public MatchPhaseFilter(MatchPhase matchPhase) {
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(MatchPhaseChangeEvent.class);
+    return Collections.singleton(MatchPhaseChangeEvent.class);
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/filters/MultiFilterFunction.java b/core/src/main/java/tc/oc/pgm/filters/MultiFilterFunction.java
index a992c49a60..4caada7444 100644
--- a/core/src/main/java/tc/oc/pgm/filters/MultiFilterFunction.java
+++ b/core/src/main/java/tc/oc/pgm/filters/MultiFilterFunction.java
@@ -2,9 +2,9 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.bukkit.event.Event;
 import tc.oc.pgm.api.filter.Filter;
 import tc.oc.pgm.api.filter.FilterDefinition;
@@ -38,9 +38,9 @@ public MultiFilterFunction(Iterable<? extends Filter> filters) {
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    List<Class<? extends Event>> allEvents = new ArrayList<>();
-    this.filters.forEach(f -> allEvents.addAll(f.getRelevantEvents()));
-    return ImmutableList.copyOf(allEvents);
+    return this.filters.stream()
+        .flatMap(f -> f.getRelevantEvents().stream())
+        .collect(Collectors.collectingAndThen(Collectors.toList(), ImmutableList::copyOf));
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/filters/PlayerMovementFilter.java b/core/src/main/java/tc/oc/pgm/filters/PlayerMovementFilter.java
index 99ec03a85b..fe7fdb7091 100644
--- a/core/src/main/java/tc/oc/pgm/filters/PlayerMovementFilter.java
+++ b/core/src/main/java/tc/oc/pgm/filters/PlayerMovementFilter.java
@@ -1,7 +1,7 @@
 package tc.oc.pgm.filters;
 
-import com.google.common.collect.ImmutableList;
 import java.util.Collection;
+import java.util.Collections;
 import org.bukkit.event.Event;
 import tc.oc.pgm.api.filter.query.PlayerQuery;
 import tc.oc.pgm.api.player.MatchPlayer;
@@ -18,7 +18,7 @@ public PlayerMovementFilter(boolean sprinting, boolean sneaking) {
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(PlayerCoarseMoveEvent.class);
+    return Collections.singleton(PlayerCoarseMoveEvent.class);
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/filters/ScoreFilter.java b/core/src/main/java/tc/oc/pgm/filters/ScoreFilter.java
index c0289ab628..2bb919b207 100644
--- a/core/src/main/java/tc/oc/pgm/filters/ScoreFilter.java
+++ b/core/src/main/java/tc/oc/pgm/filters/ScoreFilter.java
@@ -1,8 +1,8 @@
 package tc.oc.pgm.filters;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
 import java.util.Collection;
+import java.util.Collections;
 import org.bukkit.event.Event;
 import tc.oc.pgm.api.filter.query.PartyQuery;
 import tc.oc.pgm.api.party.Competitor;
@@ -24,7 +24,7 @@ public ScoreFilter(Range<Integer> values) {
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(CompetitorScoreChangeEvent.class);
+    return Collections.singleton(CompetitorScoreChangeEvent.class);
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/regions/AbstractRegion.java b/core/src/main/java/tc/oc/pgm/regions/AbstractRegion.java
index 855b8e09f4..74720728ad 100644
--- a/core/src/main/java/tc/oc/pgm/regions/AbstractRegion.java
+++ b/core/src/main/java/tc/oc/pgm/regions/AbstractRegion.java
@@ -1,9 +1,9 @@
 package tc.oc.pgm.regions;
 
 import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.Random;
 import org.bukkit.Location;
@@ -112,7 +112,7 @@ public Vector getRandom(Random random) {
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(PlayerCoarseMoveEvent.class);
+    return Collections.singleton(PlayerCoarseMoveEvent.class);
   }
 
   @Override
diff --git a/core/src/main/java/tc/oc/pgm/regions/XMLRegionReference.java b/core/src/main/java/tc/oc/pgm/regions/XMLRegionReference.java
index 30d7220b93..6e628fe784 100644
--- a/core/src/main/java/tc/oc/pgm/regions/XMLRegionReference.java
+++ b/core/src/main/java/tc/oc/pgm/regions/XMLRegionReference.java
@@ -1,7 +1,7 @@
 package tc.oc.pgm.regions;
 
-import com.google.common.collect.ImmutableList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.Random;
 import javax.annotation.Nullable;
@@ -122,7 +122,7 @@ public Iterable<BlockVector> getBlockVectors() {
 
   @Override
   public Collection<Class<? extends Event>> getRelevantEvents() {
-    return ImmutableList.of(PlayerCoarseMoveEvent.class);
+    return Collections.singleton(PlayerCoarseMoveEvent.class);
   }
 
   @Override