From ecf25a8c00c90fcdee65b90eed8d0fa098057c77 Mon Sep 17 00:00:00 2001 From: Jetz Date: Mon, 2 Sep 2024 17:52:18 -0400 Subject: [PATCH] Guava migration - Migrate Optionals --- .../main/java/forge/game/GameEntityCounterTable.java | 10 +++++----- .../forge/game/ability/effects/CountersPutEffect.java | 1 - .../game/ability/effects/ReplaceCounterEffect.java | 8 ++++---- .../src/main/java/forge/game/card/ActivationTable.java | 6 +++--- forge-game/src/main/java/forge/game/card/Card.java | 1 - .../java/forge/game/cost/CostRemoveAnyCounter.java | 5 ++--- .../java/forge/game/replacement/ReplaceAddCounter.java | 5 ++--- .../forge/game/replacement/ReplacementHandler.java | 9 +-------- 8 files changed, 17 insertions(+), 28 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameEntityCounterTable.java b/forge-game/src/main/java/forge/game/GameEntityCounterTable.java index 5813dfa7675..c9525fcde5f 100644 --- a/forge-game/src/main/java/forge/game/GameEntityCounterTable.java +++ b/forge-game/src/main/java/forge/game/GameEntityCounterTable.java @@ -1,10 +1,10 @@ package forge.game; import java.util.Map; +import java.util.Optional; import org.apache.commons.lang3.ObjectUtils; -import com.google.common.base.Optional; import com.google.common.collect.ForwardingTable; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; @@ -39,7 +39,7 @@ public class GameEntityCounterTable extends ForwardingTable, Ga } public Integer put(Player putter, GameEntity object, CounterType type, Integer value) { - Optional o = Optional.fromNullable(putter); + Optional o = Optional.ofNullable(putter); Map map = get(o, object); if (map == null) { map = Maps.newHashMap(); @@ -49,7 +49,7 @@ public class GameEntityCounterTable extends ForwardingTable, Ga } public int get(Player putter, GameEntity object, CounterType type) { - Optional o = Optional.fromNullable(putter); + Optional o = Optional.ofNullable(putter); Map map = get(o, object); if (map == null || !map.containsKey(type)) { return 0; @@ -76,7 +76,7 @@ public class GameEntityCounterTable extends ForwardingTable, Ga result.putAll(ge.getCounters()); return result; } - Map alreadyRemoved = column(ge).get(Optional.absent()); + Map alreadyRemoved = column(ge).get(Optional.empty()); for (Map.Entry e : ge.getCounters().entrySet()) { int rest = e.getValue() - (alreadyRemoved.getOrDefault(e.getKey(), 0)); if (rest > 0) { @@ -176,7 +176,7 @@ public class GameEntityCounterTable extends ForwardingTable, Ga if (cause != null && cause.hasParam("MaxFromEffect")) { value = Math.min(value, Integer.parseInt(cause.getParam("MaxFromEffect")) - gm.getKey().getCounters(ec.getKey())); } - gm.getKey().addCounterInternal(ec.getKey(), value, e.getKey().orNull(), true, result, runParams); + gm.getKey().addCounterInternal(ec.getKey(), value, e.getKey().orElse(null), true, result, runParams); if (remember && ec.getValue() >= 1) { cause.getHostCard().addRemembered(gm.getKey()); } diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java index d260e5b03b8..c8e0dbc1898 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java @@ -6,7 +6,6 @@ import java.util.Map.Entry; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.common.base.Optional; import forge.game.Game; import forge.game.GameEntity; diff --git a/forge-game/src/main/java/forge/game/ability/effects/ReplaceCounterEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ReplaceCounterEffect.java index af1684b8d9c..3c5f810020f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ReplaceCounterEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ReplaceCounterEffect.java @@ -3,8 +3,8 @@ package forge.game.ability.effects; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Optional; -import com.google.common.base.Optional; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; @@ -46,14 +46,14 @@ public class ReplaceCounterEffect extends SpellAbilityEffect { Multimap playerMap = HashMultimap.create(); for (Map.Entry, Map> e : counterTable.entrySet()) { for (CounterType ct : e.getValue().keySet()) { - playerMap.put(ct, e.getKey().orNull()); + playerMap.put(ct, e.getKey().orElse(null)); } } // there shouldn't be a case where one of the players is null, and the other is not for (Map.Entry> e : playerMap.asMap().entrySet()) { - Optional p = Optional.fromNullable(chooser.getController().chooseSingleEntityForEffect(new PlayerCollection(e.getValue()), sa, "Choose Player for " + e.getKey().getName(), null)); + Optional p = Optional.ofNullable(chooser.getController().chooseSingleEntityForEffect(new PlayerCollection(e.getValue()), sa, "Choose Player for " + e.getKey().getName(), null)); sa.setReplacingObject(AbilityKey.CounterNum, counterTable.get(p).get(e.getKey())); int value = AbilityUtils.calculateAmount(card, sa.getParam("Amount"), sa); @@ -65,7 +65,7 @@ public class ReplaceCounterEffect extends SpellAbilityEffect { } } else { for (Map.Entry, Map> e : counterTable.entrySet()) { - if (!sa.matchesValidParam("ValidSource", e.getKey().orNull())) { + if (!sa.matchesValidParam("ValidSource", e.getKey().orElse(null))) { continue; } diff --git a/forge-game/src/main/java/forge/game/card/ActivationTable.java b/forge-game/src/main/java/forge/game/card/ActivationTable.java index e2e5951c07e..1dad7571d12 100644 --- a/forge-game/src/main/java/forge/game/card/ActivationTable.java +++ b/forge-game/src/main/java/forge/game/card/ActivationTable.java @@ -1,10 +1,10 @@ package forge.game.card; import java.util.List; +import java.util.Optional; import org.apache.commons.lang3.ObjectUtils; -import com.google.common.base.Optional; import com.google.common.collect.ForwardingTable; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Lists; @@ -40,7 +40,7 @@ public class ActivationTable extends ForwardingTable st = Optional.fromNullable(root.getGrantorStatic()); + Optional st = Optional.ofNullable(root.getGrantorStatic()); List activators = get(original, st); if (activators == null) { @@ -58,7 +58,7 @@ public class ActivationTable extends ForwardingTable getActivators(SpellAbility sa) { SpellAbility root = sa.getRootAbility(); SpellAbility original = getOriginal(sa); - Optional st = Optional.fromNullable(root.getGrantorStatic()); + Optional st = Optional.ofNullable(root.getGrantorStatic()); if (contains(original, st)) { return get(original, st); diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 54015c98e45..d809913d244 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -18,7 +18,6 @@ package forge.game.card; import com.esotericsoftware.minlog.Log; -import com.google.common.base.Optional; import com.google.common.collect.*; import forge.GameCommand; import forge.StaticData; diff --git a/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java b/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java index 95818b6eff9..6ce057e4a98 100644 --- a/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java @@ -19,8 +19,7 @@ package forge.game.cost; import java.util.Map; import java.util.Map.Entry; - -import com.google.common.base.Optional; +import java.util.Optional; import forge.game.GameEntity; import forge.game.ability.AbilityUtils; @@ -119,7 +118,7 @@ public class CostRemoveAnyCounter extends CostPart { @Override public boolean payAsDecided(Player ai, PaymentDecision decision, SpellAbility ability, final boolean effect) { int removed = 0; - for (Entry> e : decision.counterTable.row(Optional.absent()).entrySet()) { + for (Entry> e : decision.counterTable.row(Optional.empty()).entrySet()) { for (Entry v : e.getValue().entrySet()) { removed += v.getValue(); e.getKey().subtractCounter(v.getKey(), v.getValue(), ai); diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java index 875db95b822..9b600675aea 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java @@ -1,11 +1,10 @@ package forge.game.replacement; import java.util.Map; +import java.util.Optional; import org.apache.commons.lang3.ObjectUtils; -import com.google.common.base.Optional; - import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.card.CounterType; @@ -85,7 +84,7 @@ public class ReplaceAddCounter extends ReplacementEffect { Map, Map> counterMap = (Map, Map>) runParams.get(AbilityKey.CounterMap); for (Map.Entry, Map> e : counterMap.entrySet()) { - if (!matchesValidParam("ValidSource", e.getKey().orNull())) { + if (!matchesValidParam("ValidSource", e.getKey().orElse(null))) { continue; } if (hasParam("ValidCounterType")) { diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java index d01a1aed31c..e7dde774508 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java @@ -17,19 +17,12 @@ */ package forge.game.replacement; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import forge.game.card.*; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import com.google.common.base.Optional; import com.google.common.collect.Lists; import com.google.common.collect.Sets;