Add helper method wrapping moveMap.computeIfAbsent() in ProAI code. (#10463)

Author: asvitkine

game-app/game-core/src/main/java/games/strategy/triplea/ai/pro/ProCombatMoveAi.java

@@ -1878,13 +1878,7 @@ private void checkContestedSeaTerritories() {
           final List<Unit> mySeaUnits =
               t.getUnitCollection()
                   .getMatches(ProMatches.unitCanBeMovedAndIsOwnedSea(player, true));
-          if (attackMap.containsKey(moveToTerritory)) {
-            attackMap.get(moveToTerritory).addUnits(mySeaUnits);
-          } else {
-            final ProTerritory moveTerritoryData = new ProTerritory(moveToTerritory, proData);
-            moveTerritoryData.addUnits(mySeaUnits);
-            attackMap.put(moveToTerritory, moveTerritoryData);
-          }
+          proData.getProTerritory(attackMap, moveToTerritory).addUnits(mySeaUnits);
           ProLogger.info(t + " is a contested territory so moving subs to " + moveToTerritory);
         }
       }

game-app/game-core/src/main/java/games/strategy/triplea/ai/pro/ProData.java

@@ -9,6 +9,7 @@
 import games.strategy.triplea.Properties;
 import games.strategy.triplea.ai.pro.data.ProPurchaseOption;
 import games.strategy.triplea.ai.pro.data.ProPurchaseOptionMap;
+import games.strategy.triplea.ai.pro.data.ProTerritory;
 import games.strategy.triplea.attachments.TerritoryAttachment;
 import games.strategy.triplea.delegate.Matches;
 import games.strategy.triplea.util.TuvUtils;
@@ -100,4 +101,8 @@ private double getMinCostPerHitPoint(final List<ProPurchaseOption> landPurchaseO
     }
     return minCostPerHitPoint;
   }
+
+  public ProTerritory getProTerritory(Map<Territory, ProTerritory> moveMap, Territory t) {
+    return moveMap.computeIfAbsent(t, k -> new ProTerritory(t, this));
+  }
 }

game-app/game-core/src/main/java/games/strategy/triplea/ai/pro/ProNonCombatMoveAi.java

@@ -2437,13 +2437,7 @@ private Map<Territory, ProTerritory> moveInfraUnits(
                     + " with value="
                     + maxValue);
             moveMap.get(maxValueTerritory).addUnit(u);
-            if (factoryMoveMap.containsKey(maxValueTerritory)) {
-              factoryMoveMap.get(maxValueTerritory).addUnit(u);
-            } else {
-              final ProTerritory patd = new ProTerritory(maxValueTerritory, proData);
-              patd.addUnit(u);
-              factoryMoveMap.put(maxValueTerritory, patd);
-            }
+            proData.getProTerritory(factoryMoveMap, maxValueTerritory).addUnit(u);
             it.remove();
           }
         }

game-app/game-core/src/main/java/games/strategy/triplea/ai/pro/data/ProTerritoryManager.java

@@ -825,10 +825,7 @@ private static void findNavalMoveOptions(
           }
 
           // Populate territories with sea unit
-          moveMap
-              .computeIfAbsent(
-                  potentialTerritory, k -> new ProTerritory(potentialTerritory, proData))
-              .addMaxUnit(mySeaUnit);
+          proData.getProTerritory(moveMap, potentialTerritory).addMaxUnit(mySeaUnit);
 
           // Populate appropriate unit move options map
           if (Matches.unitIsTransport().test(mySeaUnit)) {
@@ -932,8 +929,7 @@ private static void findLandMoveOptions(
 
           // Populate territories with land units
           final ProTerritory potentialTerritoryMove =
-              moveMap.computeIfAbsent(
-                  potentialTerritory, k -> new ProTerritory(potentialTerritory, proData));
+              proData.getProTerritory(moveMap, potentialTerritory);
           final List<Unit> unitsToAdd =
               ProTransportUtils.findBestUnitsToLandTransport(
                   myLandUnit, startTerritory, potentialTerritoryMove.getMaxUnits());
@@ -1064,10 +1060,7 @@ private static void findAirMoveOptions(
           }
 
           // Populate enemy territories with air unit
-          moveMap
-              .computeIfAbsent(
-                  potentialTerritory, k -> new ProTerritory(potentialTerritory, proData))
-              .addMaxUnit(myAirUnit);
+          proData.getProTerritory(moveMap, potentialTerritory).addMaxUnit(myAirUnit);
 
           // Populate unit attack options map
           unitMoveMap.computeIfAbsent(myAirUnit, k -> new HashSet<>()).add(potentialTerritory);
@@ -1254,9 +1247,7 @@ private static void findAmphibMoveOptions(
                     player, transport, territoriesCanLoadFrom, alreadyAddedToMaxAmphibUnits);
 
         // Add amphib units to attack map
-        moveMap
-            .computeIfAbsent(moveTerritory, k -> new ProTerritory(moveTerritory, proData))
-            .addMaxAmphibUnits(amphibUnits);
+        proData.getProTerritory(moveMap, moveTerritory).addMaxAmphibUnits(amphibUnits);
       }
     }
   }