From a7fdafd4071b3f9df9f687cf82ed6976939133c9 Mon Sep 17 00:00:00 2001 From: percyashu Date: Mon, 22 Jun 2020 11:56:32 +0100 Subject: [PATCH] FINERACT-822 Enforce UnusedMethod check --- fineract-provider/build.gradle | 2 +- .../common/accounting/JournalEntryHelper.java | 9 --------- .../adhocquery/api/AdHocApiResource.java | 5 ----- ...atatableChecksWritePlatformServiceImpl.java | 18 ------------------ .../domain/InteropIdentifier.java | 16 ---------------- .../address/domain/FieldConfiguration.java | 9 --------- .../portfolio/loanaccount/domain/Loan.java | 15 --------------- .../domain/DefaultScheduledDateGenerator.java | 15 --------------- 8 files changed, 1 insertion(+), 88 deletions(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 5ce3f356b..98aad47dc 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -384,7 +384,6 @@ tasks.withType(JavaCompile) { disable( "UnusedVariable", "SameNameButDifferent", - "UnusedMethod", "ModifiedButNotUsed", "TypeParameterUnusedInFormals", "UndefinedEquals", @@ -461,6 +460,7 @@ tasks.withType(JavaCompile) { "DoubleBraceInitialization", "UnnecessaryDefaultInEnumSwitch", "UnusedNestedClass", + "UnusedMethod", "InconsistentCapitalization", "MissingOverride", // "InvalidBlockTag", diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java index a6c53271a..a02a7af95 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java @@ -66,15 +66,6 @@ public class JournalEntryHelper { } - private String getEntryValueFromJournalEntry(final ArrayList entryResponse, final int entryNumber) { - final HashMap map = (HashMap) entryResponse.get(entryNumber).get("entryType"); - return (String) map.get("value"); - } - - private Float getTransactionAmountFromJournalEntry(final ArrayList entryResponse, final int entryNumber) { - return (Float) entryResponse.get(entryNumber).get("amount"); - } - private void checkJournalEntry(final Integer officeId, final Account account, final String date, final JournalEntry... accountEntries) { final String url = createURLForGettingAccountEntries(account, date, officeId); final ArrayList response = Utils.performServerGet(this.requestSpec, this.responseSpec, url, "pageItems"); diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java index a642d9e71..4bf684207 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java @@ -37,7 +37,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriInfo; -import org.apache.commons.lang3.StringUtils; import org.apache.fineract.adhocquery.data.AdHocData; import org.apache.fineract.adhocquery.service.AdHocReadPlatformService; import org.apache.fineract.commands.domain.CommandWrapper; @@ -173,8 +172,4 @@ public class AdHocApiResource { return this.toApiJsonSerializer.serialize(result); } - private boolean is(final String commandParam, final String commandValue) { - return StringUtils.isNotBlank(commandParam) && commandParam.trim().equalsIgnoreCase(commandValue); - } - } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java index 580ede22f..e28e5b5b4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java @@ -248,24 +248,6 @@ public class EntityDatatableChecksWritePlatformServiceImpl implements EntityData return isMakerCheckerEnabled; } - private List getDatatableNames(Long status, String entity, Long productId) { - List ret = new ArrayList<>(); - List tableRequiredBeforeAction = null; - if (productId != null) { - tableRequiredBeforeAction = this.entityDatatableChecksRepository.findByEntityStatusAndProduct(entity, status, productId); - } - - if (tableRequiredBeforeAction == null || tableRequiredBeforeAction.size() < 1) { - tableRequiredBeforeAction = this.entityDatatableChecksRepository.findByEntityStatusAndNoProduct(entity, status); - } - if (tableRequiredBeforeAction != null && tableRequiredBeforeAction.size() > 0) { - for (EntityDatatableChecks t : tableRequiredBeforeAction) { - ret.add(t.getDatatableName()); - } - } - return ret; - } - @Transactional @Override public CommandProcessingResult deleteCheck(final Long entityDatatableCheckId) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifier.java b/fineract-provider/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifier.java index eb9ab9cde..7f6d4c1b4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifier.java +++ b/fineract-provider/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifier.java @@ -88,18 +88,10 @@ public class InteropIdentifier extends AbstractPersistableCustom { return account; } - private void setAccount(SavingsAccount account) { - this.account = account; - } - public InteropIdentifierType getType() { return type; } - private void setType(InteropIdentifierType type) { - this.type = type; - } - public String getValue() { return value; } @@ -120,18 +112,10 @@ public class InteropIdentifier extends AbstractPersistableCustom { return createdBy; } - private void setCreatedBy(String createdBy) { - this.createdBy = createdBy; - } - public Date getCreatedOn() { return createdOn; } - private void setCreatedOn(Date createdOn) { - this.createdOn = createdOn; - } - public String geModifiedBy() { return modifiedBy; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/FieldConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/FieldConfiguration.java index 0e2176848..8cc4370a9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/FieldConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/FieldConfiguration.java @@ -20,7 +20,6 @@ package org.apache.fineract.portfolio.address.domain; import javax.persistence.Entity; import javax.persistence.Table; -import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; @Entity @@ -47,12 +46,4 @@ public class FieldConfiguration extends AbstractPersistableCustom { } - private static FieldConfiguration fromJson(final JsonCommand command) { - final String entity = command.stringValueOfParameterNamed("entity"); - final String table = command.stringValueOfParameterNamed("table"); - final String field = command.stringValueOfParameterNamed("field"); - final boolean is_enabled = command.booleanPrimitiveValueOfParameterNamed("implementationKey"); - - return new FieldConfiguration(entity, table, field, is_enabled); - } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java index dd40ec085..e6ad2a67e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java @@ -924,21 +924,6 @@ public class Loan extends AbstractPersistableCustom { return amount; } - private boolean isFirstTrancheDisbursement() { - if (isMultiDisburmentLoan()) { - int totalTranchDisbursementCount = 0; - for (final LoanDisbursementDetails loanDisbursementDetail : this.disbursementDetails) { - if (loanDisbursementDetail.actualDisbursementDate() != null) { - totalTranchDisbursementCount++; - } - } - if (totalTranchDisbursementCount < 2) { - return true; - } - } - return false; - } - /** * @return */ diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGenerator.java index 6391bee50..01a70da38 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGenerator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGenerator.java @@ -233,21 +233,6 @@ public class DefaultScheduledDateGenerator implements ScheduledDateGenerator { return dueRepaymentPeriodDate; } - private LocalDate adjustToNthWeekDay(LocalDate dueRepaymentPeriodDate, int nthDay, int dayOfWeek) { - // adjust date to start of month - dueRepaymentPeriodDate = dueRepaymentPeriodDate.withDayOfMonth(1); - // adjust date to next week if current day is past specified day of - // week. - if (dueRepaymentPeriodDate.getDayOfWeek() > dayOfWeek) { - dueRepaymentPeriodDate = dueRepaymentPeriodDate.plusWeeks(1); - } - // adjust date to specified date of week - dueRepaymentPeriodDate = dueRepaymentPeriodDate.withDayOfWeek(dayOfWeek); - // adjust to specified nth week day - dueRepaymentPeriodDate = dueRepaymentPeriodDate.plusWeeks(nthDay - 1); - return dueRepaymentPeriodDate; - } - @Override public Boolean isDateFallsInSchedule(final PeriodFrequencyType frequency, final int repaidEvery, final LocalDate startDate, final LocalDate date) {