FINERACT-1526: Upgrade dependencies

fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosureJsonInputParams.java

@@ -35,6 +35,7 @@ public enum GLClosureJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final GLClosureJsonInputParams type : GLClosureJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java

@@ -55,6 +55,7 @@ public final class AccountingConstants {
         }
 
         private static final Map<Integer, CashAccountsForLoan> intToEnumMap = new HashMap<>();
+
         static {
             for (final CashAccountsForLoan type : CashAccountsForLoan.values()) {
                 intToEnumMap.put(type.value, type);
@@ -92,6 +93,7 @@ public final class AccountingConstants {
         }
 
         private static final Map<Integer, AccrualAccountsForLoan> intToEnumMap = new HashMap<>();
+
         static {
             for (final AccrualAccountsForLoan type : AccrualAccountsForLoan.values()) {
                 intToEnumMap.put(type.value, type);
@@ -191,6 +193,7 @@ public final class AccountingConstants {
         }
 
         private static final Map<Integer, CashAccountsForSavings> intToEnumMap = new HashMap<>();
+
         static {
             for (final CashAccountsForSavings type : CashAccountsForSavings.values()) {
                 intToEnumMap.put(type.value, type);
@@ -278,6 +281,7 @@ public final class AccountingConstants {
         private final GLAccountType mappedGLAccountType;
 
         private static List<FinancialActivityData> financialActivities;
+
         static {
             financialActivities = new ArrayList<>();
             for (final FinancialActivity type : FinancialActivity.values()) {
@@ -314,6 +318,7 @@ public final class AccountingConstants {
         }
 
         private static final Map<Integer, FinancialActivity> intToEnumMap = new HashMap<>();
+
         static {
             for (final FinancialActivity type : FinancialActivity.values()) {
                 intToEnumMap.put(type.value, type);
@@ -363,6 +368,7 @@ public final class AccountingConstants {
         }
 
         private static final Map<Integer, CashAccountsForShares> intToEnumMap = new HashMap<>();
+
         static {
             for (final CashAccountsForShares type : CashAccountsForShares.values()) {
                 intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingRuleType.java

@@ -32,6 +32,7 @@ public enum AccountingRuleType {
     private final String code;
 
     private static final Map<Integer, AccountingRuleType> intToEnumMap = new HashMap<>();
+
     static {
         for (final AccountingRuleType type : AccountingRuleType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsJsonInputParams.java

@@ -35,6 +35,7 @@ public enum FinancialActivityAccountsJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final FinancialActivityAccountsJsonInputParams type : FinancialActivityAccountsJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountJsonInputParams.java

@@ -36,6 +36,7 @@ public enum GLAccountJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final GLAccountJsonInputParams type : GLAccountJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java

@@ -46,6 +46,7 @@ public enum GLAccountType {
     private static final Map<Integer, GLAccountType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final GLAccountType type : GLAccountType.values()) {

fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountUsage.java

@@ -44,6 +44,7 @@ public enum GLAccountUsage {
     private static final Map<Integer, GLAccountUsage> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final GLAccountUsage type : GLAccountUsage.values()) {

fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntryJsonInputParams.java

@@ -39,6 +39,7 @@ public enum JournalEntryJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final JournalEntryJsonInputParams type : JournalEntryJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryType.java

@@ -42,6 +42,7 @@ public enum JournalEntryType {
     }
 
     private static final Map<Integer, JournalEntryType> intToEnumMap = new HashMap<>();
+
     static {
         for (final JournalEntryType type : JournalEntryType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java

@@ -38,6 +38,7 @@ public enum AccountingRuleJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final AccountingRuleJsonInputParams type : AccountingRuleJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocJsonInputParams.java

@@ -36,6 +36,7 @@ public enum AdHocJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final AdHocJsonInputParams type : AdHocJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java

@@ -79,6 +79,7 @@ public final class AccountNumberFormatEnumerations {
         private static final Map<Integer, AccountNumberPrefixType> intToEnumMap = new HashMap<>();
         private static int minValue;
         private static int maxValue;
+
         static {
             int i = 0;
             for (final AccountNumberPrefixType type : AccountNumberPrefixType.values()) {

fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/EntityAccountType.java

@@ -45,6 +45,7 @@ public enum EntityAccountType {
     private static final Map<Integer, EntityAccountType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final EntityAccountType type : EntityAccountType.values()) {

fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java

@@ -326,7 +326,7 @@ public final class ImportHandlerUtils {
                     }
                 }
             }
-        } else if (sheetName.equals(TemplatePopulateImportConstants.PRODUCT_SHEET_NAME)) {
+        } else {
             for (Row row : sheet) {
                 for (int i = 0; i < 2; i++) {
                     if (name != null) {

fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailConfigurationValidator.java

@@ -51,7 +51,7 @@ public final class EmailConfigurationValidator {
             EmailApiConstants.SMTP_PASSWORD, EmailApiConstants.SMTP_USERNAME, EmailApiConstants.SMTP_SERVER));
 
     @Autowired
-    private EmailConfigurationValidator(final FromJsonHelper fromApiJsonHelper) {
+    public EmailConfigurationValidator(final FromJsonHelper fromApiJsonHelper) {
         this.fromApiJsonHelper = fromApiJsonHelper;
     }
 

fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java

@@ -40,7 +40,7 @@ public final class EmailMessageJobEmailServiceImpl implements EmailMessageJobEma
     private final ExternalServicesPropertiesReadPlatformService externalServicesReadPlatformService;
 
     @Autowired
-    private EmailMessageJobEmailServiceImpl(ExternalServicesPropertiesReadPlatformService externalServicesReadPlatformService) {
+    public EmailMessageJobEmailServiceImpl(ExternalServicesPropertiesReadPlatformService externalServicesReadPlatformService) {
         this.externalServicesReadPlatformService = externalServicesReadPlatformService;
     }
 

fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java

@@ -38,6 +38,7 @@ public class CodeConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final CodevalueJSONinputParams type : CodevalueJSONinputParams.values()) {
                 values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/EntityTables.java

@@ -39,6 +39,7 @@ public enum EntityTables {
                                     "savings_account_id");
 
     private static final Map<String, EntityTables> lookup = new HashMap<String, EntityTables>();
+
     static {
         for (EntityTables d : EntityTables.values()) {
             lookup.put(d.getName(), d);

fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/domain/StorageType.java

@@ -36,6 +36,7 @@ public enum StorageType {
     }
 
     private static final Map<Integer, StorageType> intToEnumMap = new HashMap<>();
+
     static {
         for (final StorageType type : StorageType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelationRepositoryWrapper.java

@@ -28,9 +28,8 @@ public final class FineractEntityRelationRepositoryWrapper {
     private final FineractEntityRelationRepository fineractEntityRelationRepository;
 
     @Autowired
-    private FineractEntityRelationRepositoryWrapper(final FineractEntityRelationRepository fineractEntityRelationRepository) {
+    public FineractEntityRelationRepositoryWrapper(final FineractEntityRelationRepository fineractEntityRelationRepository) {
         this.fineractEntityRelationRepository = fineractEntityRelationRepository;
-
     }
 
     public FineractEntityRelation findOneWithNotFoundDetection(final Long id) {

fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/Office.java

@@ -217,11 +217,10 @@ public class Office extends AbstractPersistableCustom implements Serializable {
     }
 
     public boolean hasParentOf(final Office office) {
-        boolean isParent = false;
         if (this.parent != null) {
-            isParent = this.parent.equals(office);
+            return this.parent.equals(office);
         }
-        return isParent;
+        return false;
     }
 
     public boolean doesNotHaveAnOfficeInHierarchyWithId(final Long officeId) {
@@ -241,7 +240,7 @@ public class Office extends AbstractPersistableCustom implements Serializable {
                 final boolean result = child.hasAnOfficeInHierarchyWithId(officeId);
 
                 if (result) {
-                    match = result;
+                    match = true;
                     break;
                 }
             }

fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/RepaymentRescheduleType.java

@@ -52,6 +52,7 @@ public enum RepaymentRescheduleType {
     private static final Map<Integer, RepaymentRescheduleType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final RepaymentRescheduleType entityType : RepaymentRescheduleType.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/FieldConfiguration.java

@@ -38,12 +38,10 @@ public class FieldConfiguration extends AbstractPersistableCustom {
 
     }
 
-    private FieldConfiguration(final String entity, final String table, final String field, final boolean is_enabled) {
+    public FieldConfiguration(final String entity, final String table, final String field, final boolean is_enabled) {
         this.entity = entity;
         this.table = table;
         this.field = field;
         this.isEnabled = is_enabled;
-
     }
-
 }

fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java

@@ -50,6 +50,7 @@ public final class CalendarConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final CalendarSupportedParameters param : CalendarSupportedParameters.values()) {
                 values.add(param.value);

fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarEntityType.java

@@ -51,6 +51,7 @@ public enum CalendarEntityType {
     private static final Map<Integer, CalendarEntityType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final CalendarEntityType entityType : CalendarEntityType.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java

@@ -44,6 +44,7 @@ public enum CalendarRemindBy {
     private static final Map<Integer, CalendarRemindBy> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final CalendarRemindBy remindBy : CalendarRemindBy.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java

@@ -45,6 +45,7 @@ public enum CalendarType {
     private static final Map<Integer, CalendarType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final CalendarType type : CalendarType.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java

@@ -231,7 +231,7 @@ public class Charge extends AbstractPersistableCustom {
             }
 
             if (enableFreeWithdrawalCharge) {
-                this.enableFreeWithdrawal = enableFreeWithdrawalCharge;
+                this.enableFreeWithdrawal = true;
                 this.freeWithdrawalFrequency = freeWithdrawalFrequency;
                 this.restartFrequency = restartFrequency;
                 this.restartFrequencyEnum = restartFrequencyEnum.getValue();
@@ -240,7 +240,7 @@ public class Charge extends AbstractPersistableCustom {
             if (enablePaymentType) {
                 if (paymentType != null) {
 
-                    this.enablePaymentType = enablePaymentType;
+                    this.enablePaymentType = true;
                     this.paymentType = paymentType;
                 }
             }

fineract-provider/src/main/java/org/apache/fineract/portfolio/client/serialization/ClientFamilyMemberCommandFromApiJsonDeserializer.java

@@ -49,7 +49,7 @@ public final class ClientFamilyMemberCommandFromApiJsonDeserializer {
             "professionId", "locale", "dateFormat", "familyMembers"));
 
     @Autowired
-    private ClientFamilyMemberCommandFromApiJsonDeserializer(final FromJsonHelper fromApiJsonHelper) {
+    public ClientFamilyMemberCommandFromApiJsonDeserializer(final FromJsonHelper fromApiJsonHelper) {
         this.fromApiJsonHelper = fromApiJsonHelper;
     }
 

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

@@ -44,6 +44,7 @@ public final class CollateralApiConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final CollateralJSONinputParams type : CollateralJSONinputParams.values()) {
                 values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/portfolio/common/BusinessEventNotificationConstants.java

@@ -83,6 +83,7 @@ public class BusinessEventNotificationConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final BusinessEvents type : BusinessEvents.values()) {
                 values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java

@@ -35,6 +35,7 @@ public enum ConditionType {
     private final String code;
 
     private static final Map<Integer, ConditionType> intToEnumMap = new HashMap<>();
+
     static {
         for (final ConditionType type : ConditionType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupTypes.java

@@ -40,6 +40,7 @@ public enum GroupTypes {
     private static final Map<Long, GroupTypes> intToEnumMap = new HashMap<>();
     private static long minValue;
     private static long maxValue;
+
     static {
         int i = 0;
         for (final GroupTypes type : GroupTypes.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveAttributeName.java

@@ -35,6 +35,7 @@ public enum InterestIncentiveAttributeName {
     private final String code;
 
     private static final Map<Integer, InterestIncentiveAttributeName> intToEnumMap = new HashMap<>();
+
     static {
         for (final InterestIncentiveAttributeName type : InterestIncentiveAttributeName.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveEntityType.java

@@ -33,6 +33,7 @@ public enum InterestIncentiveEntityType {
     private final String code;
 
     private static final Map<Integer, InterestIncentiveEntityType> intToEnumMap = new HashMap<>();
+
     static {
         for (final InterestIncentiveEntityType type : InterestIncentiveEntityType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveType.java

@@ -33,6 +33,7 @@ public enum InterestIncentiveType {
     private final String code;
 
     private static final Map<Integer, InterestIncentiveType> intToEnumMap = new HashMap<>();
+
     static {
         for (final InterestIncentiveType type : InterestIncentiveType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/GuarantorConstants.java

@@ -47,6 +47,7 @@ public final class GuarantorConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final GuarantorJSONinputParams type : GuarantorJSONinputParams.values()) {
                 values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/domain/GuarantorType.java

@@ -44,6 +44,7 @@ public enum GuarantorType {
     private static final Map<Integer, GuarantorType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final GuarantorType type : GuarantorType.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java

@@ -584,7 +584,7 @@ public class LoanScheduleAssembler {
             if (!meetingFrequency.equals(repaymentFrequency)) {
                 throw new MeetingFrequencyMismatchException("loanapplication.repayment.frequency",
                         "Loan repayment frequency period must match that of meeting frequency period", repaymentFrequency);
-            } else if (meetingFrequency.equals(repaymentFrequency)) {
+            } else {
                 // repayment frequency is same as meeting frequency repayment
                 // interval should be same or multiple of meeting interval
                 if (repaymentInterval % meetingInterval != 0) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationCompoundingMethod.java

@@ -42,6 +42,7 @@ public enum InterestRecalculationCompoundingMethod {
     private final String code;
 
     private static final Map<Integer, InterestRecalculationCompoundingMethod> intToEnumMap = new HashMap<>();
+
     static {
         for (final InterestRecalculationCompoundingMethod type : InterestRecalculationCompoundingMethod.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LendingStrategy.java

@@ -49,6 +49,7 @@ public enum LendingStrategy {
     private static final Map<Integer, LendingStrategy> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final LendingStrategy type : LendingStrategy.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanPreClosureInterestCalculationStrategy.java

@@ -36,6 +36,7 @@ public enum LoanPreClosureInterestCalculationStrategy {
     private static final Map<Integer, LoanPreClosureInterestCalculationStrategy> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final LoanPreClosureInterestCalculationStrategy type : LoanPreClosureInterestCalculationStrategy.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java

@@ -56,6 +56,7 @@ public enum NoteType {
     private static final Map<Integer, NoteType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final NoteType type : NoteType.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java

@@ -36,6 +36,7 @@ public class SearchConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final SearchResponseParameters param : SearchResponseParameters.values()) {
                 values.add(param.value);
@@ -67,6 +68,7 @@ public class SearchConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final SearchSupportedParameters param : SearchSupportedParameters.values()) {
                 values.add(param.value);
@@ -98,6 +100,7 @@ public class SearchConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final SearchSupportedResources param : SearchSupportedResources.values()) {
                 values.add(param.value);
@@ -129,6 +132,7 @@ public class SearchConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final SearchLoanDate param : SearchLoanDate.values()) {
                 values.add(param.value);