diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java index 8e873568311..e69cddba766 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java @@ -72,8 +72,7 @@ public void validateForCreate(final String json) { } private DataValidatorBuilder getDataValidator(final List dataValidationErrors) { - final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("financialactivityaccount"); - return baseDataValidator; + return new DataValidatorBuilder(dataValidationErrors).resource("financialactivityaccount"); } public void validateForUpdate(final String json) { diff --git a/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java b/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java index ce4820d71a2..bdede823157 100644 --- a/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java +++ b/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java @@ -33,6 +33,8 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; +import lombok.Getter; +import lombok.Setter; import org.apache.fineract.accounting.glaccount.data.GLAccountData; import org.apache.fineract.accounting.glaccount.domain.GLAccount; import org.apache.fineract.infrastructure.core.api.JsonCommand; @@ -66,34 +68,41 @@ public class Charge extends AbstractPersistableCustom { public static final String LOCALE_PARAM_NAME = "locale"; public static final String FEE_FREQUENCY_PARAM_NAME = "feeFrequency"; + @Getter @Column(name = "name", length = 100) private String name; + @Getter @Column(name = "amount", scale = 6, precision = 19, nullable = false) private BigDecimal amount; + @Getter @Column(name = "currency_code", length = 3) private String currencyCode; @Column(name = "charge_applies_to_enum", nullable = false) private Integer chargeAppliesTo; + @Getter @Column(name = "charge_time_enum", nullable = false) private Integer chargeTimeType; + @Getter @Column(name = "charge_calculation_enum") private Integer chargeCalculation; - @Column(name = "charge_payment_mode_enum", nullable = true) + @Getter + @Column(name = "charge_payment_mode_enum") private Integer chargePaymentMode; - @Column(name = "fee_on_day", nullable = true) + @Column(name = "fee_on_day") private Integer feeOnDay; - @Column(name = "fee_interval", nullable = true) + @Getter + @Column(name = "fee_interval") private Integer feeInterval; - @Column(name = "fee_on_month", nullable = true) + @Column(name = "fee_on_month") private Integer feeOnMonth; @Column(name = "is_penalty", nullable = false) @@ -105,10 +114,12 @@ public class Charge extends AbstractPersistableCustom { @Column(name = "is_deleted", nullable = false) private boolean deleted = false; - @Column(name = "min_cap", scale = 6, precision = 19, nullable = true) + @Getter + @Column(name = "min_cap", scale = 6, precision = 19) private BigDecimal minCap; - @Column(name = "max_cap", scale = 6, precision = 19, nullable = true) + @Getter + @Column(name = "max_cap", scale = 6, precision = 19) private BigDecimal maxCap; @Column(name = "fee_frequency", nullable = true) @@ -117,26 +128,35 @@ public class Charge extends AbstractPersistableCustom { @Column(name = "is_free_withdrawal", nullable = false) private boolean enableFreeWithdrawal; - @Column(name = "free_withdrawal_charge_frequency", nullable = true) + @Column(name = "free_withdrawal_charge_frequency") private Integer freeWithdrawalFrequency; - @Column(name = "restart_frequency", nullable = true) + @Getter + @Column(name = "restart_frequency") private Integer restartFrequency; - @Column(name = "restart_frequency_enum", nullable = true) + @Getter + @Column(name = "restart_frequency_enum") private Integer restartFrequencyEnum; + @Getter @Column(name = "is_payment_type", nullable = false) private boolean enablePaymentType; + @Setter + @Getter @ManyToOne @JoinColumn(name = "payment_type_id", nullable = false) private PaymentType paymentType; + @Getter + @Setter @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "income_or_liability_account_id") private GLAccount account; + @Getter + @Setter @ManyToOne @JoinColumn(name = "tax_group_id") private TaxGroup taxGroup; @@ -245,12 +265,9 @@ private Charge(final String name, final BigDecimal amount, final String currency this.restartFrequencyEnum = restartFrequencyEnum.getValue(); } - if (enablePaymentType) { - if (paymentType != null) { - - this.enablePaymentType = true; - this.paymentType = paymentType; - } + if (enablePaymentType && paymentType != null) { + this.enablePaymentType = true; + this.paymentType = paymentType; } } else if (isLoanCharge()) { @@ -279,26 +296,6 @@ private Charge(final String name, final BigDecimal amount, final String currency } } - public String getName() { - return this.name; - } - - public BigDecimal getAmount() { - return this.amount; - } - - public String getCurrencyCode() { - return this.currencyCode; - } - - public Integer getChargeTimeType() { - return this.chargeTimeType; - } - - public Integer getChargeCalculation() { - return this.chargeCalculation; - } - public boolean isActive() { return this.active; } @@ -351,14 +348,6 @@ public boolean isPercentageOfDisbursementAmount() { return ChargeCalculationType.fromInt(this.chargeCalculation).isPercentageOfDisbursementAmount(); } - public BigDecimal getMinCap() { - return this.minCap; - } - - public BigDecimal getMaxCap() { - return this.maxCap; - } - public boolean isEnableFreeWithdrawal() { return this.enableFreeWithdrawal; } @@ -371,22 +360,6 @@ public Integer getFrequencyFreeWithdrawalCharge() { return this.freeWithdrawalFrequency; } - public Integer getRestartFrequency() { - return this.restartFrequency; - } - - public Integer getRestartFrequencyEnum() { - return this.restartFrequencyEnum; - } - - public PaymentType getPaymentType() { - return this.paymentType; - } - - public void setPaymentType(PaymentType paymentType) { - this.paymentType = paymentType; - } - private Long getPaymentTypeId() { Long paymentTypeId = null; if (this.paymentType != null) { @@ -450,11 +423,9 @@ public Map update(final JsonCommand command) { baseDataValidator.reset().parameter(CHARGE_TIME_PARAM_NAME).value(this.chargeTimeType) .failWithCodeNoParameterAddedToErrorCode("not.allowed.charge.time.for.loan"); } - } else if (isClientCharge()) { - if (!isAllowedLoanChargeTime()) { - baseDataValidator.reset().parameter(CHARGE_TIME_PARAM_NAME).value(this.chargeTimeType) - .failWithCodeNoParameterAddedToErrorCode("not.allowed.charge.time.for.client"); - } + } else if (isClientCharge() && !isAllowedLoanChargeTime()) { + baseDataValidator.reset().parameter(CHARGE_TIME_PARAM_NAME).value(this.chargeTimeType) + .failWithCodeNoParameterAddedToErrorCode("not.allowed.charge.time.for.client"); } } @@ -647,7 +618,7 @@ public Map update(final JsonCommand command) { } /** - * Delete is a soft delete. Updates flag on charge so it wont appear in query/report results. + * Delete is a soft delete. Updates flag on charge so it won't appear in query/report results. * * Any fields with unique constraints and prepended with id of record. */ @@ -690,14 +661,6 @@ public ChargeData toData() { } - public Integer getChargePaymentMode() { - return this.chargePaymentMode; - } - - public Integer getFeeInterval() { - return this.feeInterval; - } - public boolean isMonthlyFee() { return ChargeTimeType.fromInt(this.chargeTimeType).isMonthlyFee(); } @@ -726,14 +689,6 @@ public Integer feeFrequency() { return this.feeFrequency; } - public GLAccount getAccount() { - return this.account; - } - - public void setAccount(GLAccount account) { - this.account = account; - } - public Long getIncomeAccountId() { Long incomeAccountId = null; if (this.account != null) { @@ -755,14 +710,6 @@ public boolean isDisbursementCharge() { || ChargeTimeType.fromInt(this.chargeTimeType).equals(ChargeTimeType.TRANCHE_DISBURSEMENT); } - public TaxGroup getTaxGroup() { - return this.taxGroup; - } - - public void setTaxGroup(TaxGroup taxGroup) { - this.taxGroup = taxGroup; - } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/FineractErrorDecoder.java b/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/FineractErrorDecoder.java index 6c5525983f6..9a0867648d5 100644 --- a/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/FineractErrorDecoder.java +++ b/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/FineractErrorDecoder.java @@ -79,7 +79,7 @@ private String extractField(JsonNode node, String fieldName) { private String extractValidationErrors(JsonNode rootNode) { JsonNode errorsNode = rootNode.get("errors"); - if (errorsNode != null && errorsNode.isArray() && errorsNode.size() > 0) { + if (errorsNode != null && errorsNode.isArray() && !errorsNode.isEmpty()) { StringBuilder errors = new StringBuilder("Validation errors: "); for (JsonNode error : errorsNode) { String parameterName = extractField(error, "parameterName"); diff --git a/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/services/ImagesApi.java b/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/services/ImagesApi.java index 6fa311e8dab..7186f0121fd 100644 --- a/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/services/ImagesApi.java +++ b/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/services/ImagesApi.java @@ -77,21 +77,13 @@ private static String detectMediaType(String fileName) { } String ext = fileName.substring(dotPos + 1).toLowerCase(); - switch (ext) { - case "jpg": - case "jpeg": - return "image/jpeg"; - case "png": - return "image/png"; - case "gif": - return "image/gif"; - case "tif": - case "tiff": - return "image/tiff"; - case "pdf": - return "application/pdf"; - default: - return "application/octet-stream"; - } + return switch (ext) { + case "jpg", "jpeg" -> "image/jpeg"; + case "png" -> "image/png"; + case "gif" -> "image/gif"; + case "tif", "tiff" -> "image/tiff"; + case "pdf" -> "application/pdf"; + default -> "application/octet-stream"; + }; } } diff --git a/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/support/ApiResponseDecoder.java b/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/support/ApiResponseDecoder.java index c0590678e98..2d3a4088f34 100644 --- a/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/support/ApiResponseDecoder.java +++ b/fineract-client-feign/src/main/java/org/apache/fineract/client/feign/support/ApiResponseDecoder.java @@ -60,8 +60,7 @@ public Object decode(Response response, Type type) throws IOException { } private boolean isApiResponseType(Type type) { - if (type instanceof ParameterizedType) { - ParameterizedType paramType = (ParameterizedType) type; + if (type instanceof ParameterizedType paramType) { Type rawType = paramType.getRawType(); return rawType == ApiResponse.class; } @@ -69,8 +68,7 @@ private boolean isApiResponseType(Type type) { } private Type getApiResponseInnerType(Type type) { - if (type instanceof ParameterizedType) { - ParameterizedType paramType = (ParameterizedType) type; + if (type instanceof ParameterizedType paramType) { Type[] typeArgs = paramType.getActualTypeArguments(); if (typeArgs.length > 0) { return typeArgs[0]; diff --git a/fineract-core/src/main/java/org/apache/fineract/infrastructure/cache/domain/CacheType.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/cache/domain/CacheType.java index 5994a31fd58..ad58ba2adf7 100644 --- a/fineract-core/src/main/java/org/apache/fineract/infrastructure/cache/domain/CacheType.java +++ b/fineract-core/src/main/java/org/apache/fineract/infrastructure/cache/domain/CacheType.java @@ -20,7 +20,9 @@ import java.util.HashMap; import java.util.Map; +import lombok.Getter; +@Getter public enum CacheType { INVALID(0, "cacheType.invalid"), // @@ -54,15 +56,7 @@ public static CacheType fromInt(final Integer value) { @Override public String toString() { - return name().toString().replaceAll("_", " "); - } - - public Integer getValue() { - return this.value; - } - - public String getCode() { - return this.code; + return name().replace("_", " "); } public boolean isNoCache() { diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java index 71a1a01ab2a..a9917d98ac7 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java @@ -20,6 +20,7 @@ import java.util.HashSet; import java.util.Set; +import lombok.Getter; public final class CalendarConstants { @@ -29,6 +30,7 @@ private CalendarConstants() { public static final String CALENDAR_RESOURCE_NAME = "calendar"; + @Getter public enum CalendarSupportedParameters { CALENDAR_ID("id"), // @@ -80,12 +82,9 @@ public static Set getAllValues() { @Override public String toString() { - return name().toString().replaceAll("_", " "); + return name().replace("_", " "); } - public String getValue() { - return this.value; - } } } diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java index affaab10cc1..980d492f8b5 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java @@ -20,9 +20,11 @@ import java.util.HashMap; import java.util.Map; +import lombok.Getter; import org.apache.fineract.portfolio.common.domain.PeriodFrequencyType; import org.springframework.util.StringUtils; +@Getter public enum CalendarFrequencyType { INVALID(0, "calendarFrequencyType.invalid"), // @@ -39,16 +41,10 @@ public enum CalendarFrequencyType { this.code = code; } - public Integer getValue() { - return this.value; - } - - public String getCode() { - return this.code; - } - private static final Map intToEnumMap = new HashMap<>(); + @Getter private static int minValue = CalendarFrequencyType.DAILY.value; + @Getter private static int maxValue = CalendarFrequencyType.YEARLY.value; static { @@ -58,8 +54,7 @@ public String getCode() { } public static CalendarFrequencyType fromInt(final int i) { - final CalendarFrequencyType type = intToEnumMap.get(Integer.valueOf(i)); - return type; + return intToEnumMap.get(i); } public static CalendarFrequencyType fromString(final String frequencyString) { @@ -82,17 +77,9 @@ public static CalendarFrequencyType fromString(final String frequencyString) { return frequency; } - public static int getMinValue() { - return minValue; - } - - public static int getMaxValue() { - return maxValue; - } - @Override public String toString() { - return name().toString(); + return name(); } public boolean isWeekly() { @@ -115,18 +102,13 @@ public boolean isInvalid() { * @return CalendarFrequencyType */ public static CalendarFrequencyType from(final PeriodFrequencyType periodFrequencyType) { - switch (periodFrequencyType) { - case DAYS: - return CalendarFrequencyType.DAILY; - case WEEKS: - return CalendarFrequencyType.WEEKLY; - case MONTHS: - return CalendarFrequencyType.MONTHLY; - case YEARS: - return CalendarFrequencyType.YEARLY; - default: - return CalendarFrequencyType.INVALID; - } + return switch (periodFrequencyType) { + case DAYS -> CalendarFrequencyType.DAILY; + case WEEKS -> CalendarFrequencyType.WEEKLY; + case MONTHS -> CalendarFrequencyType.MONTHLY; + case YEARS -> CalendarFrequencyType.YEARLY; + default -> CalendarFrequencyType.INVALID; + }; } /** @@ -136,17 +118,12 @@ public static CalendarFrequencyType from(final PeriodFrequencyType periodFrequen * @return */ public static PeriodFrequencyType from(final CalendarFrequencyType frequencyType) { - switch (frequencyType) { - case DAILY: - return PeriodFrequencyType.DAYS; - case WEEKLY: - return PeriodFrequencyType.WEEKS; - case MONTHLY: - return PeriodFrequencyType.MONTHS; - case YEARLY: - return PeriodFrequencyType.YEARS; - default: - return PeriodFrequencyType.INVALID; - } + return switch (frequencyType) { + case DAILY -> PeriodFrequencyType.DAYS; + case WEEKLY -> PeriodFrequencyType.WEEKS; + case MONTHLY -> PeriodFrequencyType.MONTHS; + case YEARLY -> PeriodFrequencyType.YEARS; + default -> PeriodFrequencyType.INVALID; + }; } } diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java index 3648762d7e7..4738aaf93b7 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java @@ -20,7 +20,9 @@ import java.util.HashMap; import java.util.Map; +import lombok.Getter; +@Getter public enum CalendarRemindBy { SMS(1, "calendarRemindBy.sms"), // @@ -35,16 +37,10 @@ public enum CalendarRemindBy { this.code = code; } - public Integer getValue() { - return this.value; - } - - public String getCode() { - return this.code; - } - private static final Map intToEnumMap = new HashMap<>(); + @Getter private static int minValue; + @Getter private static int maxValue; static { @@ -65,20 +61,11 @@ public String getCode() { } public static CalendarRemindBy fromInt(final int i) { - final CalendarRemindBy remindBy = intToEnumMap.get(Integer.valueOf(i)); - return remindBy; - } - - public static int getMinValue() { - return minValue; - } - - public static int getMaxValue() { - return maxValue; + return intToEnumMap.get(i); } @Override public String toString() { - return name().toString(); + return name(); } } diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java index 6321fa71544..5fef3b7205a 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java @@ -20,7 +20,9 @@ import java.util.HashMap; import java.util.Map; +import lombok.Getter; +@Getter public enum CalendarType { COLLECTION(1, "calendarType.collection"), // @@ -36,16 +38,10 @@ public enum CalendarType { this.code = code; } - public Integer getValue() { - return this.value; - } - - public String getCode() { - return this.code; - } - private static final Map intToEnumMap = new HashMap<>(); + @Getter private static int minValue; + @Getter private static int maxValue; static { @@ -66,21 +62,12 @@ public String getCode() { } public static CalendarType fromInt(final int i) { - final CalendarType type = intToEnumMap.get(Integer.valueOf(i)); - return type; - } - - public static int getMinValue() { - return minValue; - } - - public static int getMaxValue() { - return maxValue; + return intToEnumMap.get(i); } @Override public String toString() { - return name().toString(); + return name(); } public boolean isCollection() { diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarWeekDaysType.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarWeekDaysType.java index dac9c706c06..4a21296555c 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarWeekDaysType.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarWeekDaysType.java @@ -20,8 +20,10 @@ import java.util.HashMap; import java.util.Map; +import lombok.Getter; import org.springframework.util.StringUtils; +@Getter public enum CalendarWeekDaysType { INVALID(0, "calendarWeekDaysType.invalid"), // @@ -41,16 +43,10 @@ public enum CalendarWeekDaysType { this.code = code; } - public Integer getValue() { - return this.value; - } - - public String getCode() { - return this.code; - } - private static final Map intToEnumMap = new HashMap<>(); + @Getter private static int minValue = CalendarWeekDaysType.MO.value; + @Getter private static int maxValue = CalendarWeekDaysType.SU.value; static { @@ -60,21 +56,12 @@ public String getCode() { } public static CalendarWeekDaysType fromInt(final int i) { - final CalendarWeekDaysType type = intToEnumMap.get(Integer.valueOf(i)); - return type; - } - - public static int getMinValue() { - return minValue; - } - - public static int getMaxValue() { - return maxValue; + return intToEnumMap.get(i); } @Override public String toString() { - return name().toString(); + return name(); } public boolean isInvalid() { diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarEnumerations.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarEnumerations.java index 051417e7b8f..7945b4246a5 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarEnumerations.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarEnumerations.java @@ -40,9 +40,7 @@ public static EnumOptionData calendarEntityType(final int id) { } public static EnumOptionData calendarEntityType(final CalendarEntityType entityType) { - final EnumOptionData optionData = new EnumOptionData(entityType.getValue().longValue(), entityType.getCode(), - entityType.toString()); - return optionData; + return new EnumOptionData(entityType.getValue().longValue(), entityType.getCode(), entityType.toString()); } public static List calendarEntityType(final CalendarEntityType[] entityTypes) { @@ -58,8 +56,7 @@ public static EnumOptionData calendarType(final int id) { } public static EnumOptionData calendarType(final CalendarType type) { - final EnumOptionData optionData = new EnumOptionData(type.getValue().longValue(), type.getCode(), type.toString()); - return optionData; + return new EnumOptionData(type.getValue().longValue(), type.getCode(), type.toString()); } public static List calendarType(final CalendarType[] types) { @@ -75,8 +72,7 @@ public static EnumOptionData calendarRemindBy(final int id) { } public static EnumOptionData calendarRemindBy(final CalendarRemindBy remindBy) { - final EnumOptionData optionData = new EnumOptionData(remindBy.getValue().longValue(), remindBy.getCode(), remindBy.toString()); - return optionData; + return new EnumOptionData(remindBy.getValue().longValue(), remindBy.getCode(), remindBy.toString()); } public static List calendarRemindBy(final CalendarRemindBy[] remindBys) { @@ -138,16 +134,13 @@ public static EnumOptionData calendarFrequencyNthDayType(final int id) { } public static EnumOptionData calendarFrequencyNthDayType(final NthDayType calendarFrequencyNthDayType) { - final EnumOptionData optionData = new EnumOptionData(calendarFrequencyNthDayType.getValue().longValue(), - calendarFrequencyNthDayType.getCode(), calendarFrequencyNthDayType.toString()); - return optionData; + return new EnumOptionData(calendarFrequencyNthDayType.getValue().longValue(), calendarFrequencyNthDayType.getCode(), + calendarFrequencyNthDayType.toString()); } public static List calendarFrequencyNthDayType() { - final List optionDatas = Arrays.asList(calendarFrequencyNthDayType(NthDayType.ONE), - calendarFrequencyNthDayType(NthDayType.TWO), calendarFrequencyNthDayType(NthDayType.THREE), - calendarFrequencyNthDayType(NthDayType.FOUR), calendarFrequencyNthDayType(NthDayType.LAST), - calendarFrequencyNthDayType(NthDayType.ONDAY)); - return optionDatas; + return Arrays.asList(calendarFrequencyNthDayType(NthDayType.ONE), calendarFrequencyNthDayType(NthDayType.TWO), + calendarFrequencyNthDayType(NthDayType.THREE), calendarFrequencyNthDayType(NthDayType.FOUR), + calendarFrequencyNthDayType(NthDayType.LAST), calendarFrequencyNthDayType(NthDayType.ONDAY)); } } diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java index 6d31bb864fe..d6507a51812 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java @@ -208,8 +208,7 @@ private static Collection skipMeetingOnFirstdayOfMonth(final Collecti public static LocalDate adjustRecurringDate(final LocalDate recuringDate, final Integer numberOfDays) { if (recuringDate.getDayOfMonth() == 1) { - LocalDate adjustedRecurringDate = recuringDate.plusDays(numberOfDays); - return adjustedRecurringDate; + return recuringDate.plusDays(numberOfDays); } return recuringDate; } @@ -221,9 +220,7 @@ public static Recur getICalRecur(final String recurringRule) { final RRule rrule = new RRule(recurringRule); rrule.validate(); - final Recur recur = rrule.getRecur(); - - return recur; + return rrule.getRecur(); } catch (final ParseException e) { // TODO Auto-generated catch block log.error("Problem occurred in getICalRecur function", e); @@ -385,7 +382,7 @@ public static boolean isValidRecurringDate(final Recur recur, final LocalDate se final Collection recurDate = getRecurringDates(recur, seedDate, startDate, date.plusDays(1), 1, isSkipRepaymentonFirstDayOfMonth, numberOfDays); - return (recurDate == null || recurDate.isEmpty()) ? false : recurDate.contains(date); + return recurDate != null && !recurDate.isEmpty() && recurDate.contains(date); } public enum DayNameEnum { @@ -585,10 +582,9 @@ public static LocalDate getNewRepaymentMeetingDate(final String recurringRule, f if (isValidRecurringDate(recur, seedDate, oldRepaymentDate, isSkipRepaymentOnFirstDayOfMonth, numberOfDays)) { return oldRepaymentDate; } - LocalDate nextRepaymentDate = getNextRepaymentMeetingDate(recurringRule, seedDate, oldRepaymentDate, loanRepaymentInterval, - frequency, workingDays, isSkipRepaymentOnFirstDayOfMonth, numberOfDays); - return nextRepaymentDate; + return getNextRepaymentMeetingDate(recurringRule, seedDate, oldRepaymentDate, loanRepaymentInterval, frequency, workingDays, + isSkipRepaymentOnFirstDayOfMonth, numberOfDays); } public static LocalDate getNextRepaymentMeetingDate(final String recurringRule, final LocalDate seedDate, final LocalDate repaymentDate, @@ -701,10 +697,10 @@ public static String getSqlCalendarTypeOptionsInString(final List calen StringBuilder sb = new StringBuilder(); for (int i = 0; i < calendarTypeOptions.size() - 1; i++) { - sb.append(calendarTypeOptions.get(i).toString() + ","); + sb.append(calendarTypeOptions.get(i).toString()).append(","); } - sb.append(calendarTypeOptions.get(calendarTypeOptions.size() - 1).toString()); + sb.append(calendarTypeOptions.getLast().toString()); return sb.toString(); } diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/ClientIdentifierStatus.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/ClientIdentifierStatus.java index 8bb020e10e5..4590fa44ee7 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/ClientIdentifierStatus.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/ClientIdentifierStatus.java @@ -18,9 +18,12 @@ */ package org.apache.fineract.portfolio.client.domain; +import lombok.Getter; + /** * Enum representation of client identifier status states. */ +@Getter public enum ClientIdentifierStatus { INACTIVE(100, "clientIdentifierStatusType.inactive"), // @@ -31,17 +34,11 @@ public enum ClientIdentifierStatus { private final String code; public static ClientIdentifierStatus fromInt(final Integer statusValue) { - - ClientIdentifierStatus enumeration = ClientIdentifierStatus.INVALID; - switch (statusValue) { - case 100: - enumeration = ClientIdentifierStatus.INACTIVE; - break; - case 200: - enumeration = ClientIdentifierStatus.ACTIVE; - break; - } - return enumeration; + return switch (statusValue) { + case 100 -> ClientIdentifierStatus.INACTIVE; + case 200 -> ClientIdentifierStatus.ACTIVE; + default -> ClientIdentifierStatus.INVALID; + }; } ClientIdentifierStatus(final Integer value, final String code) { @@ -49,18 +46,6 @@ public static ClientIdentifierStatus fromInt(final Integer statusValue) { this.code = code; } - // public boolean hasStateOf(final ClientIdentifierStatus state) { - // return this.value.equals(state.getValue()); - // } - - public Integer getValue() { - return this.value; - } - - public String getCode() { - return this.code; - } - public boolean isInactive() { return this.value.equals(ClientIdentifierStatus.INACTIVE.getValue()); } diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java index 94c9d8e13f4..bc0677b2529 100755 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java @@ -57,7 +57,7 @@ public static ConditionType fromInt(final Integer v) { @Override public String toString() { - return name().toString().replace("_", " "); + return name().replace("_", " "); } public Integer getValue() { diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/CollateralManagementJsonInputParams.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/CollateralManagementJsonInputParams.java index b8b2620bde7..55a46168c84 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/CollateralManagementJsonInputParams.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/CollateralManagementJsonInputParams.java @@ -18,6 +18,9 @@ */ package org.apache.fineract.portfolio.collateralmanagement.api; +import lombok.Getter; + +@Getter public enum CollateralManagementJsonInputParams { NAME("name"), // @@ -39,11 +42,7 @@ public enum CollateralManagementJsonInputParams { @Override public String toString() { - return name().replaceAll("_", " "); - } - - public String getValue() { - return this.value; + return name().replace("_", " "); } } diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java index 4bb3058f1bd..d0f36ff2da9 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/DelinquencyReadPlatformServiceImpl.java @@ -141,12 +141,10 @@ public CollectionData calculateLoanCollectionData(final Long loanId) { // If the Loan is not Active yet or is cancelled (rejected or withdrawn), return template data if (loan.isSubmittedAndPendingApproval() || loan.isApproved() || loan.isCancelled()) { - if (loan.getLoanProduct() != null && !loan.getLoanProduct().isAllowApprovedDisbursedAmountsOverApplied()) { - return collectionData; - } else { + if (loan.getLoanProduct() == null || loan.getLoanProduct().isAllowApprovedDisbursedAmountsOverApplied()) { collectionData.setAvailableDisbursementAmountWithOverApplied(calculateAvailableDisbursementAmountWithOverApplied(loan)); - return collectionData; } + return collectionData; } final List savedDelinquencyList = retrieveLoanDelinquencyActions(loanId); diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateChargeByLoanExternalIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateChargeByLoanExternalIdCommandStrategyTest.java index cd49a158676..0b917c3f8f2 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateChargeByLoanExternalIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateChargeByLoanExternalIdCommandStrategyTest.java @@ -42,7 +42,7 @@ /** * Test class for {@link CreateChargeByLoanExternalIdCommandStrategy}. */ -public class CreateChargeByLoanExternalIdCommandStrategyTest { +class CreateChargeByLoanExternalIdCommandStrategyTest { /** * Command arguments provider. @@ -50,7 +50,7 @@ public class CreateChargeByLoanExternalIdCommandStrategyTest { * @return command argument */ private static Stream provideCommandParameters() { - return Stream.of(Arguments.of(null, 0), Arguments.of("adjustment", 1)); + return Stream.of(Arguments.of((Object) null), Arguments.of("adjustment")); } /** @@ -58,12 +58,10 @@ private static Stream provideCommandParameters() { * * @param command * the command to pass - * @param noOfArguments - * the number of arguments */ @ParameterizedTest @MethodSource("provideCommandParameters") - public void testExecuteSuccessScenario(final String command, final int noOfArguments) { + void testExecuteSuccessScenario(final String command) { final TestContext testContext = new TestContext(); final String loanExternalId = UUID.randomUUID().toString(); final BatchRequest batchRequest = getBatchRequest(loanExternalId, command); @@ -98,10 +96,10 @@ private BatchRequest getBatchRequest(final String loanExternalId, final String c if (StringUtils.isNotBlank(command)) { relativeUrl = relativeUrl + String.format("?command=%s", command); } - br.setRequestId(Long.valueOf(RandomStringUtils.randomNumeric(5))); + br.setRequestId(Long.valueOf(RandomStringUtils.secure().nextNumeric(5))); br.setRelativeUrl(relativeUrl); br.setMethod(HttpMethod.POST); - br.setReference(Long.valueOf(RandomStringUtils.randomNumeric(5))); + br.setReference(Long.valueOf(RandomStringUtils.secure().nextNumeric(5))); br.setBody("{}"); return br;