P4ADEV-1774 modified collect in mappers

pagopa · Jan 14, 2025 · b040e23 · b040e23
1 parent 7c029a8
commit b040e23
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/main/java/it/gov/pagopa/pu/debtpositions/mapper/DebtPositionMapper.java b/src/main/java/it/gov/pagopa/pu/debtpositions/mapper/DebtPositionMapper.java
@@ -9,14 +9,15 @@
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.function.Supplier;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 @Service
 public class DebtPositionMapper {
 
   private final PaymentOptionMapper paymentOptionMapper;
 
-  private static final Supplier<TreeSet<PaymentOption>> TREE_SET_SUPPLIER = TreeSet::new;
+  private static final Collector<PaymentOption, ?, SortedSet<PaymentOption>> toTreeSet = Collectors.toCollection(TreeSet::new);
 
   public DebtPositionMapper(PaymentOptionMapper paymentOptionMapper) {
     this.paymentOptionMapper = paymentOptionMapper;
@@ -46,11 +47,7 @@ public Pair<DebtPosition, Map<InstallmentNoPII, Installment>> mapToModel(DebtPos
         installmentMapping.putAll(paymentOptionWithInstallments.getSecond());
         return paymentOptionWithInstallments.getFirst();
       })
-      .collect(
-        TREE_SET_SUPPLIER,
-        SortedSet::add,
-        SortedSet::addAll
-      );
+      .collect(toTreeSet);
 
     debtPosition.setPaymentOptions(paymentOptions);
 

diff --git a/src/main/java/it/gov/pagopa/pu/debtpositions/mapper/PaymentOptionMapper.java b/src/main/java/it/gov/pagopa/pu/debtpositions/mapper/PaymentOptionMapper.java
@@ -10,15 +10,16 @@
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.function.Supplier;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 @Service
 public class PaymentOptionMapper {
 
   private final InstallmentMapper installmentMapper;
   private final InstallmentPIIMapper installmentPIIMapper;
 
-  private static final Supplier<TreeSet<InstallmentNoPII>> TREE_SET_SUPPLIER = TreeSet::new;
+  private static final Collector<InstallmentNoPII, ?, SortedSet<InstallmentNoPII>> toTreeSet = Collectors.toCollection(TreeSet::new);
 
   public PaymentOptionMapper(InstallmentMapper installmentMapper, InstallmentPIIMapper installmentPIIMapper) {
     this.installmentMapper = installmentMapper;
@@ -39,10 +40,7 @@ public Pair<PaymentOption, Map<InstallmentNoPII, Installment>> mapToModel(Paymen
         installmentMapping.put(installmentNoPII, installment);
         return installmentNoPII;
       })
-      .collect(
-        TREE_SET_SUPPLIER,
-        SortedSet::add,
-        SortedSet::addAll);
+      .collect(toTreeSet);
 
     PaymentOption paymentOption = new PaymentOption();
     paymentOption.setPaymentOptionId(dto.getPaymentOptionId());