CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

FINERACT-2326: Refractor redundant and some deprecated code as per new Java 21 style

Browse Source
This commit is contained in:
Aman-Mittal
2025-12-08 13:49:44 +01:00
committed by Adam Saghy
parent 399789ba42
commit dce3c66def
29 changed files with 117 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-core/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/DefaultExceptionMapper.java
+3 -2
View File
@@ -24,8 +24,8 @@ import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.ext.ExceptionMapper;
import java.util.Map;
import java.util.Objects;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
@@ -43,8 +43,9 @@ public class DefaultExceptionMapper implements FineractExceptionMapper, Exceptio
@Override
public Response toResponse(RuntimeException exception) {
log.warn("Exception occurred", ErrorHandler.findMostSpecificException(exception));
return Response.status(SC_INTERNAL_SERVER_ERROR)
.entity(Map.of("Exception", ObjectUtils.defaultIfNull(exception.getMessage(), "No error message available")))
.entity(Map.of("Exception", Objects.requireNonNullElse(exception.getMessage(), "No error message available")))
.type(MediaType.APPLICATION_JSON).build();
}
}
fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/database/DataSourcePerTenantServiceFactory.java
+2 -3
View File
@@ -98,9 +98,8 @@ public class DataSourcePerTenantServiceFactory {
// https://github.com/brettwooldridge/HikariCP/wiki/MBean-(JMX)-Monitoring-and-Management
config.setRegisterMbeans(true);
meterRegistry.ifPresent(registry -> {
config.setMetricsTrackerFactory(new TenantConnectionPoolMetricsTrackerFactory(tenant.getTenantIdentifier(), registry));
});
meterRegistry.ifPresent(registry -> config
.setMetricsTrackerFactory(new TenantConnectionPoolMetricsTrackerFactory(tenant.getTenantIdentifier(), registry)));
// https://github.com/brettwooldridge/HikariCP/wiki/MySQL-Configuration
// These are the properties for each Tenant DB; the same configuration
fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/DaysInMonthType.java
+5 -9
View File
@@ -59,15 +59,11 @@ public enum DaysInMonthType {
public static DaysInMonthType fromInt(final Integer type) {
DaysInMonthType repaymentFrequencyType = DaysInMonthType.INVALID;
if (type != null) {
switch (type) {
case 1:
repaymentFrequencyType = DaysInMonthType.ACTUAL;
break;
case 30:
repaymentFrequencyType = DaysInMonthType.DAYS_30;
break;
}
repaymentFrequencyType = switch (type) {
case 1 -> DaysInMonthType.ACTUAL;
case 30 -> DaysInMonthType.DAYS_30;
default -> repaymentFrequencyType;
};
}
return repaymentFrequencyType;
}
fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/DaysInYearType.java
+7 -14
View File
@@ -63,20 +63,13 @@ public enum DaysInYearType {
public static DaysInYearType fromInt(final Integer type) {
DaysInYearType repaymentFrequencyType = DaysInYearType.INVALID;
if (type != null) {
switch (type) {
case 1:
repaymentFrequencyType = DaysInYearType.ACTUAL;
break;
case 360:
repaymentFrequencyType = DaysInYearType.DAYS_360;
break;
case 364:
repaymentFrequencyType = DaysInYearType.DAYS_364;
break;
case 365:
repaymentFrequencyType = DaysInYearType.DAYS_365;
break;
}
repaymentFrequencyType = switch (type) {
case 1 -> DaysInYearType.ACTUAL;
case 360 -> DaysInYearType.DAYS_360;
case 364 -> DaysInYearType.DAYS_364;
case 365 -> DaysInYearType.DAYS_365;
default -> repaymentFrequencyType;
};
}
return repaymentFrequencyType;
}