FINERACT-2009: Upgrade latest framework libs

fineract-loan/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java

@@ -18,8 +18,9 @@
  */
 package org.apache.fineract.portfolio.collateral.api;
 
-import java.util.HashSet;
+import java.util.Arrays;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public final class CollateralApiConstants {
 
@@ -43,16 +44,8 @@ public final class CollateralApiConstants {
             this.value = value;
         }
 
-        private static final Set<String> values = new HashSet<>();
-
-        static {
-            for (final CollateralJSONinputParams type : CollateralJSONinputParams.values()) {
-                values.add(type.value);
-            }
-        }
-
         public static Set<String> getAllValues() {
-            return values;
+            return Arrays.stream(values()).map(CollateralJSONinputParams::getValue).collect(Collectors.toSet());
         }
 
         @Override

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/command/LoanChargeCommand.java

@@ -18,6 +18,7 @@
  */
 package org.apache.fineract.portfolio.loanaccount.command;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanCharge;
@@ -49,6 +50,7 @@ public class LoanChargeCommand implements Comparable<LoanChargeCommand> {
     }
 
     @Override
+    @SuppressFBWarnings(value = "EQ_COMPARETO_USE_OBJECT_EQUALS", justification = "TODO: fix this! See: https://stackoverflow.com/questions/2609037/findbugs-how-to-solve-eq-compareto-use-object-equals")
     public int compareTo(final LoanChargeCommand o) {
         int comparison = this.chargeId.compareTo(o.chargeId);
         if (comparison == 0) {

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/AbstractLoanRepaymentScheduleTransactionProcessor.java

@@ -26,6 +26,7 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
@@ -688,7 +689,7 @@ public abstract class AbstractLoanRepaymentScheduleTransactionProcessor implemen
                 if (loanTransaction.isChargePayment()) {
                     for (final LoanChargePaidBy chargePaidBy : chargesPaidBies) {
                         LoanCharge loanCharge = chargePaidBy.getLoanCharge();
-                        if (loanCharge.getId().equals(unpaidCharge.getId())) {
+                        if (loanCharge != null && Objects.equals(loanCharge.getId(), unpaidCharge.getId())) {
                             chargePaidBy.setAmount(amountPaidTowardsCharge.getAmount());
                         }
                     }

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/ChargeOrTransaction.java

@@ -18,6 +18,7 @@
  */
 package org.apache.fineract.portfolio.loanaccount.domain.transactionprocessor.impl;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.Optional;
@@ -81,6 +82,7 @@ public class ChargeOrTransaction implements Comparable<ChargeOrTransaction> {
     }
 
     @Override
+    @SuppressFBWarnings(value = "EQ_COMPARETO_USE_OBJECT_EQUALS", justification = "TODO: fix this! See: https://stackoverflow.com/questions/2609037/findbugs-how-to-solve-eq-compareto-use-object-equals")
     public int compareTo(@NotNull ChargeOrTransaction o) {
         int datePortion = this.getEffectiveDate().compareTo(o.getEffectiveDate());
         if (datePortion == 0) {

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/HeavensFamilyLoanRepaymentScheduleTransactionProcessor.java

@@ -221,7 +221,6 @@ public class HeavensFamilyLoanRepaymentScheduleTransactionProcessor extends Abst
             List<LoanTransactionToRepaymentScheduleMapping> transactionMappings) {
 
         final LocalDate transactionDate = loanTransaction.getTransactionDate();
-        final MonetaryCurrency currency = transactionAmountUnprocessed.getCurrency();
         Money transactionAmountRemaining = transactionAmountUnprocessed;
         Money principalPortion = Money.zero(transactionAmountRemaining.getCurrency());
         Money interestPortion = Money.zero(transactionAmountRemaining.getCurrency());