Don't create temp arraylists for CasualtyDetails. (#11833)

triplea-game · Jul 29, 2023 · 7b90506 · 7b90506
1 parent 9d0f075
commit 7b90506
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/game-app/game-core/src/main/java/games/strategy/triplea/delegate/battle/Fire.java b/game-app/game-core/src/main/java/games/strategy/triplea/delegate/battle/Fire.java
@@ -22,7 +22,6 @@
 import games.strategy.triplea.delegate.battle.steps.fire.SelectCasualties;
 import games.strategy.triplea.delegate.battle.steps.fire.SelectMainBattleCasualties;
 import games.strategy.triplea.delegate.data.CasualtyDetails;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -161,8 +160,7 @@ public void execute(final ExecutionStack stack, final IDelegateBridge bridge) {
             final FireRoundState fireRoundState = new FireRoundState();
             fireRoundState.setDice(dice);
             fireRoundState.setCasualties(
-                new CasualtyDetails(
-                    new ArrayList<>(killed), new ArrayList<>(damaged), confirmOwnCasualties));
+                new CasualtyDetails(killed, damaged, confirmOwnCasualties));
             new MarkCasualties(
                     battle,
                     battle,

diff --git a/game-app/game-core/src/main/java/games/strategy/triplea/delegate/data/CasualtyDetails.java b/game-app/game-core/src/main/java/games/strategy/triplea/delegate/data/CasualtyDetails.java
@@ -29,7 +29,7 @@ public class CasualtyDetails extends CasualtyList {
    * @param autoCalculated whether casualties should be selected automatically
    */
   public CasualtyDetails(
-      final List<Unit> killed, final List<Unit> damaged, final boolean autoCalculated) {
+      final Collection<Unit> killed, final Collection<Unit> damaged, final boolean autoCalculated) {
     super(killed, damaged);
     this.autoCalculated = autoCalculated;
   }

diff --git a/game-app/game-core/src/main/java/games/strategy/triplea/delegate/data/CasualtyList.java b/game-app/game-core/src/main/java/games/strategy/triplea/delegate/data/CasualtyList.java
@@ -19,7 +19,7 @@ public class CasualtyList implements Serializable {
    *
    * @param damaged (can have multiple of the same unit, to show multiple hits to that unit)
    */
-  public CasualtyList(final List<Unit> killed, final List<Unit> damaged) {
+  public CasualtyList(final Collection<Unit> killed, final Collection<Unit> damaged) {
     checkNotNull(killed);
     checkNotNull(damaged);
 

diff --git a/game-app/game-core/src/test/java/games/strategy/triplea/delegate/RevisedTest.java b/game-app/game-core/src/test/java/games/strategy/triplea/delegate/RevisedTest.java
@@ -79,7 +79,6 @@
 import games.strategy.triplea.settings.AbstractClientSettingTestCase;
 import games.strategy.triplea.util.TransportUtils;
 import games.strategy.triplea.xml.TestMapGameData;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -1384,8 +1383,7 @@ void testAttackDestroyerAndSubsAgainstSubAndDestroyer() {
         bridge,
         invocation -> {
           final Collection<Unit> selectFrom = invocation.getArgument(0);
-          return new CasualtyDetails(
-              List.of(selectFrom.iterator().next()), new ArrayList<>(), false);
+          return new CasualtyDetails(List.of(selectFrom.iterator().next()), List.of(), false);
         });
     whenGetRandom(bridge)
         .thenAnswer(withValues(0))

diff --git a/game-app/game-core/src/test/java/games/strategy/triplea/delegate/WW2V3Year41Test.java b/game-app/game-core/src/test/java/games/strategy/triplea/delegate/WW2V3Year41Test.java
@@ -1228,8 +1228,7 @@ void testAttackDestroyerAndSubsAgainstSubAndDestroyer() {
         bridge,
         invocation -> {
           final Collection<Unit> selectFrom = invocation.getArgument(0);
-          return new CasualtyDetails(
-              List.of(selectFrom.iterator().next()), new ArrayList<>(), false);
+          return new CasualtyDetails(List.of(selectFrom.iterator().next()), List.of(), false);
         });
     // attacking subs sneak attack and hit
     // no chance to return fire
@@ -1290,7 +1289,7 @@ void testLimitBombardToNumberOfUnloaded() {
           final int hitsRemaining = invocation.getArgument(2);
           return new CasualtyDetails(
               selectFrom.stream().limit(hitsRemaining).collect(Collectors.toList()),
-              new ArrayList<>(),
+              List.of(),
               false);
         });
     // Show that bombard casualties can return fire

diff --git a/...e/src/test/java/games/strategy/triplea/delegate/battle/casualty/CasualtySelectorTest.java b/...e/src/test/java/games/strategy/triplea/delegate/battle/casualty/CasualtySelectorTest.java
@@ -31,7 +31,6 @@
 import games.strategy.triplea.delegate.power.calculator.CombatValueBuilder;
 import games.strategy.triplea.xml.TestMapGameData;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
@@ -65,7 +64,7 @@ private void givenRemotePlayerWillSelectStrategicBombersForCasualties() {
               final int count = invocation.getArgument(2);
               final List<Unit> selected =
                   CollectionUtils.getNMatches(selectFrom, count, Matches.unitIsStrategicBomber());
-              return new CasualtyDetails(selected, new ArrayList<>(), false);
+              return new CasualtyDetails(selected, List.of(), false);
             });
   }