From 73620a7cd0b90076bfe7eb480d3641df74ef9f8b Mon Sep 17 00:00:00 2001 From: Vladyslav Date: Thu, 3 Sep 2026 15:17:38 +0300 Subject: [PATCH] FINERACT-2801: Remove unused (dead) code in fineract-rates --- fineract-rates/dependencies.gradle | 2 -- .../floatingrates/data/FloatingRateDTO.java | 4 ---- .../floatingrates/data/FloatingRateData.java | 10 +--------- .../floatingrates/data/InterestRatePeriodData.java | 4 ---- .../domain/FloatingRateRepositoryWrapper.java | 4 ---- .../exception/FloatingRateNotFoundException.java | 4 ---- .../service/FloatingRatesReadService.java | 2 -- .../service/FloatingRatesReadServiceImpl.java | 12 ++---------- 8 files changed, 3 insertions(+), 39 deletions(-) diff --git a/fineract-rates/dependencies.gradle b/fineract-rates/dependencies.gradle index 432977fb3e3..b19a954aeaf 100644 --- a/fineract-rates/dependencies.gradle +++ b/fineract-rates/dependencies.gradle @@ -46,7 +46,6 @@ dependencies { 'com.squareup.retrofit2:converter-gson', 'org.springdoc:springdoc-openapi-starter-webmvc-ui', - 'org.mapstruct:mapstruct', 'io.github.resilience4j:resilience4j-spring-boot3', 'org.apache.httpcomponents:httpcore', @@ -54,7 +53,6 @@ dependencies { compileOnly 'com.github.spotbugs:spotbugs-annotations' compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' - annotationProcessor 'org.mapstruct:mapstruct-processor' implementation ('org.springframework.boot:spring-boot-starter-data-jpa') { exclude group: 'org.hibernate' } diff --git a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateDTO.java b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateDTO.java index 5fd8b006632..8400a8c65b1 100644 --- a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateDTO.java +++ b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateDTO.java @@ -68,10 +68,6 @@ public BigDecimal getInterestRateDiff() { return this.interestRateDiff; } - public Collection getBaseLendingRatePeriods() { - return this.baseLendingRatePeriods; - } - public void resetInterestRateDiff() { this.interestRateDiff = this.actualInterestRateDiff; } diff --git a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateData.java b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateData.java index 74fa49e9c20..7d10c04d763 100644 --- a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateData.java +++ b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/FloatingRateData.java @@ -25,7 +25,6 @@ import org.apache.commons.lang3.builder.CompareToBuilder; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.fineract.infrastructure.core.data.EnumOptionData; @Getter public class FloatingRateData implements Comparable, Serializable { @@ -39,11 +38,9 @@ public class FloatingRateData implements Comparable, Serializa private final String modifiedBy; private final OffsetDateTime modifiedOn; private final List ratePeriods; - private final List interestRateFrequencyTypeOptions; public FloatingRateData(Long id, String name, Boolean isBaseLendingRate, Boolean isActive, String createdBy, OffsetDateTime createdOn, - String modifiedBy, OffsetDateTime modifiedOn, List ratePeriods, - List interestRateFrequencyTypeOptions) { + String modifiedBy, OffsetDateTime modifiedOn, List ratePeriods) { this.id = id; this.name = name; this.isBaseLendingRate = isBaseLendingRate; @@ -53,7 +50,6 @@ public FloatingRateData(Long id, String name, Boolean isBaseLendingRate, Boolean this.modifiedBy = modifiedBy; this.modifiedOn = modifiedOn; this.ratePeriods = ratePeriods; - this.interestRateFrequencyTypeOptions = interestRateFrequencyTypeOptions; } @Override @@ -98,8 +94,4 @@ public int hashCode() { .append(this.isActive) // .toHashCode(); } - - public static FloatingRateData toTemplate(List interestRateFrequencyTypeOptions) { - return new FloatingRateData(null, null, false, true, null, null, null, null, null, interestRateFrequencyTypeOptions); - } } diff --git a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/InterestRatePeriodData.java b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/InterestRatePeriodData.java index fe14d8ca3a1..878249ed877 100644 --- a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/InterestRatePeriodData.java +++ b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/data/InterestRatePeriodData.java @@ -51,10 +51,6 @@ public boolean isDifferentialToBLR() { return this.isDifferentialToBLR; } - public boolean isIsDifferentialToBLR() { - return this.isDifferentialToBLR; - } - public void setLoanDifferentialInterestRate(BigDecimal loanDifferentialInterestRate) { this.loanDifferentialInterestRate = loanDifferentialInterestRate; } diff --git a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/domain/FloatingRateRepositoryWrapper.java b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/domain/FloatingRateRepositoryWrapper.java index 6a608c6baa3..6b15a1d2c83 100644 --- a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/domain/FloatingRateRepositoryWrapper.java +++ b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/domain/FloatingRateRepositoryWrapper.java @@ -32,10 +32,6 @@ public FloatingRateRepositoryWrapper(final FloatingRateRepository floatingRateRe this.floatingRateRepository = floatingRateRepository; } - public FloatingRate retrieveBaseLendingRate() { - return this.floatingRateRepository.retrieveBaseLendingRate(); - } - public FloatingRate findOneWithNotFoundDetection(final Long id) { return this.floatingRateRepository.findById(id).orElseThrow(() -> new FloatingRateNotFoundException(id)); } diff --git a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/exception/FloatingRateNotFoundException.java b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/exception/FloatingRateNotFoundException.java index 8088546fd9a..45005131cb7 100644 --- a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/exception/FloatingRateNotFoundException.java +++ b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/exception/FloatingRateNotFoundException.java @@ -27,10 +27,6 @@ public FloatingRateNotFoundException(final Long id) { super("error.msg.floatingrate.id.invalid", "Floating Rate with identifier " + id + " does not exist", id); } - public FloatingRateNotFoundException(final String globalisationMessageCode) { - super(globalisationMessageCode, "Floating Rate does not exist"); - } - public FloatingRateNotFoundException(String globalisationMessageCode, EmptyResultDataAccessException e) { super(globalisationMessageCode, "Floating Rate does not exist", e); } diff --git a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadService.java b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadService.java index 1c655b1e48e..d92f3e3b4f8 100644 --- a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadService.java +++ b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadService.java @@ -30,8 +30,6 @@ public interface FloatingRatesReadService { FloatingRateData retrieveOne(Long floatingRateId); - List retrieveAllActive(); - FloatingRateData retrieveBaseLendingRate(); List retrieveInterestRatePeriods(Long productId); diff --git a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadServiceImpl.java b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadServiceImpl.java index 986f7d526d9..e7f1214ef07 100644 --- a/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadServiceImpl.java +++ b/fineract-rates/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadServiceImpl.java @@ -47,13 +47,6 @@ public List retrieveAll() { return this.jdbcTemplate.query(sql, rateMapper); // NOSONAR } - @Override - public List retrieveAllActive() { - FloatingRateRowMapper rateMapper = new FloatingRateRowMapper(false); - final String sql = "select " + rateMapper.schema() + " where rate.is_active = true "; - return this.jdbcTemplate.query(sql, rateMapper);// NOSONAR - } - @Override public List retrieveLookupActive() { FloatingRateLookupMapper rateMapper = new FloatingRateLookupMapper(); @@ -131,8 +124,7 @@ public FloatingRateData mapRow(final ResultSet rs, @SuppressWarnings("unused") f + " where period.is_active = true and period.floating_rates_id = ? " + " order by period.from_date desc "; ratePeriods = jdbcTemplate.query(sql, ratePeriodMapper, id); // NOSONAR } - return new FloatingRateData(id, name, isBaseLendingRate, isActive, createdBy, createdOn, modifiedBy, modifiedOn, ratePeriods, - null); + return new FloatingRateData(id, name, isBaseLendingRate, isActive, createdBy, createdOn, modifiedBy, modifiedOn, ratePeriods); } public String schema() { @@ -188,7 +180,7 @@ public FloatingRateData mapRow(final ResultSet rs, @SuppressWarnings("unused") f final Long id = rs.getLong("id"); final String name = rs.getString("name"); final boolean isBaseLendingRate = rs.getBoolean("isBaseLendingRate"); - return new FloatingRateData(id, name, isBaseLendingRate, true, null, null, null, null, null, null); + return new FloatingRateData(id, name, isBaseLendingRate, true, null, null, null, null, null); } public String schema() {