Various code clean ups.

game-app/game-core/src/main/java/games/strategy/triplea/delegate/AbstractPlaceDelegate.java

@@ -1068,15 +1068,10 @@ private IntegerMap<Territory> getMaxUnitsToBePlacedMap(
     final Collection<Territory> notUsableAsOtherProducers = new ArrayList<>(producers);
     final Map<Territory, Integer> currentAvailablePlacementForOtherProducers = new HashMap<>();
     for (final Territory producerTerritory : producers) {
-      final Collection<Unit> unitsCanBePlacedByThisProducer =
-          (Properties.getUnitPlacementRestrictions(getData().getProperties())
-              ? CollectionUtils.getMatches(
-                  units, unitWhichRequiresUnitsHasRequiredUnits(producerTerritory, true))
-              : new ArrayList<>(units));
       final int prodT =
           getMaxUnitsToBePlacedFrom(
               producerTerritory,
-              unitsCanBePlacedByThisProducer,
+              units,
               to,
               player,
               true,
@@ -1152,8 +1147,7 @@ units, unitWhichRequiresUnitsHasRequiredUnits(producer, true))
       return Math.max(0, ra.getMaxPlacePerTerritory() - unitCountAlreadyProduced);
     }
     // a factory can produce the same number of units as the number of PUs the territory generates
-    // each turn (or not, if
-    // it has canProduceXUnits)
+    // each turn (or not, if it has canProduceXUnits)
     final int maxConstructions =
         howManyOfEachConstructionCanPlace(to, producer, unitsCanBePlacedByThisProducer, player)
             .totalValues();
@@ -1590,7 +1584,7 @@ public Collection<Unit> unitsAtStartOfStepInTerritory(final Territory to) {
       return new ArrayList<>();
     }
     final Collection<Unit> unitsPlacedAlready = getAlreadyProduced(to);
-    if (Matches.territoryIsWater().test(to)) {
+    if (to.isWater()) {
       for (final Territory current : getAllProducers(to, player, null, true)) {
         unitsPlacedAlready.addAll(getAlreadyProduced(current));
       }
@@ -1626,7 +1620,7 @@ private boolean wasOwnedUnitThatCanProduceUnitsOrIsFactoryInTerritoryAtStartOfSt
             // land factories in water can't produce, and sea factories in land can't produce.
             // air can produce like land if in land, and like sea if in water.
             .and(to.isWater() ? Matches.unitIsLand().negate() : Matches.unitIsSea().negate());
-    return CollectionUtils.countMatches(unitsAtStartOfTurnInTo, factoryMatch) > 0;
+    return unitsAtStartOfTurnInTo.stream().anyMatch(factoryMatch);
   }
 
   /**

game-app/game-core/src/main/java/games/strategy/triplea/delegate/battle/MustFightBattle.java

@@ -1363,7 +1363,7 @@ private void defenderWins(final IDelegateBridge bridge) {
     whoWon = WhoWon.DEFENDER;
     bridge.getDisplayChannelBroadcaster().battleEnd(battleId, defender.getName() + " win");
     if (Properties.getAbandonedTerritoriesMayBeTakenOverImmediately(gameData.getProperties())) {
-      if (CollectionUtils.countMatches(defendingUnits, Matches.unitIsNotInfrastructure()) == 0) {
+      if (defendingUnits.stream().noneMatch(Matches.unitIsNotInfrastructure())) {
         final List<Unit> allyOfAttackerUnits =
             battleSite.getUnitCollection().getMatches(Matches.unitIsNotInfrastructure());
         if (!allyOfAttackerUnits.isEmpty()) {
@@ -1378,14 +1378,12 @@ private void defenderWins(final IDelegateBridge bridge) {
                       + " as there are no defenders left",
                   allyOfAttackerUnits);
           // should we create a new battle records to show the ally capturing the territory (in the
-          // case where they
-          // didn't already own/allied it)?
+          // case where they didn't already own/allied it)?
           battleTracker.takeOver(battleSite, abandonedToPlayer, bridge, null, allyOfAttackerUnits);
         }
       } else {
         // should we create a new battle records to show the defender capturing the territory (in
-        // the case where they
-        // didn't already own/allied it)?
+        // the case where they didn't already own/allied it)?
         battleTracker.takeOver(battleSite, defender, bridge, null, defendingUnits);
       }
     }