diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CommonConstants.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CommonConstants.java index f7c9c416b..d28200109 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CommonConstants.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CommonConstants.java @@ -20,11 +20,11 @@ package org.apache.fineract.integrationtests.common; public interface CommonConstants { - public static final String LOCALE = "en"; - public static final String DATE_FORMAT = "dd MMMM yyyy"; - public static final String RESPONSE_RESOURCE_ID = "resourceId"; - public static final String RESPONSE_CHANGES = "changes"; - public static final String RESPONSE_STATUS = "status"; - public static final String RESPONSE_ERROR = "errors"; - public static final String RESPONSE_ERROR_MESSAGE_CODE = "userMessageGlobalisationCode"; + String LOCALE = "en"; + String DATE_FORMAT = "dd MMMM yyyy"; + String RESPONSE_RESOURCE_ID = "resourceId"; + String RESPONSE_CHANGES = "changes"; + String RESPONSE_STATUS = "status"; + String RESPONSE_ERROR = "errors"; + String RESPONSE_ERROR_MESSAGE_CODE = "userMessageGlobalisationCode"; } diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntry.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntry.java index 6d7cd7d15..6ff1e5b97 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntry.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntry.java @@ -24,7 +24,7 @@ public class JournalEntry { CREDIT("CREDIT"), DEBIT("DEBIT"); - private TransactionType(final String type) { + TransactionType(final String type) { this.type = type; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobRunnerReadService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobRunnerReadService.java index 297677ea9..998878ef3 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobRunnerReadService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobRunnerReadService.java @@ -26,12 +26,12 @@ import org.apache.fineract.infrastructure.jobs.data.JobDetailHistoryData; public interface SchedulerJobRunnerReadService { - public List findAllJobDeatils(); + List findAllJobDeatils(); - public JobDetailData retrieveOne(Long jobId); + JobDetailData retrieveOne(Long jobId); - public Page retrieveJobHistory(Long jobId, SearchParameters searchParameters); + Page retrieveJobHistory(Long jobId, SearchParameters searchParameters); - public boolean isUpdatesAllowed(); + boolean isUpdatesAllowed(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobPreviousRunStatus.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobPreviousRunStatus.java index d23f646c5..f72914cbc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobPreviousRunStatus.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobPreviousRunStatus.java @@ -29,7 +29,7 @@ public enum ReportMailingJobPreviousRunStatus { private final String value; private final Integer id; - private ReportMailingJobPreviousRunStatus(final Integer id, final String code, final String value) { + ReportMailingJobPreviousRunStatus(final Integer id, final String code, final String value) { this.value = value; this.code = code; this.id = id; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobStretchyReportParamDateOption.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobStretchyReportParamDateOption.java index 1894e1763..7546a9bdf 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobStretchyReportParamDateOption.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobStretchyReportParamDateOption.java @@ -39,7 +39,7 @@ public enum ReportMailingJobStretchyReportParamDateOption { * @param code * @param value */ - private ReportMailingJobStretchyReportParamDateOption(final Integer id, final String code, final String value) { + ReportMailingJobStretchyReportParamDateOption(final Integer id, final String code, final String value) { this.value = value; this.code = code; this.id = id; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobEmailAttachmentFileFormat.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobEmailAttachmentFileFormat.java index ae727ed54..93d8467f4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobEmailAttachmentFileFormat.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobEmailAttachmentFileFormat.java @@ -28,7 +28,7 @@ public enum ReportMailingJobEmailAttachmentFileFormat { private final String value; private final Integer id; - private ReportMailingJobEmailAttachmentFileFormat(final Integer id, final String code, final String value) { + ReportMailingJobEmailAttachmentFileFormat(final Integer id, final String code, final String value) { this.value = value; this.code = code; this.id = id; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepository.java index 42aabb8d1..a07cb88e2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepository.java @@ -29,5 +29,5 @@ public interface ReportMailingJobRepository extends JpaRepository findByIsActiveTrueAndIsDeletedFalse(); + Collection findByIsActiveTrueAndIsDeletedFalse(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobConfigurationReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobConfigurationReadPlatformService.java index 2bbe94c83..5215d7570 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobConfigurationReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobConfigurationReadPlatformService.java @@ -35,5 +35,5 @@ public interface ReportMailingJobConfigurationReadPlatformService { * * @return ReportMailingJobConfigurationData object **/ - ReportMailingJobConfigurationData retrieveReportMailingJobConfiguration(final String name); + ReportMailingJobConfigurationData retrieveReportMailingJobConfiguration(String name); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailService.java index 749baa46b..d4531bd12 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailService.java @@ -28,5 +28,5 @@ public interface ReportMailingJobEmailService { * @param reportMailingJobEmailData * {@link ReportMailingJobEmailData} object */ - void sendEmailWithAttachment(final ReportMailingJobEmailData reportMailingJobEmailData); + void sendEmailWithAttachment(ReportMailingJobEmailData reportMailingJobEmailData); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsReadPlatformService.java index 103d62fde..ab1241933 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsReadPlatformService.java @@ -31,7 +31,7 @@ public interface SmsReadPlatformService { SmsData retrieveOne(Long resourceId); - Collection retrieveAllPending(final Long campaignId, final Integer limit); + Collection retrieveAllPending(Long campaignId, Integer limit); Collection retrieveAllSent(Integer limit); @@ -39,7 +39,7 @@ public interface SmsReadPlatformService { Collection retrieveAllFailed(Integer limit); - Page retrieveSmsByStatus(final Long campaignId, SearchParameters searchParameters, Integer status, Date dateFrom, Date dateTo); + Page retrieveSmsByStatus(Long campaignId, SearchParameters searchParameters, Integer status, Date dateFrom, Date dateTo); List retrieveExternalIdsOfAllSent(Integer limit); diff --git a/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicDomainService.java b/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicDomainService.java index 4baf23eed..1379b8e34 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicDomainService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicDomainService.java @@ -25,20 +25,20 @@ import org.apache.fineract.useradministration.domain.Role; public interface TopicDomainService { - public void createTopic(Office newOffice); + void createTopic(Office newOffice); - public void createTopic(Role newRole); + void createTopic(Role newRole); - public void updateTopic(Office updatedOffice, Map changes); + void updateTopic(Office updatedOffice, Map changes); - public void updateTopic(String previousRolename, Role updatedRole, Map changes); + void updateTopic(String previousRolename, Role updatedRole, Map changes); - public void deleteTopic(Role role); + void deleteTopic(Role role); - public void subscribeUserToTopic(AppUser newUser); + void subscribeUserToTopic(AppUser newUser); - public void updateUserSubscription(AppUser userToUpdate, Map changes); + void updateUserSubscription(AppUser userToUpdate, Map changes); - public void unsubcribeUserFromTopic(AppUser user); + void unsubcribeUserFromTopic(AppUser user); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformService.java index 1c179d10b..911ec146f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformService.java @@ -26,9 +26,9 @@ import org.apache.fineract.organisation.holiday.data.HolidayData; public interface HolidayReadPlatformService { - Collection retrieveAllHolidaysBySearchParamerters(final Long officeId, Date fromDate, Date toDate); + Collection retrieveAllHolidaysBySearchParamerters(Long officeId, Date fromDate, Date toDate); - HolidayData retrieveHoliday(final Long holidayId); + HolidayData retrieveHoliday(Long holidayId); List retrieveRepaymentScheduleUpdationTyeOptions(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformServiceImpl.java index f6a1ec4c1..05213deeb 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformServiceImpl.java @@ -56,7 +56,7 @@ public class HolidayReadPlatformServiceImpl implements HolidayReadPlatformServic private final String schema; - public HolidayMapper() { + HolidayMapper() { final StringBuilder sqlBuilder = new StringBuilder(200); sqlBuilder.append("h.id as id, h.name as name, h.description as description, h.from_date as fromDate, h.to_date as toDate, "); sqlBuilder.append( diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/constants/ProvisioningCriteriaConstants.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/constants/ProvisioningCriteriaConstants.java index f758ebabd..d9ebd5496 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/constants/ProvisioningCriteriaConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/constants/ProvisioningCriteriaConstants.java @@ -20,26 +20,26 @@ package org.apache.fineract.organisation.provisioning.constants; public interface ProvisioningCriteriaConstants { - public static final String JSON_LOCALE_PARAM = "locale"; - public static final String JSON_CRITERIAID_PARAM = "criteriaId"; - public static final String JSON_CRITERIANAME_PARAM = "criteriaName"; - public static final String JSON_LOANPRODUCTS_PARAM = "loanProducts"; - public static final String JSON_LOAN_PRODUCT_ID_PARAM = "id"; - public static final String JSON_LOAN_PRODUCTNAME_PARAM = "name"; - public static final String JSON_LOAN_PRODUCT_BORROWERCYCLE_PARAM = "includeInBorrowerCycle"; - public static final String JSON_PROVISIONING_DEFINITIONS_PARAM = "definitions"; - public static final String JSON_CATEOGRYID_PARAM = "categoryId"; - public static final String JSON_CATEOGRYNAME_PARAM = "categoryName"; - public static final String JSON_MINIMUM_AGE_PARAM = "minAge"; - public static final String JSON_MAXIMUM_AGE_PARAM = "maxAge"; - public static final String JSON_PROVISIONING_PERCENTAGE_PARAM = "provisioningPercentage"; - public static final String JSON_LIABILITY_ACCOUNT_PARAM = "liabilityAccount"; - public static final String JSON_EXPENSE_ACCOUNT_PARAM = "expenseAccount"; - public static final String DEFINITIONS_PARAM = "definitions"; - public static final String LOANPRODUCTS_PARAM = "loanProducts"; - public static final String GLACCOUNTS_PARAM = "glAccounts"; - public static final String CRITERIA_PARAM = "criteriaName"; - public static final String CRITERIA_ID_PARAM = "criteriaId"; - public static final String CRITERIA_NAME_PARAM = "criterianame"; - public static final String CREATED_BY_PARAM = "createdby"; + String JSON_LOCALE_PARAM = "locale"; + String JSON_CRITERIAID_PARAM = "criteriaId"; + String JSON_CRITERIANAME_PARAM = "criteriaName"; + String JSON_LOANPRODUCTS_PARAM = "loanProducts"; + String JSON_LOAN_PRODUCT_ID_PARAM = "id"; + String JSON_LOAN_PRODUCTNAME_PARAM = "name"; + String JSON_LOAN_PRODUCT_BORROWERCYCLE_PARAM = "includeInBorrowerCycle"; + String JSON_PROVISIONING_DEFINITIONS_PARAM = "definitions"; + String JSON_CATEOGRYID_PARAM = "categoryId"; + String JSON_CATEOGRYNAME_PARAM = "categoryName"; + String JSON_MINIMUM_AGE_PARAM = "minAge"; + String JSON_MAXIMUM_AGE_PARAM = "maxAge"; + String JSON_PROVISIONING_PERCENTAGE_PARAM = "provisioningPercentage"; + String JSON_LIABILITY_ACCOUNT_PARAM = "liabilityAccount"; + String JSON_EXPENSE_ACCOUNT_PARAM = "expenseAccount"; + String DEFINITIONS_PARAM = "definitions"; + String LOANPRODUCTS_PARAM = "loanProducts"; + String GLACCOUNTS_PARAM = "glAccounts"; + String CRITERIA_PARAM = "criteriaName"; + String CRITERIA_ID_PARAM = "criteriaId"; + String CRITERIA_NAME_PARAM = "criterianame"; + String CREATED_BY_PARAM = "createdby"; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaReadPlatformService.java index 457940bf0..eebf63bc3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaReadPlatformService.java @@ -23,11 +23,11 @@ import org.apache.fineract.organisation.provisioning.data.ProvisioningCriteriaDa public interface ProvisioningCriteriaReadPlatformService { - public ProvisioningCriteriaData retrievePrivisiongCriteriaTemplate(); + ProvisioningCriteriaData retrievePrivisiongCriteriaTemplate(); - public ProvisioningCriteriaData retrieveProvisioningCriteria(Long criteriaId); + ProvisioningCriteriaData retrieveProvisioningCriteria(Long criteriaId); - public Collection retrieveAllProvisioningCriterias(); + Collection retrieveAllProvisioningCriterias(); - public ProvisioningCriteriaData retrievePrivisiongCriteriaTemplate(ProvisioningCriteriaData data); + ProvisioningCriteriaData retrievePrivisiongCriteriaTemplate(ProvisioningCriteriaData data); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java index 7eb3457a0..d76165ff0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java @@ -134,7 +134,7 @@ public class StaffReadPlatformServiceImpl implements StaffReadPlatformService { private final String schemaSql; - public StaffLookupMapper() { + StaffLookupMapper() { final StringBuilder sqlBuilder = new StringBuilder(100); sqlBuilder.append("s.id as id, s.display_name as displayName "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformService.java index a88dadcb1..3ecdeb752 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformService.java @@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; public interface StaffWritePlatformService { - CommandProcessingResult createStaff(final JsonCommand command); + CommandProcessingResult createStaff(JsonCommand command); - CommandProcessingResult updateStaff(final Long staffId, final JsonCommand command); + CommandProcessingResult updateStaff(Long staffId, JsonCommand command); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformService.java index 6effccd7c..4f7741a5b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformService.java @@ -31,40 +31,40 @@ import org.apache.fineract.organisation.teller.data.TellerTransactionData; public interface TellerManagementReadPlatformService { - public Collection getTellers(Long officeId); + Collection getTellers(Long officeId); - public TellerData findTeller(Long tellerId); + TellerData findTeller(Long tellerId); - public CashierData findCashier(Long cashierId); + CashierData findCashier(Long cashierId); - public Collection getCashierData(Long officeId, Long tellerId, Long staffId, Date date); + Collection getCashierData(Long officeId, Long tellerId, Long staffId, Date date); - public Collection getTellerCashiers(Long tellerId, Date date); + Collection getTellerCashiers(Long tellerId, Date date); - public CashierData retrieveCashierTemplate(Long officeId, Long tellerId, boolean staffInSelectedOfficeOnly); + CashierData retrieveCashierTemplate(Long officeId, Long tellerId, boolean staffInSelectedOfficeOnly); - public CashierTransactionData retrieveCashierTxnTemplate(Long cashierId); + CashierTransactionData retrieveCashierTxnTemplate(Long cashierId); - public TellerTransactionData findTellerTransaction(Long transactionId); + TellerTransactionData findTellerTransaction(Long transactionId); - public Collection fetchTellerTransactionsByTellerId(Long tellerId, Date fromDate, Date toDate); + Collection fetchTellerTransactionsByTellerId(Long tellerId, Date fromDate, Date toDate); - public Collection getJournals(Long officeId, Long tellerId, Long cashierId, Date dateFrom, Date dateTo); + Collection getJournals(Long officeId, Long tellerId, Long cashierId, Date dateFrom, Date dateTo); - public Collection fetchTellerJournals(Long tellerId, Long cashierId, Date fromDate, Date toDate); + Collection fetchTellerJournals(Long tellerId, Long cashierId, Date fromDate, Date toDate); - public Collection retrieveAllTellersForDropdown(Long officeId); + Collection retrieveAllTellersForDropdown(Long officeId); - public Collection retrieveAllTellers(String sqlSearch, Long officeId, String status); + Collection retrieveAllTellers(String sqlSearch, Long officeId, String status); - public Collection getCashiersForTeller(Long tellerId, Date fromDate, Date toDate); + Collection getCashiersForTeller(Long tellerId, Date fromDate, Date toDate); - public Collection retrieveCashiersForTellers(String sqlSearch, Long tellerId); + Collection retrieveCashiersForTellers(String sqlSearch, Long tellerId); - public Page retrieveCashierTransactions(Long cashierId, boolean includeAllTellers, Date fromDate, Date toDate, + Page retrieveCashierTransactions(Long cashierId, boolean includeAllTellers, Date fromDate, Date toDate, String currencyCode, final SearchParameters searchParameters); - public CashierTransactionsWithSummaryData retrieveCashierTransactionsWithSummary(Long cashierId, boolean includeAllTellers, - Date fromDate, Date toDate, String currencyCode, final SearchParameters searchParameters); + CashierTransactionsWithSummaryData retrieveCashierTransactionsWithSummary(Long cashierId, boolean includeAllTellers, Date fromDate, + Date toDate, String currencyCode, final SearchParameters searchParameters); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java index e78db736e..47d48c263 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java @@ -170,7 +170,7 @@ public class TellerManagementReadPlatformServiceImpl implements TellerManagement private final String schemaSql; - public TellerLookupMapper() { + TellerLookupMapper() { final StringBuilder sqlBuilder = new StringBuilder(100); sqlBuilder.append("t.id as id, t.name as teller_name "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformService.java index 943b4c511..ba1e8c589 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformService.java @@ -39,7 +39,7 @@ public interface TellerWritePlatformService { * @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException * @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException */ - public CommandProcessingResult createTeller(JsonCommand command); + CommandProcessingResult createTeller(JsonCommand command); /** * Modifies a new teller. @@ -53,7 +53,7 @@ public interface TellerWritePlatformService { * @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException * @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException */ - public CommandProcessingResult modifyTeller(Long tellerId, JsonCommand command); + CommandProcessingResult modifyTeller(Long tellerId, JsonCommand command); /** * deletes a new teller. @@ -64,7 +64,7 @@ public interface TellerWritePlatformService { * @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException * @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException */ - public CommandProcessingResult deleteTeller(Long tellerId); + CommandProcessingResult deleteTeller(Long tellerId); /** * Allocates a cashier to an existing teller. The allocation can be for a duration from a date to a date from a @@ -76,11 +76,11 @@ public interface TellerWritePlatformService { * @throws org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException * @throws org.apache.fineract.infrastructure.core.exception.InvalidJsonException */ - public CommandProcessingResult allocateCashierToTeller(Long tellerId, JsonCommand command); + CommandProcessingResult allocateCashierToTeller(Long tellerId, JsonCommand command); CommandProcessingResult updateCashierAllocation(Long tellerId, Long cashierId, JsonCommand command); - CommandProcessingResult deleteCashierAllocation(final Long tellerId, Long cashierId, JsonCommand command); + CommandProcessingResult deleteCashierAllocation(Long tellerId, Long cashierId, JsonCommand command); CommandProcessingResult allocateCashToCashier(Long cashierId, JsonCommand command); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/AccountTransferRecurrenceType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/AccountTransferRecurrenceType.java index ad3154429..f157ef076 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/AccountTransferRecurrenceType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/AccountTransferRecurrenceType.java @@ -44,7 +44,7 @@ public enum AccountTransferRecurrenceType { return enumeration; } - private AccountTransferRecurrenceType(final Integer value, final String code) { + AccountTransferRecurrenceType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformService.java index 2ae6edab5..b80d08702 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformService.java @@ -24,13 +24,13 @@ import org.apache.fineract.portfolio.account.data.PortfolioAccountData; public interface AccountAssociationsReadPlatformService { - public PortfolioAccountData retriveLoanLinkedAssociation(final Long loanId); + PortfolioAccountData retriveLoanLinkedAssociation(Long loanId); - public boolean isLinkedWithAnyActiveAccount(final Long savingsId); + boolean isLinkedWithAnyActiveAccount(Long savingsId); - public PortfolioAccountData retriveSavingsLinkedAssociation(final Long savingsId); + PortfolioAccountData retriveSavingsLinkedAssociation(Long savingsId); - public Collection retriveLoanAssociations(Long loanId, Integer associationType); + Collection retriveLoanAssociations(Long loanId, Integer associationType); PortfolioAccountData retriveSavingsAccount(Long savingsId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java index dc64d4ce4..2cd078b49 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java @@ -165,7 +165,7 @@ public class StandingInstructionHistoryReadPlatformServiceImpl implements Standi private final String schemaSql; - public StandingInstructionHistoryMapper() { + StandingInstructionHistoryMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append("atsi.id as id,atsi.name as name, "); sqlBuilder.append("atsih.status as status, atsih.execution_time as executionTime, "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java index 5daea9531..9f02adde1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java @@ -517,7 +517,7 @@ public class StandingInstructionReadPlatformServiceImpl implements StandingInstr private final String schemaSql; - public StandingInstructionLoanDuesMapper() { + StandingInstructionLoanDuesMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append("max(ls.duedate) as dueDate,sum(ls.principal_amount) as principalAmount,"); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/domain/AccountType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/domain/AccountType.java index 387a53e44..10da640e3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/domain/AccountType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/domain/AccountType.java @@ -32,7 +32,7 @@ public enum AccountType { private final Integer value; private final String code; - private AccountType(final Integer value, final String code) { + AccountType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformService.java index 5cdb0c33e..adb530bb9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformService.java @@ -25,19 +25,19 @@ import org.apache.fineract.portfolio.accountdetails.data.LoanAccountSummaryData; public interface AccountDetailsReadPlatformService { - public AccountSummaryCollectionData retrieveClientAccountDetails(final Long clientId); + AccountSummaryCollectionData retrieveClientAccountDetails(Long clientId); - public AccountSummaryCollectionData retrieveGroupAccountDetails(final Long groupId); + AccountSummaryCollectionData retrieveGroupAccountDetails(Long groupId); - public Collection retrieveClientLoanAccountsByLoanOfficerId(final Long clientId, final Long loanOfficerId); + Collection retrieveClientLoanAccountsByLoanOfficerId(Long clientId, Long loanOfficerId); - public Collection retrieveGroupLoanAccountsByLoanOfficerId(final Long groupId, final Long loanOfficerId); + Collection retrieveGroupLoanAccountsByLoanOfficerId(Long groupId, Long loanOfficerId); - public Collection retrieveClientActiveLoanAccountSummary(final Long clientId); + Collection retrieveClientActiveLoanAccountSummary(Long clientId); - public List retrieveLoanAccountDetailsByGroupIdAndGlimAccountNumber(Long groupId, final String glimAccount); + List retrieveLoanAccountDetailsByGroupIdAndGlimAccountNumber(Long groupId, String glimAccount); - public Collection retrieveGroupActiveLoanAccountSummary(final Long groupId); + Collection retrieveGroupActiveLoanAccountSummary(Long groupId); AccountSummaryCollectionData retrieveGroupAccountDetails(Long groupId, Long gsimId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/constants/AccountsApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/constants/AccountsApiConstants.java index 1f3260e8c..e4b06d2e7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/constants/AccountsApiConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/constants/AccountsApiConstants.java @@ -20,7 +20,7 @@ package org.apache.fineract.portfolio.accounts.constants; public interface AccountsApiConstants { - public final String READPLATFORM_NAME = "AccountReadPlatformService"; + String READPLATFORM_NAME = "AccountReadPlatformService"; - public final String ACCOUNT_COMMANDSERVICE = "ACCOUNT_COMMANDSERVICE"; + String ACCOUNT_COMMANDSERVICE = "ACCOUNT_COMMANDSERVICE"; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/service/AccountReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/service/AccountReadPlatformService.java index 4c3090a08..4ee29f1bd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/service/AccountReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/service/AccountReadPlatformService.java @@ -24,12 +24,12 @@ import org.apache.fineract.portfolio.accounts.data.AccountData; public interface AccountReadPlatformService { - public AccountData retrieveTemplate(final Long clientId, final Long productId); + AccountData retrieveTemplate(Long clientId, Long productId); - public AccountData retrieveOne(Long id, boolean includeTemplate); + AccountData retrieveOne(Long id, boolean includeTemplate); - public Page retrieveAll(final Integer offSet, final Integer limit); + Page retrieveAll(Integer offSet, Integer limit); - public Set getResponseDataParams(); + Set getResponseDataParams(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/service/AccountsCommandsService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/service/AccountsCommandsService.java index ff3595966..097a8528b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/service/AccountsCommandsService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/service/AccountsCommandsService.java @@ -20,5 +20,5 @@ package org.apache.fineract.portfolio.accounts.service; public interface AccountsCommandsService { - public Object handleCommand(final Long accountId, final String command, final String jsonBody); + public Object handleCommand(Long accountId, String command, String jsonBody); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressReadPlatformService.java index 82168f43d..cc9b22d38 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressReadPlatformService.java @@ -23,11 +23,11 @@ import org.apache.fineract.portfolio.address.data.AddressData; public interface AddressReadPlatformService { - public Collection retrieveAddressFields(long clientid); + Collection retrieveAddressFields(long clientid); - public Collection retrieveAllClientAddress(long clientid); + Collection retrieveAllClientAddress(long clientid); - public Collection retrieveAddressbyType(long clientid, long typeid); + Collection retrieveAddressbyType(long clientid, long typeid); Collection retrieveAddressbyTypeAndStatus(long clientid, long typeid, String status); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java index 05e3eedc8..f8b6c3ecb 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java @@ -31,7 +31,7 @@ public enum CalendarFrequencyType { private final Integer value; private final String code; - private CalendarFrequencyType(final Integer value, final String code) { + CalendarFrequencyType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarWeekDaysType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarWeekDaysType.java index d299e5511..1b1b7051e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarWeekDaysType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarWeekDaysType.java @@ -31,7 +31,7 @@ public enum CalendarWeekDaysType { private final Integer value; private final String code; - private CalendarWeekDaysType(final Integer value, final String code) { + CalendarWeekDaysType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformService.java index d84e4a897..637ee9ea5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformService.java @@ -26,29 +26,28 @@ import org.joda.time.LocalDate; public interface CalendarReadPlatformService { - CalendarData retrieveCalendar(final Long calendarId, Long entityId, Integer entityTypeId); + CalendarData retrieveCalendar(Long calendarId, Long entityId, Integer entityTypeId); - Collection retrieveCalendarsByEntity(final Long entityId, final Integer entityTypeId, List calendarTypeOptions); + Collection retrieveCalendarsByEntity(Long entityId, Integer entityTypeId, List calendarTypeOptions); - Collection retrieveParentCalendarsByEntity(final Long entityId, final Integer entityTypeId, - List calendarTypeOptions); + Collection retrieveParentCalendarsByEntity(Long entityId, Integer entityTypeId, List calendarTypeOptions); Collection retrieveAllCalendars(); CalendarData retrieveNewCalendarDetails(); - Collection generateRecurringDates(final CalendarData calendarData, final boolean withHistory, final LocalDate tillDate); + Collection generateRecurringDates(CalendarData calendarData, boolean withHistory, LocalDate tillDate); - Collection generateNextTenRecurringDates(final CalendarData calendarData); + Collection generateNextTenRecurringDates(CalendarData calendarData); - Collection updateWithRecurringDates(final Collection calendarsData); + Collection updateWithRecurringDates(Collection calendarsData); - CalendarData retrieveLoanCalendar(final Long loanId); + CalendarData retrieveLoanCalendar(Long loanId); - CalendarData retrieveCollctionCalendarByEntity(final Long entityId, final Integer entityTypeId); + CalendarData retrieveCollctionCalendarByEntity(Long entityId, Integer entityTypeId); LocalDate generateNextEligibleMeetingDateForCollection(CalendarData calendarData, MeetingData lastMeetingData); - Boolean isCalendarAssociatedWithEntity(final Long entityId, final Long calendarId, Long entityTypeId); + Boolean isCalendarAssociatedWithEntity(Long entityId, Long calendarId, Long entityTypeId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java index 972e5fcec..6c29f1e22 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java @@ -382,7 +382,7 @@ public class CalendarUtils { return (recurDate == null || recurDate.isEmpty()) ? false : recurDate.contains(date); } - public static enum DayNameEnum { + public enum DayNameEnum { MO(1, "Monday"), TU(2, "Tuesday"), WE(3, "Wednesday"), TH(4, "Thursday"), FR(5, "Friday"), SA(6, "Saturday"), SU(7, "Sunday"); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeAppliesTo.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeAppliesTo.java index cb97dae64..64ea23932 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeAppliesTo.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeAppliesTo.java @@ -28,7 +28,7 @@ public enum ChargeAppliesTo { private final Integer value; private final String code; - private ChargeAppliesTo(final Integer value, final String code) { + ChargeAppliesTo(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeCalculationType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeCalculationType.java index 554145adb..c9d236728 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeCalculationType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeCalculationType.java @@ -30,7 +30,7 @@ public enum ChargeCalculationType { private final Integer value; private final String code; - private ChargeCalculationType(final Integer value, final String code) { + ChargeCalculationType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeTimeType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeTimeType.java index fdcf3e0cd..6b932b3ff 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeTimeType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeTimeType.java @@ -42,7 +42,7 @@ public enum ChargeTimeType { private final Integer value; private final String code; - private ChargeTimeType(final Integer value, final String code) { + ChargeTimeType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeDeletedException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeDeletedException.java index 4bba0bd1c..559d8587b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeDeletedException.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeDeletedException.java @@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR public class LoanChargeCannotBeDeletedException extends AbstractPlatformDomainRuleException { /*** enum of reasons of why Loan Charge cannot be waived **/ - public static enum LoanChargeCannotBeDeletedReason { + public enum LoanChargeCannotBeDeletedReason { ALREADY_PAID, ALREADY_WAIVED, LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeWaivedException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeWaivedException.java index 2bf917876..b8b7a61af 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeWaivedException.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeWaivedException.java @@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR public class LoanChargeCannotBeWaivedException extends AbstractPlatformDomainRuleException { /*** enum of reasons of why Loan Charge cannot be waived **/ - public static enum LoanChargeCannotBeWaivedReason { + public enum LoanChargeCannotBeWaivedReason { ALREADY_PAID, ALREADY_WAIVED, LOAN_INACTIVE, WAIVE_NOT_ALLOWED_FOR_CHARGE; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeCannotBeWaivedException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeCannotBeWaivedException.java index f9cd9db0e..4c585e1e0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeCannotBeWaivedException.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeCannotBeWaivedException.java @@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR public class SavingsAccountChargeCannotBeWaivedException extends AbstractPlatformDomainRuleException { /*** enum of reasons of why Savings Account Charge cannot be waived **/ - public static enum SavingsAccountChargeCannotBeWaivedReason { + public enum SavingsAccountChargeCannotBeWaivedReason { ALREADY_PAID, ALREADY_WAIVED, SAVINGS_ACCOUNT_NOT_ACTIVE, SAVINGS_ACCOUNT_CLOSED; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientAddressRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientAddressRepository.java index 1efc1e9ad..5292bd2a9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientAddressRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientAddressRepository.java @@ -27,9 +27,9 @@ import org.springframework.data.repository.query.Param; public interface ClientAddressRepository extends JpaRepository, JpaSpecificationExecutor { @Query("SELECT clientAddress FROM ClientAddress clientAddress WHERE clientAddress.client.id = :clientId AND clientAddress.addressType = :addressType AND clientAddress.isActive = :isActive ") - ClientAddress findByClientIdAndAddressTypeAndIsActive(@Param("clientId") final long clientId, - @Param("addressType") final CodeValue addressType, @Param("isActive") final boolean isActive); + ClientAddress findByClientIdAndAddressTypeAndIsActive(@Param("clientId") long clientId, @Param("addressType") CodeValue addressType, + @Param("isActive") boolean isActive); @Query("SELECT clientAddress FROM ClientAddress clientAddress WHERE clientAddress.client.id = :clientId AND clientAddress.address.id = :addressId ") - ClientAddress findByClientIdAndAddressId(@Param("clientId") final long clientId, @Param("addressId") final long addressId); + ClientAddress findByClientIdAndAddressId(@Param("clientId") long clientId, @Param("addressId") long addressId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientIdentifierStatus.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientIdentifierStatus.java index 58ae75b5b..8bb020e10 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientIdentifierStatus.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientIdentifierStatus.java @@ -44,7 +44,7 @@ public enum ClientIdentifierStatus { return enumeration; } - private ClientIdentifierStatus(final Integer value, final String code) { + ClientIdentifierStatus(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java index 4e283363c..27f877802 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java @@ -25,7 +25,7 @@ import org.springframework.data.repository.query.Param; abstract interface ClientRepository extends JpaRepository, JpaSpecificationExecutor { - public static final String FIND_CLIENT_BY_ACCOUNT_NUMBER = "select client from Client client where client.accountNumber = :accountNumber"; + String FIND_CLIENT_BY_ACCOUNT_NUMBER = "select client from Client client where client.accountNumber = :accountNumber"; @Query(FIND_CLIENT_BY_ACCOUNT_NUMBER) Client getClientByAccountNumber(@Param("accountNumber") String accountNumber); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformService.java index f3ca7af40..9b7dd7edb 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformService.java @@ -25,9 +25,9 @@ import org.apache.fineract.portfolio.client.domain.Client; public interface ClientFamilyMembersWritePlatformService { - CommandProcessingResult addFamilyMember(final long clientId, final JsonCommand command); + CommandProcessingResult addFamilyMember(long clientId, JsonCommand command); - CommandProcessingResult addClientFamilyMember(final Client client, final JsonCommand command); + CommandProcessingResult addClientFamilyMember(Client client, JsonCommand command); CommandProcessingResult updateFamilyMember(Long familyMemberId, JsonCommand command); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java index 2d877cf0f..9bf6ccf65 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java @@ -356,7 +356,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService private final String schema; - public ClientMembersOfGroupMapper() { + ClientMembersOfGroupMapper() { final StringBuilder sqlBuilder = new StringBuilder(200); sqlBuilder.append( @@ -545,7 +545,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService private final String schema; - public ClientMapper() { + ClientMapper() { final StringBuilder builder = new StringBuilder(400); builder.append( diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformService.java index 8ccfb3af7..960f97b9c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformService.java @@ -27,12 +27,12 @@ import org.springframework.transaction.annotation.Transactional; public interface ClientTransactionReadPlatformService { @Transactional(readOnly = true) - public Page retrieveAllTransactions(Long clientId, SearchParameters parameters); + Page retrieveAllTransactions(Long clientId, SearchParameters parameters); @Transactional(readOnly = true) - public Collection retrieveAllTransactions(final Long clientId, final Long chargeId); + Collection retrieveAllTransactions(Long clientId, Long chargeId); @Transactional(readOnly = true) - public ClientTransactionData retrieveTransaction(Long clientId, Long transactionId); + ClientTransactionData retrieveTransaction(Long clientId, Long transactionId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformServiceImpl.java index 1d5e7b25a..a377f691a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformServiceImpl.java @@ -60,7 +60,7 @@ public class ClientTransactionReadPlatformServiceImpl implements ClientTransacti private final String schemaSql; - public ClientTransactionMapper() { + ClientTransactionMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append("tr.id as transactionId, tr.transaction_type_enum as transactionType, "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformService.java index c839d8acb..fb233489e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformService.java @@ -33,7 +33,7 @@ public interface ClientWritePlatformService { CommandProcessingResult unassignClientStaff(Long clientId, JsonCommand command); - CommandProcessingResult closeClient(final Long clientId, final JsonCommand command); + CommandProcessingResult closeClient(Long clientId, JsonCommand command); CommandProcessingResult assignClientStaff(Long clientId, JsonCommand command); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java index 524bf5964..0af11c820 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java @@ -28,7 +28,7 @@ public class CollateralApiConstants { /*** * Enum of all parameters passed in while creating/updating a collateral ***/ - public static enum CollateralJSONinputParams { + public enum CollateralJSONinputParams { LOAN_ID("loanId"), COLLATERAL_ID("collateralId"), COLLATERAL_TYPE_ID("collateralTypeId"), VALUE("value"), DESCRIPTION( "description"); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeCreatedException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeCreatedException.java index 33847e318..9dc1d0a35 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeCreatedException.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeCreatedException.java @@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR public class CollateralCannotBeCreatedException extends AbstractPlatformDomainRuleException { /*** enum of reasons of why Loan Charge cannot be waived **/ - public static enum LoanCollateralCannotBeCreatedReason { + public enum LoanCollateralCannotBeCreatedReason { LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeDeletedException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeDeletedException.java index 7294d54b7..de57162b2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeDeletedException.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeDeletedException.java @@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR public class CollateralCannotBeDeletedException extends AbstractPlatformDomainRuleException { /*** enum of reasons of why Loan Charge cannot be waived **/ - public static enum LoanCollateralCannotBeDeletedReason { + public enum LoanCollateralCannotBeDeletedReason { LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeUpdatedException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeUpdatedException.java index 703f7d2d0..58b789e9d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeUpdatedException.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/exception/CollateralCannotBeUpdatedException.java @@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR public class CollateralCannotBeUpdatedException extends AbstractPlatformDomainRuleException { /*** enum of reasons of why Loan Charge cannot be waived **/ - public static enum LoanCollateralCannotBeUpdatedReason { + public enum LoanCollateralCannotBeUpdatedReason { LOAN_NOT_IN_SUBMITTED_AND_PENDING_APPROVAL_STAGE; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformService.java index 6d5e75a7f..f5e85c696 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformService.java @@ -24,10 +24,10 @@ import org.apache.fineract.portfolio.collectionsheet.data.JLGCollectionSheetData public interface CollectionSheetReadPlatformService { - JLGCollectionSheetData generateGroupCollectionSheet(final Long groupId, final JsonQuery query); + JLGCollectionSheetData generateGroupCollectionSheet(Long groupId, JsonQuery query); - JLGCollectionSheetData generateCenterCollectionSheet(final Long groupId, final JsonQuery query); + JLGCollectionSheetData generateCenterCollectionSheet(Long groupId, JsonQuery query); - IndividualCollectionSheetData generateIndividualCollectionSheet(final JsonQuery query); + IndividualCollectionSheetData generateIndividualCollectionSheet(JsonQuery query); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java index 9bae3caef..e131927e4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java @@ -712,7 +712,7 @@ public class CollectionSheetReadPlatformServiceImpl implements CollectionSheetRe private final String sql; - public IndividualCollectionSheetFaltDataMapper(final boolean checkForOfficeId, final boolean checkforStaffId) { + IndividualCollectionSheetFaltDataMapper(final boolean checkForOfficeId, final boolean checkforStaffId) { StringBuilder sb = new StringBuilder(); sb.append("SELECT loandata.*, sum(lc.amount_outstanding_derived) as chargesDue "); sb.append("from (SELECT cl.display_name As clientName, "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/BusinessEventNotificationConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/BusinessEventNotificationConstants.java index 225eba44e..76fb6e207 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/BusinessEventNotificationConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/BusinessEventNotificationConstants.java @@ -23,7 +23,7 @@ import java.util.Set; public class BusinessEventNotificationConstants { - public static enum BusinessEvents { + public enum BusinessEvents { LOAN_APPROVED("loan_approved"), LOAN_REJECTED("loan_reject"), LOAN_UNDO_APPROVAL("loan_undo_approval"), LOAN_UNDO_DISBURSAL( "loan_undo_disbursal"), LOAN_UNDO_LASTDISBURSAL("loan_undo_lastdisbursal"), LOAN_UNDO_TRANSACTION( @@ -89,7 +89,7 @@ public class BusinessEventNotificationConstants { } } - public static enum BusinessEntity { + public enum BusinessEntity { LOAN("loan"), LOAN_TRANSACTION("loan_transaction"), LOAN_CHARGE("loan_charge"), LOAN_ADJUSTED_TRANSACTION( "loan_adjusted_transaction"), SAVING("saving"), CLIENT("client"), SAVINGS_TRANSACTION("Savings Transaction"), GROUP( @@ -98,7 +98,7 @@ public class BusinessEventNotificationConstants { private final String value; - private BusinessEntity(final String value) { + BusinessEntity(final String value) { this.value = value; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/DayOfWeekType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/DayOfWeekType.java index 975a80eb8..779855360 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/DayOfWeekType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/DayOfWeekType.java @@ -30,7 +30,7 @@ public enum DayOfWeekType { private final Integer value; private final String code; - private DayOfWeekType(Integer value, String code) { + DayOfWeekType(Integer value, String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/DaysInYearType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/DaysInYearType.java index 956c54ac8..d08fff7a9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/DaysInYearType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/DaysInYearType.java @@ -42,7 +42,7 @@ public enum DaysInYearType { private final Integer value; private final String code; - private DaysInYearType(final Integer value, final String code) { + DaysInYearType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/PeriodFrequencyType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/PeriodFrequencyType.java index 58a638eb2..4a4478637 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/PeriodFrequencyType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/PeriodFrequencyType.java @@ -33,7 +33,7 @@ public enum PeriodFrequencyType { private final Integer value; private final String code; - private PeriodFrequencyType(final Integer value, final String code) { + PeriodFrequencyType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/BusinessEventListner.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/BusinessEventListner.java index d1fecb3a2..eaac274e9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/BusinessEventListner.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/BusinessEventListner.java @@ -31,11 +31,11 @@ public interface BusinessEventListner { /** * Implement this method for notifications before executing Business Event */ - public void businessEventToBeExecuted(Map businessEventEntity); + void businessEventToBeExecuted(Map businessEventEntity); /** * Implement this method for notifications after executing Business Event */ - public void businessEventWasExecuted(Map businessEventEntity); + void businessEventWasExecuted(Map businessEventEntity); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/BusinessEventNotifierService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/BusinessEventNotifierService.java index 1d267a326..e04997ff8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/BusinessEventNotifierService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/BusinessEventNotifierService.java @@ -31,21 +31,21 @@ public interface BusinessEventNotifierService { /** * Method should be called to notify listeners before Business event execution for any pre-processing of event */ - public void notifyBusinessEventToBeExecuted(BusinessEvents businessEvent, Map businessEventEntity); + void notifyBusinessEventToBeExecuted(BusinessEvents businessEvent, Map businessEventEntity); /** * Method should be called to notify listeners after Business event execution for any post-processing of event */ - public void notifyBusinessEventWasExecuted(BusinessEvents businessEvent, Map businessEventEntity); + void notifyBusinessEventWasExecuted(BusinessEvents businessEvent, Map businessEventEntity); /** * Method is to register a class as listener for pre-processing of any Business event */ - public void addBusinessEventPreListners(BusinessEvents businessEvent, BusinessEventListner businessEventListner); + void addBusinessEventPreListners(BusinessEvents businessEvent, BusinessEventListner businessEventListner); /** * Method is to register a class as listener for post-processing of any Business event */ - public void addBusinessEventPostListners(BusinessEvents businessEvent, BusinessEventListner businessEventListner); + void addBusinessEventPostListners(BusinessEvents businessEvent, BusinessEventListner businessEventListner); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformService.java index b46fb9b0f..b645549f6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformService.java @@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; public interface FloatingRateWritePlatformService { - public CommandProcessingResult createFloatingRate(JsonCommand command); + CommandProcessingResult createFloatingRate(JsonCommand command); - public CommandProcessingResult updateFloatingRate(JsonCommand command); + CommandProcessingResult updateFloatingRate(JsonCommand command); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java index 5cecb9a15..aa9d2e3a6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java @@ -110,7 +110,7 @@ public class FloatingRatesReadPlatformServiceImpl implements FloatingRatesReadPl .append("FROM m_floating_rates as rate ").append("LEFT JOIN m_appuser as crappu on rate.createdby_id = crappu.id ") .append("LEFT JOIN m_appuser as moappu on rate.lastmodifiedby_id = moappu.id "); - public FloatingRateRowMapper(final boolean addRatePeriods) { + FloatingRateRowMapper(final boolean addRatePeriods) { this.addRatePeriods = addRatePeriods; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupRepository.java index 4555f7efc..710a8dd9a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupRepository.java @@ -29,7 +29,7 @@ public interface GroupRepository extends JpaRepository, JpaSpecific Collection findByParentId(Long parentId); - public static final String RETRIEVE_SUBMITTED_ON_DATE = "select g.submittedOnDate from Group g where g.id = :groupId"; + String RETRIEVE_SUBMITTED_ON_DATE = "select g.submittedOnDate from Group g where g.id = :groupId"; @Query(RETRIEVE_SUBMITTED_ON_DATE) Date retrieveGroupTypeSubmitteOndDate(@Param("groupId") Long groupId); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java index 0a0912a16..6a5d2e1a5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java @@ -191,7 +191,7 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService private final String schemaSql; - public CenterDataMapper() { + CenterDataMapper() { this.schemaSql = SQL_QUERY; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesReadPlatformServiceImpl.java index 72e338f1c..2e45250fe 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesReadPlatformServiceImpl.java @@ -67,7 +67,7 @@ public class GroupRolesReadPlatformServiceImpl implements GroupRolesReadPlatform private static final class GroupRolesDataMapper implements RowMapper { - public final String schema() { + public String schema() { return " role.id AS id, role.client_id AS clientId, c.display_name as clientName, role.role_cv_id AS roleId, cv.code_value AS roleName" + " from m_code_value cv join m_group_roles role on role.role_cv_id = cv.id left join m_client c on c.id = role.client_id "; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformService.java index d3582fcf9..df8931f3e 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformService.java @@ -35,9 +35,9 @@ public interface GroupingTypesWritePlatformService { CommandProcessingResult deleteGroup(Long groupId); - CommandProcessingResult closeGroup(final Long groupId, final JsonCommand command); + CommandProcessingResult closeGroup(Long groupId, JsonCommand command); - CommandProcessingResult closeCenter(final Long centerId, final JsonCommand command); + CommandProcessingResult closeCenter(Long centerId, JsonCommand command); CommandProcessingResult unassignGroupOrCenterStaff(Long groupId, JsonCommand command); @@ -47,7 +47,7 @@ public interface GroupingTypesWritePlatformService { CommandProcessingResult disassociateClientsFromGroup(Long groupId, JsonCommand command); - CommandProcessingResult associateGroupsToCenter(final Long centerId, final JsonCommand command); + CommandProcessingResult associateGroupsToCenter(Long centerId, JsonCommand command); - CommandProcessingResult disassociateGroupsToCenter(final Long centerId, final JsonCommand command); + CommandProcessingResult disassociateGroupsToCenter(Long centerId, JsonCommand command); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestIncentiveApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestIncentiveApiConstants.java index a04934a88..fcd63a8e6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestIncentiveApiConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestIncentiveApiConstants.java @@ -24,19 +24,18 @@ import java.util.Set; public interface InterestIncentiveApiConstants { - public static final String idParamName = "id"; - public static final String entityTypeParamName = "entityType"; - public static final String attributeNameParamName = "attributeName"; - public static final String conditionTypeParamName = "conditionType"; - public static final String attributeValueParamName = "attributeValue"; - public static final String incentiveTypeparamName = "incentiveType"; - public static final String amountParamName = "amount"; - public static final String deleteParamName = "delete"; + String idParamName = "id"; + String entityTypeParamName = "entityType"; + String attributeNameParamName = "attributeName"; + String conditionTypeParamName = "conditionType"; + String attributeValueParamName = "attributeValue"; + String incentiveTypeparamName = "incentiveType"; + String amountParamName = "amount"; + String deleteParamName = "delete"; - public static final String INCENTIVE_RESOURCE_NAME = "interest.rate.incentives"; + String INCENTIVE_RESOURCE_NAME = "interest.rate.incentives"; - public static final Set INTERESTRATE_INCENTIVE_RESPONSE_DATA_PARAMETERS = new HashSet<>( - Arrays.asList(idParamName, entityTypeParamName, attributeNameParamName, conditionTypeParamName, attributeValueParamName, - incentiveTypeparamName, amountParamName)); + Set INTERESTRATE_INCENTIVE_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, entityTypeParamName, + attributeNameParamName, conditionTypeParamName, attributeValueParamName, incentiveTypeparamName, amountParamName)); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculation.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculation.java index 59f677f25..4738b5849 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculation.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculation.java @@ -23,7 +23,7 @@ import org.apache.fineract.portfolio.common.domain.ConditionType; public abstract class AttributeIncentiveCalculation { - public abstract BigDecimal calculateIncentive(final IncentiveDTO incentiveDTO); + public abstract BigDecimal calculateIncentive(IncentiveDTO incentiveDTO); public boolean applyIncentive(ConditionType conditionType, Long attributeValue, Long actualValue) { boolean applyIncentive = false; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveAttributeName.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveAttributeName.java index e5648363b..bfa401608 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveAttributeName.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveAttributeName.java @@ -46,7 +46,7 @@ public enum InterestIncentiveAttributeName { return type; } - private InterestIncentiveAttributeName(final Integer value, final String code) { + InterestIncentiveAttributeName(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveEntityType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveEntityType.java index 36e329729..c002ffa3b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveEntityType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveEntityType.java @@ -44,7 +44,7 @@ public enum InterestIncentiveEntityType { return type; } - private InterestIncentiveEntityType(final Integer value, final String code) { + InterestIncentiveEntityType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveType.java index 75b41757a..0464889d1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveType.java @@ -44,7 +44,7 @@ public enum InterestIncentiveType { return type; } - private InterestIncentiveType(final Integer value, final String code) { + InterestIncentiveType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanApiConstants.java index bbc359f33..d118927a2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanApiConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanApiConstants.java @@ -20,116 +20,116 @@ package org.apache.fineract.portfolio.loanaccount.api; public interface LoanApiConstants { - public static final String emiAmountParameterName = "fixedEmiAmount"; - public static final String maxOutstandingBalanceParameterName = "maxOutstandingLoanBalance"; - public static final String disbursementDataParameterName = "disbursementData"; - public static final String disbursementDateParameterName = "expectedDisbursementDate"; - public static final String disbursementPrincipalParameterName = "principal"; - public static final String updatedDisbursementDateParameterName = "updatedExpectedDisbursementDate"; - public static final String updatedDisbursementPrincipalParameterName = "updatedPrincipal"; - public static final String disbursementIdParameterName = "id"; - public static final String loanChargeIdParameterName = "loanChargeId"; - public static final String principalDisbursedParameterName = "transactionAmount"; - public static final String chargesParameterName = "charges"; - public static final String loanIdTobeApproved = "loanId"; + String emiAmountParameterName = "fixedEmiAmount"; + String maxOutstandingBalanceParameterName = "maxOutstandingLoanBalance"; + String disbursementDataParameterName = "disbursementData"; + String disbursementDateParameterName = "expectedDisbursementDate"; + String disbursementPrincipalParameterName = "principal"; + String updatedDisbursementDateParameterName = "updatedExpectedDisbursementDate"; + String updatedDisbursementPrincipalParameterName = "updatedPrincipal"; + String disbursementIdParameterName = "id"; + String loanChargeIdParameterName = "loanChargeId"; + String principalDisbursedParameterName = "transactionAmount"; + String chargesParameterName = "charges"; + String loanIdTobeApproved = "loanId"; - public static final String approvedLoanAmountParameterName = "approvedLoanAmount"; - public static final String approvedOnDateParameterName = "approvedOnDate"; - public static final String noteParameterName = "note"; - public static final String localeParameterName = "locale"; - public static final String dateFormatParameterName = "dateFormat"; - public static final String rejectedOnDateParameterName = "rejectedOnDate"; - public static final String withdrawnOnDateParameterName = "withdrawnOnDate"; + String approvedLoanAmountParameterName = "approvedLoanAmount"; + String approvedOnDateParameterName = "approvedOnDate"; + String noteParameterName = "note"; + String localeParameterName = "locale"; + String dateFormatParameterName = "dateFormat"; + String rejectedOnDateParameterName = "rejectedOnDate"; + String withdrawnOnDateParameterName = "withdrawnOnDate"; - public static final String transactionProcessingStrategyIdParameterName = "transactionProcessingStrategyId"; - public static final String loanPurposeIdParameterName = "loanPurposeId"; - public static final String loanOfficerIdParameterName = "loanOfficerId"; - public static final String fundIdParameterName = "fundId"; - public static final String externalIdParameterName = "externalId"; - public static final String accountNoParameterName = "accountNo"; - public static final String productIdParameterName = "productId"; - public static final String calendarIdParameterName = "calendarId"; - public static final String loanTypeParameterName = "loanType"; - public static final String groupIdParameterName = "groupId"; - public static final String clientIdParameterName = "clientId"; - public static final String idParameterName = "id"; - public static final String graceOnInterestChargedParameterName = "graceOnInterestCharged"; - public static final String graceOnInterestPaymentParameterName = "graceOnInterestPayment"; - public static final String graceOnPrincipalPaymentParameterName = "graceOnPrincipalPayment"; - public static final String repaymentsStartingFromDateParameterName = "repaymentsStartingFromDate"; - public static final String interestRateFrequencyTypeParameterName = "interestRateFrequencyType"; - public static final String interestCalculationPeriodTypeParameterName = "interestCalculationPeriodType"; - public static final String interestTypeParameterName = "interestType"; - public static final String amortizationTypeParameterName = "amortizationType"; - public static final String repaymentFrequencyTypeParameterName = "repaymentFrequencyType"; - public static final String loanTermFrequencyTypeParameterName = "loanTermFrequencyType"; - public static final String loanTermFrequencyParameterName = "loanTermFrequency"; - public static final String numberOfRepaymentsParameterName = "numberOfRepayments"; - public static final String repaymentEveryParameterName = "repaymentEvery"; - public static final String interestRatePerPeriodParameterName = "interestRatePerPeriod"; - public static final String inArrearsToleranceParameterName = "inArrearsTolerance"; - public static final String interestChargedFromDateParameterName = "interestChargedFromDate"; - public static final String submittedOnDateParameterName = "submittedOnDate"; - public static final String submittedOnNoteParameterName = "interestChargedFromDate"; - public static final String collateralParameterName = "collateral"; - public static final String syncDisbursementWithMeetingParameterName = "syncDisbursementWithMeeting"; - public static final String linkAccountIdParameterName = "linkAccountId"; - public static final String createStandingInstructionAtDisbursementParameterName = "createStandingInstructionAtDisbursement"; - public static final String daysInYearTypeParameterName = "daysInYearType"; - public static final String daysInMonthTypeParameterName = "daysInMonthType"; + String transactionProcessingStrategyIdParameterName = "transactionProcessingStrategyId"; + String loanPurposeIdParameterName = "loanPurposeId"; + String loanOfficerIdParameterName = "loanOfficerId"; + String fundIdParameterName = "fundId"; + String externalIdParameterName = "externalId"; + String accountNoParameterName = "accountNo"; + String productIdParameterName = "productId"; + String calendarIdParameterName = "calendarId"; + String loanTypeParameterName = "loanType"; + String groupIdParameterName = "groupId"; + String clientIdParameterName = "clientId"; + String idParameterName = "id"; + String graceOnInterestChargedParameterName = "graceOnInterestCharged"; + String graceOnInterestPaymentParameterName = "graceOnInterestPayment"; + String graceOnPrincipalPaymentParameterName = "graceOnPrincipalPayment"; + String repaymentsStartingFromDateParameterName = "repaymentsStartingFromDate"; + String interestRateFrequencyTypeParameterName = "interestRateFrequencyType"; + String interestCalculationPeriodTypeParameterName = "interestCalculationPeriodType"; + String interestTypeParameterName = "interestType"; + String amortizationTypeParameterName = "amortizationType"; + String repaymentFrequencyTypeParameterName = "repaymentFrequencyType"; + String loanTermFrequencyTypeParameterName = "loanTermFrequencyType"; + String loanTermFrequencyParameterName = "loanTermFrequency"; + String numberOfRepaymentsParameterName = "numberOfRepayments"; + String repaymentEveryParameterName = "repaymentEvery"; + String interestRatePerPeriodParameterName = "interestRatePerPeriod"; + String inArrearsToleranceParameterName = "inArrearsTolerance"; + String interestChargedFromDateParameterName = "interestChargedFromDate"; + String submittedOnDateParameterName = "submittedOnDate"; + String submittedOnNoteParameterName = "interestChargedFromDate"; + String collateralParameterName = "collateral"; + String syncDisbursementWithMeetingParameterName = "syncDisbursementWithMeeting"; + String linkAccountIdParameterName = "linkAccountId"; + String createStandingInstructionAtDisbursementParameterName = "createStandingInstructionAtDisbursement"; + String daysInYearTypeParameterName = "daysInYearType"; + String daysInMonthTypeParameterName = "daysInMonthType"; // Interest recalculation related - public static final String isInterestRecalculationEnabledParameterName = "isInterestRecalculationEnabled"; - public static final String interestRecalculationCompoundingMethodParameterName = "interestRecalculationCompoundingMethod"; - public static final String rescheduleStrategyMethodParameterName = "rescheduleStrategyMethod"; - public static final String repaymentFrequencyNthDayTypeParameterName = "repaymentFrequencyNthDayType"; - public static final String repaymentFrequencyDayOfWeekTypeParameterName = "repaymentFrequencyDayOfWeekType"; + String isInterestRecalculationEnabledParameterName = "isInterestRecalculationEnabled"; + String interestRecalculationCompoundingMethodParameterName = "interestRecalculationCompoundingMethod"; + String rescheduleStrategyMethodParameterName = "rescheduleStrategyMethod"; + String repaymentFrequencyNthDayTypeParameterName = "repaymentFrequencyNthDayType"; + String repaymentFrequencyDayOfWeekTypeParameterName = "repaymentFrequencyDayOfWeekType"; // Floating interest rate related - public static final String interestRateDifferentialParameterName = "interestRateDifferential"; - public static final String isFloatingInterestRateParameterName = "isFloatingInterestRate"; + String interestRateDifferentialParameterName = "interestRateDifferential"; + String isFloatingInterestRateParameterName = "isFloatingInterestRate"; // Error codes - public static final String LOAN_CHARGE_CAN_NOT_BE_ADDED_WITH_INTEREST_CALCULATION_TYPE = "loancharge.with.calculation.type.interest.not.allowed"; - public static final String LOAN_CHARGE_CAN_NOT_BE_ADDED_WITH_PRINCIPAL_CALCULATION_TYPE = "loancharge.with.calculation.type.principal.not.allowed"; - public static final String DISBURSEMENT_DATE_START_WITH_ERROR = "first.disbursement.date.must.start.with.expected.disbursement.date"; - public static final String PRINCIPAL_AMOUNT_SHOULD_BE_SAME = "sum.of.multi.disburse.amounts.must.equal.with.total.principal"; - public static final String DISBURSEMENT_DATE_UNIQUE_ERROR = "disbursement.date.must.be.unique.for.tranches"; - public static final String ALREADY_DISBURSED = "can.not.change.disbursement.date"; - public static final String APPROVED_AMOUNT_IS_LESS_THAN_SUM_OF_TRANCHES = "sum.of.multi.disburse.amounts.must.be.equal.to.or.lesser.than.approved.principal"; - public static final String DISBURSEMENT_DATES_NOT_IN_ORDER = "disbursements.should.be.ordered.based.on.their.disbursement.dates"; - public static final String DISBURSEMENT_DATE_BEFORE_ERROR = "disbursement.date.of.tranche.cannot.be.before.expected.disbursement.date"; + String LOAN_CHARGE_CAN_NOT_BE_ADDED_WITH_INTEREST_CALCULATION_TYPE = "loancharge.with.calculation.type.interest.not.allowed"; + String LOAN_CHARGE_CAN_NOT_BE_ADDED_WITH_PRINCIPAL_CALCULATION_TYPE = "loancharge.with.calculation.type.principal.not.allowed"; + String DISBURSEMENT_DATE_START_WITH_ERROR = "first.disbursement.date.must.start.with.expected.disbursement.date"; + String PRINCIPAL_AMOUNT_SHOULD_BE_SAME = "sum.of.multi.disburse.amounts.must.equal.with.total.principal"; + String DISBURSEMENT_DATE_UNIQUE_ERROR = "disbursement.date.must.be.unique.for.tranches"; + String ALREADY_DISBURSED = "can.not.change.disbursement.date"; + String APPROVED_AMOUNT_IS_LESS_THAN_SUM_OF_TRANCHES = "sum.of.multi.disburse.amounts.must.be.equal.to.or.lesser.than.approved.principal"; + String DISBURSEMENT_DATES_NOT_IN_ORDER = "disbursements.should.be.ordered.based.on.their.disbursement.dates"; + String DISBURSEMENT_DATE_BEFORE_ERROR = "disbursement.date.of.tranche.cannot.be.before.expected.disbursement.date"; - public static final String isFloatingInterestRate = "isFloatingInterestRate"; - public static final String interestRateDifferential = "interestRateDifferential"; + String isFloatingInterestRate = "isFloatingInterestRate"; + String interestRateDifferential = "interestRateDifferential"; - public static final String exceptionParamName = "exceptions"; - public static final String modifiedinstallmentsParamName = "modifiedinstallments"; - public static final String newinstallmentsParamName = "newinstallments"; - public static final String deletedinstallmentsParamName = "deletedinstallments"; - public static final String dueDateParamName = "dueDate"; - public static final String modifiedDueDateParamName = "modifiedDueDate"; - public static final String principalParamName = "principal"; - public static final String parentAccountParamName = "isParentAccount"; - public static final String totalLoanParamName = "totalLoan"; - public static final String installmentAmountParamName = "installmentAmount"; + String exceptionParamName = "exceptions"; + String modifiedinstallmentsParamName = "modifiedinstallments"; + String newinstallmentsParamName = "newinstallments"; + String deletedinstallmentsParamName = "deletedinstallments"; + String dueDateParamName = "dueDate"; + String modifiedDueDateParamName = "modifiedDueDate"; + String principalParamName = "principal"; + String parentAccountParamName = "isParentAccount"; + String totalLoanParamName = "totalLoan"; + String installmentAmountParamName = "installmentAmount"; // loan write off - public static final String WRITEOFFREASONS = "WriteOffReasons"; + String WRITEOFFREASONS = "WriteOffReasons"; // fore closure constants - public static final String transactionDateParamName = "transactionDate"; - public static final String noteParamName = "note"; + String transactionDateParamName = "transactionDate"; + String noteParamName = "note"; - public static final String canUseForTopup = "canUseForTopup"; - public static final String clientActiveLoanOptions = "clientActiveLoanOptions"; - public static final String isTopup = "isTopup"; - public static final String loanIdToClose = "loanIdToClose"; - public static final String topupAmount = "topupAmount"; + String canUseForTopup = "canUseForTopup"; + String clientActiveLoanOptions = "clientActiveLoanOptions"; + String isTopup = "isTopup"; + String loanIdToClose = "loanIdToClose"; + String topupAmount = "topupAmount"; - public static final String datatables = "datatables"; + String datatables = "datatables"; - public static final String isEqualAmortizationParam = "isEqualAmortization"; - public static final String applicationId = "applicationId"; - public static final String lastApplication = "lastApplication"; + String isEqualAmortizationParam = "isEqualAmortization"; + String applicationId = "applicationId"; + String lastApplication = "lastApplication"; } 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 a8158d466..e9e385af1 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 @@ -2855,7 +2855,7 @@ public class Loan extends AbstractPersistableCustom { return actualChanges; } - private final void reverseExistingTransactions() { + private void reverseExistingTransactions() { Collection retainTransactions = new ArrayList<>(); for (final LoanTransaction transaction : this.loanTransactions) { transaction.reverse(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanAccountDomainService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanAccountDomainService.java index bf02097eb..50540390f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanAccountDomainService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanAccountDomainService.java @@ -28,9 +28,8 @@ import org.joda.time.LocalDate; public interface LoanAccountDomainService { LoanTransaction makeRepayment(Loan loan, CommandProcessingResultBuilder builderResult, LocalDate transactionDate, - BigDecimal transactionAmount, PaymentDetail paymentDetail, String noteText, String txnExternalId, - final boolean isRecoveryRepayment, boolean isAccountTransfer, HolidayDetailDTO holidatDetailDto, - Boolean isHolidayValidationDone); + BigDecimal transactionAmount, PaymentDetail paymentDetail, String noteText, String txnExternalId, boolean isRecoveryRepayment, + boolean isAccountTransfer, HolidayDetailDTO holidatDetailDto, Boolean isHolidayValidationDone); LoanTransaction makeRefund(Long accountId, CommandProcessingResultBuilder builderResult, LocalDate transactionDate, BigDecimal transactionAmount, PaymentDetail paymentDetail, String noteText, String txnExternalId); @@ -63,7 +62,7 @@ public interface LoanAccountDomainService { void saveLoanWithDataIntegrityViolationChecks(Loan loan); - Map foreCloseLoan(final Loan loan, final LocalDate foreClourseDate, String noteText); + Map foreCloseLoan(Loan loan, LocalDate foreClourseDate, String noteText); /** * Disables all standing instructions linked to a closed loan diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepository.java index 533c8cf68..658756040 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepository.java @@ -28,49 +28,48 @@ import org.springframework.data.repository.query.Param; public interface LoanRepository extends JpaRepository, JpaSpecificationExecutor { - public static final String FIND_GROUP_LOANS_DISBURSED_AFTER = "select l from Loan l where ( l.actualDisbursementDate IS NOT NULL and l.actualDisbursementDate > :disbursementDate) and " + String FIND_GROUP_LOANS_DISBURSED_AFTER = "select l from Loan l where ( l.actualDisbursementDate IS NOT NULL and l.actualDisbursementDate > :disbursementDate) and " + "l.group.id = :groupId and l.loanType = :loanType order by l.actualDisbursementDate"; - public static final String FIND_CLIENT_OR_JLG_LOANS_DISBURSED_AFTER = "select l from Loan l where (l.actualDisbursementDate IS NOT NULL and l.actualDisbursementDate > :disbursementDate) and " + String FIND_CLIENT_OR_JLG_LOANS_DISBURSED_AFTER = "select l from Loan l where (l.actualDisbursementDate IS NOT NULL and l.actualDisbursementDate > :disbursementDate) and " + "l.client.id = :clientId order by l.actualDisbursementDate"; - public static final String FIND_MAX_GROUP_LOAN_COUNTER_QUERY = "Select MAX(l.loanCounter) from Loan l where l.group.id = :groupId " + String FIND_MAX_GROUP_LOAN_COUNTER_QUERY = "Select MAX(l.loanCounter) from Loan l where l.group.id = :groupId " + "and l.loanType = :loanType"; - public static final String FIND_MAX_GROUP_LOAN_PRODUCT_COUNTER_QUERY = "Select MAX(l.loanProductCounter) from Loan l where " + String FIND_MAX_GROUP_LOAN_PRODUCT_COUNTER_QUERY = "Select MAX(l.loanProductCounter) from Loan l where " + "l.group.id = :groupId and l.loanType = :loanType and l.loanProduct.id = :productId"; - public static final String FIND_MAX_CLIENT_OR_JLG_LOAN_COUNTER_QUERY = "Select MAX(l.loanCounter) from Loan l where " - + "l.client.id = :clientId"; + String FIND_MAX_CLIENT_OR_JLG_LOAN_COUNTER_QUERY = "Select MAX(l.loanCounter) from Loan l where " + "l.client.id = :clientId"; - public static final String FIND_MAX_CLIENT_OR_JLG_LOAN_PRODUCT_COUNTER_QUERY = "Select MAX(l.loanProductCounter) from Loan l where " + String FIND_MAX_CLIENT_OR_JLG_LOAN_PRODUCT_COUNTER_QUERY = "Select MAX(l.loanProductCounter) from Loan l where " + "l.client.id = :clientId and l.loanProduct.id = :productId"; - public static final String FIND_GROUP_LOANS_TO_UPDATE = "select l from Loan l where l.loanCounter > :loanCounter and " + String FIND_GROUP_LOANS_TO_UPDATE = "select l from Loan l where l.loanCounter > :loanCounter and " + "l.group.id = :groupId and l.loanType = :groupLoanType order by l.loanCounter"; - public static final String FIND_CLIENT_OR_JLG_LOANS_TO_UPDATE = "select l from Loan l where l.loanCounter > :loanCounter and " + String FIND_CLIENT_OR_JLG_LOANS_TO_UPDATE = "select l from Loan l where l.loanCounter > :loanCounter and " + "l.client.id = :clientId order by l.loanCounter"; - public static final String FIND_GROUP_LOANS_TO_UPDATE_LOANPRODUCT_COUNTER = "select l from Loan l where l.loanProductCounter > :loanProductCounter" + String FIND_GROUP_LOANS_TO_UPDATE_LOANPRODUCT_COUNTER = "select l from Loan l where l.loanProductCounter > :loanProductCounter" + " and l.group.id = :groupId and l.loanType = :groupLoanType and l.loanCounter is NULL order by l.loanProductCounter"; - public static final String FIND_CLIENT_LOANS_TO_UPDATE_LOANPRODUCT_COUNTER = "select l from Loan l where l.loanProductCounter > :loanProductCounter" + String FIND_CLIENT_LOANS_TO_UPDATE_LOANPRODUCT_COUNTER = "select l from Loan l where l.loanProductCounter > :loanProductCounter" + " and l.client.id = :clientId and l.loanCounter is NULL order by l.loanProductCounter"; - public static final String FIND_ACTIVE_LOANS_PRODUCT_IDS_BY_CLIENT = "Select loan.loanProduct.id from Loan loan where " + String FIND_ACTIVE_LOANS_PRODUCT_IDS_BY_CLIENT = "Select loan.loanProduct.id from Loan loan where " + "loan.client.id = :clientId and loan.loanStatus = :loanStatus group by loan.loanProduct.id"; - public static final String FIND_ACTIVE_LOANS_PRODUCT_IDS_BY_GROUP = "Select loan.loanProduct.id from Loan loan where " + String FIND_ACTIVE_LOANS_PRODUCT_IDS_BY_GROUP = "Select loan.loanProduct.id from Loan loan where " + "loan.group.id = :groupId and loan.loanStatus = :loanStatus and loan.client.id is NULL group by loan.loanProduct.id"; - public static final String DOES_CLIENT_HAVE_NON_CLOSED_LOANS = "select case when (count (loan) > 0) then 'true' else 'false' end from Loan loan where loan.client.id = :clientId and loan.loanStatus in (100,200,300,303,304,700)"; + String DOES_CLIENT_HAVE_NON_CLOSED_LOANS = "select case when (count (loan) > 0) then 'true' else 'false' end from Loan loan where loan.client.id = :clientId and loan.loanStatus in (100,200,300,303,304,700)"; - public static final String DOES_PRODUCT_HAVE_NON_CLOSED_LOANS = "select case when (count (loan) > 0) then 'true' else 'false' end from Loan loan where loan.loanProduct.id = :productId and loan.loanStatus in (100,200,300,303,304,700)"; + String DOES_PRODUCT_HAVE_NON_CLOSED_LOANS = "select case when (count (loan) > 0) then 'true' else 'false' end from Loan loan where loan.loanProduct.id = :productId and loan.loanStatus in (100,200,300,303,304,700)"; - public static final String FIND_BY_ACCOUNT_NUMBER = "select loan from Loan loan where loan.accountNumber = :accountNumber and loan.loanStatus in (100,200,300,303,304)"; + String FIND_BY_ACCOUNT_NUMBER = "select loan from Loan loan where loan.accountNumber = :accountNumber and loan.loanStatus in (100,200,300,303,304)"; - public static final String FIND_NON_CLOSED_LOAN_THAT_BELONGS_TO_CLIENT = "select loan from Loan loan where loan.id = :loanId and loan.loanStatus = 300 and loan.client.id = :clientId"; + String FIND_NON_CLOSED_LOAN_THAT_BELONGS_TO_CLIENT = "select loan from Loan loan where loan.id = :loanId and loan.loanStatus = 300 and loan.client.id = :clientId"; @Query(FIND_GROUP_LOANS_DISBURSED_AFTER) List getGroupLoansDisbursedAfter(@Param("disbursementDate") Date disbursementDate, @Param("groupId") Long groupId, diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTermVariationType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTermVariationType.java index 121faf4ef..a8c6b0fee 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTermVariationType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTermVariationType.java @@ -33,7 +33,7 @@ public enum LoanTermVariationType { private final Integer value; private final String code; - private LoanTermVariationType(final Integer value, final String code) { + LoanTermVariationType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/AbstractLoanRepaymentScheduleTransactionProcessor.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/AbstractLoanRepaymentScheduleTransactionProcessor.java index 4992cbe63..ea1bad8ae 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/AbstractLoanRepaymentScheduleTransactionProcessor.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/AbstractLoanRepaymentScheduleTransactionProcessor.java @@ -433,9 +433,9 @@ public abstract class AbstractLoanRepaymentScheduleTransactionProcessor implemen * @param transactionMappings * TODO */ - protected abstract Money handleTransactionThatIsALateRepaymentOfInstallment(final LoanRepaymentScheduleInstallment currentInstallment, - final List installments, final LoanTransaction loanTransaction, - final Money transactionAmountUnprocessed, final List transactionMappings); + protected abstract Money handleTransactionThatIsALateRepaymentOfInstallment(LoanRepaymentScheduleInstallment currentInstallment, + List installments, LoanTransaction loanTransaction, Money transactionAmountUnprocessed, + List transactionMappings); /** * This method is responsible for checking if the current transaction is 'an advance/early payment' based on the @@ -458,10 +458,9 @@ public abstract class AbstractLoanRepaymentScheduleTransactionProcessor implemen * @param transactionMappings * TODO */ - protected abstract Money handleTransactionThatIsPaymentInAdvanceOfInstallment(final LoanRepaymentScheduleInstallment currentInstallment, - final List installments, final LoanTransaction loanTransaction, - final LocalDate transactionDate, final Money paymentInAdvance, - final List transactionMappings); + protected abstract Money handleTransactionThatIsPaymentInAdvanceOfInstallment(LoanRepaymentScheduleInstallment currentInstallment, + List installments, LoanTransaction loanTransaction, LocalDate transactionDate, + Money paymentInAdvance, List transactionMappings); /** * For normal on-time repayments. @@ -469,9 +468,9 @@ public abstract class AbstractLoanRepaymentScheduleTransactionProcessor implemen * @param transactionMappings * TODO */ - protected abstract Money handleTransactionThatIsOnTimePaymentOfInstallment(final LoanRepaymentScheduleInstallment currentInstallment, - final LoanTransaction loanTransaction, final Money transactionAmountUnprocessed, - final List transactionMappings); + protected abstract Money handleTransactionThatIsOnTimePaymentOfInstallment(LoanRepaymentScheduleInstallment currentInstallment, + LoanTransaction loanTransaction, Money transactionAmountUnprocessed, + List transactionMappings); /** * Invoked when a transaction results in an over-payment of the full loan. @@ -562,9 +561,9 @@ public abstract class AbstractLoanRepaymentScheduleTransactionProcessor implemen * TODO * */ - protected abstract Money handleRefundTransactionPaymentOfInstallment(final LoanRepaymentScheduleInstallment currentInstallment, - final LoanTransaction loanTransaction, final Money transactionAmountUnprocessed, - final List transactionMappings); + protected abstract Money handleRefundTransactionPaymentOfInstallment(LoanRepaymentScheduleInstallment currentInstallment, + LoanTransaction loanTransaction, Money transactionAmountUnprocessed, + List transactionMappings); private void undoChargesPaidAmountBy(final LoanTransaction loanTransaction, final Money feeCharges, final Set charges, final Integer installmentNumber) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/domain/GuarantorType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/domain/GuarantorType.java index 5cf11dab1..a41d5c8b2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/domain/GuarantorType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/domain/GuarantorType.java @@ -28,7 +28,7 @@ public enum GuarantorType { private final Integer value; private final String code; - private GuarantorType(final Integer value, final String code) { + GuarantorType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java index f5f9230cc..984772a75 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java @@ -237,7 +237,7 @@ public class GuarantorReadPlatformServiceImpl implements GuarantorReadPlatformSe private final String sql; - public GuarantorTransactionMapper() { + GuarantorTransactionMapper() { StringBuilder sb = new StringBuilder(" gt.id as gtId,"); sb.append("gt.is_reversed as reversed,"); sb.append(" oht.id as ohtId, oht.amount as transactionAmount, "); @@ -301,7 +301,7 @@ public class GuarantorReadPlatformServiceImpl implements GuarantorReadPlatformSe private final String sql; - public ObligeeMapper() { + ObligeeMapper() { StringBuilder sb = new StringBuilder( "SELECT cl.firstname, cl.lastname,cl.display_name as displayName, loan.account_no as loanAccountNumber, loan.principal_amount as loanAmount, gfd.amount as guaranteedAmount, "); sb.append( diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformService.java index ba4fe109c..f545a26c5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformService.java @@ -23,10 +23,10 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; public interface GuarantorWritePlatformService { - CommandProcessingResult createGuarantor(final Long loanId, final JsonCommand command); + CommandProcessingResult createGuarantor(Long loanId, JsonCommand command); - CommandProcessingResult updateGuarantor(final Long loanId, final Long guarantorId, final JsonCommand command); + CommandProcessingResult updateGuarantor(Long loanId, Long guarantorId, JsonCommand command); - CommandProcessingResult removeGuarantor(final Long loanId, final Long guarantorId, Long guarantorFundingId); + CommandProcessingResult removeGuarantor(Long loanId, Long guarantorId, Long guarantorFundingId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java index 612739d4d..ae697599b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java @@ -2703,7 +2703,7 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener boolean isEmiAmountChanged; double interestCalculationGraceOnRepaymentPeriodFraction; - public ScheduleCurrentPeriodParams(final MonetaryCurrency currency, double interestCalculationGraceOnRepaymentPeriodFraction) { + ScheduleCurrentPeriodParams(final MonetaryCurrency currency, double interestCalculationGraceOnRepaymentPeriodFraction) { this.earlyPaidAmount = Money.zero(currency); this.lastInstallment = null; this.skipCurrentLoop = false; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java index 8947018f3..2789796e6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java @@ -731,7 +731,7 @@ public final class LoanApplicationTerms { return new PrincipalInterest(null, interestForInstallment, interestBroughtForwardDueToGrace); } - private final boolean isLastRepaymentPeriod(final int numberOfRepayments, final int periodNumber) { + private boolean isLastRepaymentPeriod(final int numberOfRepayments, final int periodNumber) { return periodNumber == numberOfRepayments; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanScheduleGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanScheduleGenerator.java index e3a6673a6..c29439cb4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanScheduleGenerator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanScheduleGenerator.java @@ -32,10 +32,10 @@ import org.joda.time.LocalDate; public interface LoanScheduleGenerator { LoanScheduleModel generate(MathContext mc, LoanApplicationTerms loanApplicationTerms, Set loanCharges, - final HolidayDetailDTO holidayDetailDTO); + HolidayDetailDTO holidayDetailDTO); LoanScheduleDTO rescheduleNextInstallments(MathContext mc, LoanApplicationTerms loanApplicationTerms, Loan loan, - final HolidayDetailDTO holidayDetailDTO, LoanRepaymentScheduleTransactionProcessor loanRepaymentScheduleTransactionProcessor, + HolidayDetailDTO holidayDetailDTO, LoanRepaymentScheduleTransactionProcessor loanRepaymentScheduleTransactionProcessor, LocalDate rescheduleFrom); LoanRepaymentScheduleInstallment calculatePrepaymentAmount(MonetaryCurrency currency, LocalDate onDate, diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/ScheduledDateGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/ScheduledDateGenerator.java index c4b33fbd3..85591f7d0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/ScheduledDateGenerator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/ScheduledDateGenerator.java @@ -26,21 +26,21 @@ import org.joda.time.LocalDate; public interface ScheduledDateGenerator { - LocalDate getLastRepaymentDate(LoanApplicationTerms loanApplicationTerms, final HolidayDetailDTO holidayDetailDTO); + LocalDate getLastRepaymentDate(LoanApplicationTerms loanApplicationTerms, HolidayDetailDTO holidayDetailDTO); LocalDate idealDisbursementDateBasedOnFirstRepaymentDate(PeriodFrequencyType repaymentPeriodFrequencyType, int repaidEvery, - final LocalDate firstRepaymentDate, final Calendar loanCalendar, final HolidayDetailDTO holidayDetailDTO, - final LoanApplicationTerms loanApplicationTerms); + LocalDate firstRepaymentDate, Calendar loanCalendar, HolidayDetailDTO holidayDetailDTO, + LoanApplicationTerms loanApplicationTerms); LocalDate generateNextRepaymentDate(LocalDate lastRepaymentDate, LoanApplicationTerms loanApplicationTerms, boolean isFirstRepayment); AdjustedDateDetailsDTO adjustRepaymentDate(LocalDate dueRepaymentPeriodDate, LoanApplicationTerms loanApplicationTerms, - final HolidayDetailDTO holidayDetailDTO); + HolidayDetailDTO holidayDetailDTO); LocalDate getRepaymentPeriodDate(PeriodFrequencyType frequency, int repaidEvery, LocalDate startDate); Boolean isDateFallsInSchedule(PeriodFrequencyType frequency, int repaidEvery, LocalDate startDate, LocalDate date); LocalDate generateNextScheduleDateStartingFromDisburseDate(LocalDate lastRepaymentDate, LoanApplicationTerms loanApplicationTerms, - final HolidayDetailDTO holidayDetailDTO); + HolidayDetailDTO holidayDetailDTO); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryReadPlatformServiceImpl.java index 8598fce6e..c17c1e03c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryReadPlatformServiceImpl.java @@ -94,7 +94,7 @@ public class LoanScheduleHistoryReadPlatformServiceImpl implements LoanScheduleH private LocalDate lastDueDate; private BigDecimal outstandingLoanPrincipalBalance; - public LoanScheduleArchiveResultSetExtractor(final RepaymentScheduleRelatedLoanData repaymentScheduleRelatedLoanData, + LoanScheduleArchiveResultSetExtractor(final RepaymentScheduleRelatedLoanData repaymentScheduleRelatedLoanData, Collection disbursementData) { this.currency = repaymentScheduleRelatedLoanData.getCurrency(); this.disbursement = repaymentScheduleRelatedLoanData.disbursementData(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformService.java index 4e360d95a..3efbff136 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformService.java @@ -26,8 +26,8 @@ import org.apache.fineract.portfolio.loanaccount.rescheduleloan.domain.LoanResch public interface LoanScheduleHistoryWritePlatformService { - List createLoanScheduleArchive(final List repaymentScheduleInstallments, - final Loan loan, final LoanRescheduleRequest loanRescheduleRequest); + List createLoanScheduleArchive(List repaymentScheduleInstallments, + Loan loan, LoanRescheduleRequest loanRescheduleRequest); void createAndSaveLoanScheduleArchive(List repaymentScheduleInstallments, Loan loan, LoanRescheduleRequest loanRescheduleRequest); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleWritePlatformService.java index 90b5518d7..8c05820e0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleWritePlatformService.java @@ -23,7 +23,7 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; public interface LoanScheduleWritePlatformService { - public CommandProcessingResult addLoanScheduleVariations(final Long loanId, final JsonCommand command); + CommandProcessingResult addLoanScheduleVariations(Long loanId, JsonCommand command); - CommandProcessingResult deleteLoanScheduleVariations(final Long loanId); + CommandProcessingResult deleteLoanScheduleVariations(Long loanId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanReschedulePreviewPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanReschedulePreviewPlatformService.java index 81d7b9b97..32c1d9e41 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanReschedulePreviewPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanReschedulePreviewPlatformService.java @@ -22,5 +22,5 @@ import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanSchedul public interface LoanReschedulePreviewPlatformService { - public LoanScheduleModel previewLoanReschedule(Long requestId); + LoanScheduleModel previewLoanReschedule(Long requestId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestReadPlatformService.java index 8d390c056..184a1b493 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestReadPlatformService.java @@ -30,7 +30,7 @@ public interface LoanRescheduleRequestReadPlatformService { * the loan identifier * @return list of LoanRescheduleRequestData objects **/ - public List readLoanRescheduleRequests(Long loanId); + List readLoanRescheduleRequests(Long loanId); /** * get a single loan reschedule request by ID (primary key) @@ -39,7 +39,7 @@ public interface LoanRescheduleRequestReadPlatformService { * the loan reschedule request identifier * @return a LoanRescheduleRequestData object **/ - public LoanRescheduleRequestData readLoanRescheduleRequest(Long requestId); + LoanRescheduleRequestData readLoanRescheduleRequest(Long requestId); /** * get all loan reschedule requests filter by loan ID and status enum @@ -48,7 +48,7 @@ public interface LoanRescheduleRequestReadPlatformService { * the loan identifier * @return list of LoanRescheduleRequestData objects **/ - public List readLoanRescheduleRequests(Long loanId, Integer statusEnum); + List readLoanRescheduleRequests(Long loanId, Integer statusEnum); /** * get all loan reschedule reasons @@ -57,7 +57,7 @@ public interface LoanRescheduleRequestReadPlatformService { * the loan reschedule reason * @return list of LoanRescheduleRequestData objects **/ - public LoanRescheduleRequestData retrieveAllRescheduleReasons(String loanRescheduleReason); + LoanRescheduleRequestData retrieveAllRescheduleReasons(String loanRescheduleReason); /** * get all loan reschedule request @@ -67,5 +67,5 @@ public interface LoanRescheduleRequestReadPlatformService { * pending for approval reject - give all rejected requests * @return list of LoanRescheduleRequestData objects **/ - public List retrieveAllRescheduleRequests(String command); + List retrieveAllRescheduleRequests(String command); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/BulkLoansReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/BulkLoansReadPlatformService.java index 6ac9c1891..cbc8b5869 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/BulkLoansReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/BulkLoansReadPlatformService.java @@ -22,5 +22,5 @@ import org.apache.fineract.organisation.staff.data.StaffAccountSummaryCollection public interface BulkLoansReadPlatformService { - StaffAccountSummaryCollectionData retrieveLoanOfficerAccountSummary(final Long loanOfficerId); + StaffAccountSummaryCollectionData retrieveLoanOfficerAccountSummary(Long loanOfficerId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java index 684c33543..67e3296e7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java @@ -300,7 +300,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform private final String schemaSql; - public LoanChargeAccrualMapper() { + LoanChargeAccrualMapper() { StringBuilder sb = new StringBuilder(50); sb.append("lc.id as id, lc.charge_id as chargeId, "); sb.append("lc.amount as amountDue, "); @@ -360,7 +360,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform private final String schemaSql; private final Map chargeDataMap; - public LoanChargeUnRecognizedIncomeMapper(final Collection datas) { + LoanChargeUnRecognizedIncomeMapper(final Collection datas) { this.chargeDataMap = new HashMap<>(); for (LoanChargeData chargeData : datas) { this.chargeDataMap.put(chargeData.getId(), chargeData); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformService.java index eeb14d45f..7403077c0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformService.java @@ -88,8 +88,7 @@ public interface LoanReadPlatformService { * The 'overdue-charge' is only ever applied once to an installment and as a result overdue installments with this * charge already applied are not returned. */ - Collection retrieveAllLoansWithOverdueInstallments(final Long penaltyWaitPeriod, - final Boolean backdatePenalties); + Collection retrieveAllLoansWithOverdueInstallments(Long penaltyWaitPeriod, Boolean backdatePenalties); Integer retriveLoanCounter(Long groupId, Integer loanType, Long productId); @@ -131,7 +130,7 @@ public interface LoanReadPlatformService { Collection retrieveLoanIdsWithPendingIncomePostingTransactions(); - LoanTransactionData retrieveLoanForeclosureTemplate(final Long loanId, final LocalDate transactionDate); + LoanTransactionData retrieveLoanForeclosureTemplate(Long loanId, LocalDate transactionDate); LoanAccountData retrieveLoanByLoanAccount(String loanAccountNumber); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java index 45ff8f954..87ec1a053 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java @@ -1953,7 +1953,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { return this.sqlSchema; } - public LoanRepaymentWaiverMapper() { + LoanRepaymentWaiverMapper() { StringBuilder sb = new StringBuilder(); sb.append("lrs.duedate as dueDate,lrs.interest_waived_derived interestWaived, lrs.installment as installment"); sb.append(" from m_loan_repayment_schedule lrs "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformService.java index 0391e4295..f5c262180 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformService.java @@ -78,9 +78,9 @@ public interface LoanWritePlatformService { LoanTransaction initiateLoanTransfer(Loan loan, LocalDate transferDate); - LoanTransaction withdrawLoanTransfer(final Loan loan, LocalDate transferDate); + LoanTransaction withdrawLoanTransfer(Loan loan, LocalDate transferDate); - void rejectLoanTransfer(final Loan loan); + void rejectLoanTransfer(Loan loan); LoanTransaction acceptLoanTransfer(Loan loan, LocalDate transferDate, Office acceptedInOffice, Staff loanOfficer); @@ -106,7 +106,7 @@ public interface LoanWritePlatformService { CommandProcessingResult undoLastLoanDisbursal(Long loanId, JsonCommand command); - CommandProcessingResult forecloseLoan(final Long loanId, JsonCommand command); + CommandProcessingResult forecloseLoan(Long loanId, JsonCommand command); CommandProcessingResult disburseGLIMLoan(Long loanId, JsonCommand command); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/LoanProductConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/LoanProductConstants.java index 7ad88732d..b5ec60f72 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/LoanProductConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/LoanProductConstants.java @@ -22,117 +22,117 @@ import java.math.BigDecimal; public interface LoanProductConstants { - public static final String USE_BORROWER_CYCLE_PARAMETER_NAME = "useBorrowerCycle"; + String USE_BORROWER_CYCLE_PARAMETER_NAME = "useBorrowerCycle"; - public static final String PRINCIPAL_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "principalVariationsForBorrowerCycle"; - public static final String INTEREST_RATE_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "interestRateVariationsForBorrowerCycle"; - public static final String NUMBER_OF_REPAYMENT_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "numberOfRepaymentVariationsForBorrowerCycle"; + String PRINCIPAL_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "principalVariationsForBorrowerCycle"; + String INTEREST_RATE_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "interestRateVariationsForBorrowerCycle"; + String NUMBER_OF_REPAYMENT_VARIATIONS_FOR_BORROWER_CYCLE_PARAMETER_NAME = "numberOfRepaymentVariationsForBorrowerCycle"; - public static final String DEFAULT_VALUE_PARAMETER_NAME = "defaultValue"; - public static final String MIN_VALUE_PARAMETER_NAME = "minValue"; - public static final String MAX_VALUE_PARAMETER_NAME = "maxValue"; - public static final String VALUE_CONDITION_TYPE_PARAM_NAME = "valueConditionType"; - public static final String BORROWER_CYCLE_NUMBER_PARAM_NAME = "borrowerCycleNumber"; - public static final String BORROWER_CYCLE_ID_PARAMETER_NAME = "id"; + String DEFAULT_VALUE_PARAMETER_NAME = "defaultValue"; + String MIN_VALUE_PARAMETER_NAME = "minValue"; + String MAX_VALUE_PARAMETER_NAME = "maxValue"; + String VALUE_CONDITION_TYPE_PARAM_NAME = "valueConditionType"; + String BORROWER_CYCLE_NUMBER_PARAM_NAME = "borrowerCycleNumber"; + String BORROWER_CYCLE_ID_PARAMETER_NAME = "id"; - public static final String PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "principalPerCycle"; - public static final String MIN_PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "minPrincipalPerCycle"; - public static final String MAX_PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "maxPrincipalPerCycle"; - public static final String PRINCIPAL_VALUE_USAGE_CONDITION_PARAM_NAME = "principalValueUsageCondition"; - public static final String PRINCIPAL_CYCLE_NUMBERS_PARAM_NAME = "principalCycleNumbers"; + String PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "principalPerCycle"; + String MIN_PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "minPrincipalPerCycle"; + String MAX_PRINCIPAL_PER_CYCLE_PARAMETER_NAME = "maxPrincipalPerCycle"; + String PRINCIPAL_VALUE_USAGE_CONDITION_PARAM_NAME = "principalValueUsageCondition"; + String PRINCIPAL_CYCLE_NUMBERS_PARAM_NAME = "principalCycleNumbers"; - public static final String NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "numberOfRepaymentsPerCycle"; - public static final String MIN_NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "minNumberOfRepaymentsPerCycle"; - public static final String MAX_NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "maxNumberOfRepaymentsPerCycle"; - public static final String REPAYMENT_VALUE_USAGE_CONDITION_PARAM_NAME = "repaymentValueUsageCondition"; - public static final String REPAYMENT_CYCLE_NUMBER_PARAM_NAME = "repaymentCycleNumber"; + String NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "numberOfRepaymentsPerCycle"; + String MIN_NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "minNumberOfRepaymentsPerCycle"; + String MAX_NUMBER_OF_REPAYMENTS_PER_CYCLE_PARAMETER_NAME = "maxNumberOfRepaymentsPerCycle"; + String REPAYMENT_VALUE_USAGE_CONDITION_PARAM_NAME = "repaymentValueUsageCondition"; + String REPAYMENT_CYCLE_NUMBER_PARAM_NAME = "repaymentCycleNumber"; - public static final String INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "interestRatePerPeriodPerCycle"; - public static final String MIN_INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "minInterestRatePerPeriodPerCycle"; - public static final String MAX_INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "maxInterestRatePerPeriodPerCycle"; - public static final String INTEREST_RATE_VALUE_USAGE_CONDITION_PARAM_NAME = "interestRateValueUsageCondition"; - public static final String INTEREST_RATE_CYCLE_NUMBER_PARAM_NAME = "interestRateCycleNumber"; + String INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "interestRatePerPeriodPerCycle"; + String MIN_INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "minInterestRatePerPeriodPerCycle"; + String MAX_INTEREST_RATE_PER_PERIOD_PER_CYCLE_PARAMETER_NAME = "maxInterestRatePerPeriodPerCycle"; + String INTEREST_RATE_VALUE_USAGE_CONDITION_PARAM_NAME = "interestRateValueUsageCondition"; + String INTEREST_RATE_CYCLE_NUMBER_PARAM_NAME = "interestRateCycleNumber"; - public static final String PRINCIPAL = "principal"; - public static final String MIN_PRINCIPAL = "minPrincipal"; - public static final String MAX_PRINCIPAL = "maxPrincipalValue"; + String PRINCIPAL = "principal"; + String MIN_PRINCIPAL = "minPrincipal"; + String MAX_PRINCIPAL = "maxPrincipalValue"; - public static final String INTEREST_RATE_PER_PERIOD = "interestRatePerPeriod"; - public static final String MIN_INTEREST_RATE_PER_PERIOD = "minInterestRatePerPeriod"; - public static final String MAX_INTEREST_RATE_PER_PERIOD = "maxInterestRatePerPeriod"; + String INTEREST_RATE_PER_PERIOD = "interestRatePerPeriod"; + String MIN_INTEREST_RATE_PER_PERIOD = "minInterestRatePerPeriod"; + String MAX_INTEREST_RATE_PER_PERIOD = "maxInterestRatePerPeriod"; - public static final String NUMBER_OF_REPAYMENTS = "numberOfRepayments"; - public static final String MIN_NUMBER_OF_REPAYMENTS = "minNumberOfRepayments"; - public static final String MAX_NUMBER_OF_REPAYMENTS = "maxNumberOfRepayments"; + String NUMBER_OF_REPAYMENTS = "numberOfRepayments"; + String MIN_NUMBER_OF_REPAYMENTS = "minNumberOfRepayments"; + String MAX_NUMBER_OF_REPAYMENTS = "maxNumberOfRepayments"; - public static final String VALUE_CONDITION_END_WITH_ERROR = "condition.type.must.end.with.greterthan"; - public static final String VALUE_CONDITION_START_WITH_ERROR = "condition.type.must.start.with.equal"; - public static final String SHORT_NAME = "shortName"; + String VALUE_CONDITION_END_WITH_ERROR = "condition.type.must.end.with.greterthan"; + String VALUE_CONDITION_START_WITH_ERROR = "condition.type.must.start.with.equal"; + String SHORT_NAME = "shortName"; - public static final String MULTI_DISBURSE_LOAN_PARAMETER_NAME = "multiDisburseLoan"; - public static final String MAX_TRANCHE_COUNT_PARAMETER_NAME = "maxTrancheCount"; - public static final String OUTSTANDING_LOAN_BALANCE_PARAMETER_NAME = "outstandingLoanBalance"; + String MULTI_DISBURSE_LOAN_PARAMETER_NAME = "multiDisburseLoan"; + String MAX_TRANCHE_COUNT_PARAMETER_NAME = "maxTrancheCount"; + String OUTSTANDING_LOAN_BALANCE_PARAMETER_NAME = "outstandingLoanBalance"; - public static final String GRACE_ON_ARREARS_AGEING_PARAMETER_NAME = "graceOnArrearsAgeing"; - public static final String OVERDUE_DAYS_FOR_NPA_PARAMETER_NAME = "overdueDaysForNPA"; - public static final String MINIMUM_DAYS_BETWEEN_DISBURSAL_AND_FIRST_REPAYMENT = "minimumDaysBetweenDisbursalAndFirstRepayment"; - public static final String ACCOUNT_MOVES_OUT_OF_NPA_ONLY_ON_ARREARS_COMPLETION_PARAM_NAME = "accountMovesOutOfNPAOnlyOnArrearsCompletion"; + String GRACE_ON_ARREARS_AGEING_PARAMETER_NAME = "graceOnArrearsAgeing"; + String OVERDUE_DAYS_FOR_NPA_PARAMETER_NAME = "overdueDaysForNPA"; + String MINIMUM_DAYS_BETWEEN_DISBURSAL_AND_FIRST_REPAYMENT = "minimumDaysBetweenDisbursalAndFirstRepayment"; + String ACCOUNT_MOVES_OUT_OF_NPA_ONLY_ON_ARREARS_COMPLETION_PARAM_NAME = "accountMovesOutOfNPAOnlyOnArrearsCompletion"; // Interest recalculation related - public static final String IS_INTEREST_RECALCULATION_ENABLED_PARAMETER_NAME = "isInterestRecalculationEnabled"; - public static final String DAYS_IN_YEAR_TYPE_PARAMETER_NAME = "daysInYearType"; - public static final String DAYS_IN_MONTH_TYPE_PARAMETER_NAME = "daysInMonthType"; - public static final String interestRecalculationCompoundingMethodParameterName = "interestRecalculationCompoundingMethod"; - public static final String rescheduleStrategyMethodParameterName = "rescheduleStrategyMethod"; - public static final String recalculationRestFrequencyTypeParameterName = "recalculationRestFrequencyType"; - public static final String recalculationRestFrequencyIntervalParameterName = "recalculationRestFrequencyInterval"; - public static final String recalculationRestFrequencyWeekdayParamName = "recalculationRestFrequencyDayOfWeekType"; - public static final String recalculationRestFrequencyNthDayParamName = "recalculationRestFrequencyNthDayType"; - public static final String recalculationRestFrequencyOnDayParamName = "recalculationRestFrequencyOnDayType"; - public static final String isArrearsBasedOnOriginalScheduleParamName = "isArrearsBasedOnOriginalSchedule"; - public static final String preClosureInterestCalculationStrategyParamName = "preClosureInterestCalculationStrategy"; - public static final String recalculationCompoundingFrequencyTypeParameterName = "recalculationCompoundingFrequencyType"; - public static final String recalculationCompoundingFrequencyIntervalParameterName = "recalculationCompoundingFrequencyInterval"; - public static final String recalculationCompoundingFrequencyWeekdayParamName = "recalculationCompoundingFrequencyDayOfWeekType"; - public static final String recalculationCompoundingFrequencyNthDayParamName = "recalculationCompoundingFrequencyNthDayType"; - public static final String recalculationCompoundingFrequencyOnDayParamName = "recalculationCompoundingFrequencyOnDayType"; - public static final String isCompoundingToBePostedAsTransactionParamName = "isCompoundingToBePostedAsTransaction"; + String IS_INTEREST_RECALCULATION_ENABLED_PARAMETER_NAME = "isInterestRecalculationEnabled"; + String DAYS_IN_YEAR_TYPE_PARAMETER_NAME = "daysInYearType"; + String DAYS_IN_MONTH_TYPE_PARAMETER_NAME = "daysInMonthType"; + String interestRecalculationCompoundingMethodParameterName = "interestRecalculationCompoundingMethod"; + String rescheduleStrategyMethodParameterName = "rescheduleStrategyMethod"; + String recalculationRestFrequencyTypeParameterName = "recalculationRestFrequencyType"; + String recalculationRestFrequencyIntervalParameterName = "recalculationRestFrequencyInterval"; + String recalculationRestFrequencyWeekdayParamName = "recalculationRestFrequencyDayOfWeekType"; + String recalculationRestFrequencyNthDayParamName = "recalculationRestFrequencyNthDayType"; + String recalculationRestFrequencyOnDayParamName = "recalculationRestFrequencyOnDayType"; + String isArrearsBasedOnOriginalScheduleParamName = "isArrearsBasedOnOriginalSchedule"; + String preClosureInterestCalculationStrategyParamName = "preClosureInterestCalculationStrategy"; + String recalculationCompoundingFrequencyTypeParameterName = "recalculationCompoundingFrequencyType"; + String recalculationCompoundingFrequencyIntervalParameterName = "recalculationCompoundingFrequencyInterval"; + String recalculationCompoundingFrequencyWeekdayParamName = "recalculationCompoundingFrequencyDayOfWeekType"; + String recalculationCompoundingFrequencyNthDayParamName = "recalculationCompoundingFrequencyNthDayType"; + String recalculationCompoundingFrequencyOnDayParamName = "recalculationCompoundingFrequencyOnDayType"; + String isCompoundingToBePostedAsTransactionParamName = "isCompoundingToBePostedAsTransaction"; // Guarantee related - public static final String holdGuaranteeFundsParamName = "holdGuaranteeFunds"; - public static final String mandatoryGuaranteeParamName = "mandatoryGuarantee"; - public static final String minimumGuaranteeFromOwnFundsParamName = "minimumGuaranteeFromOwnFunds"; - public static final String minimumGuaranteeFromGuarantorParamName = "minimumGuaranteeFromGuarantor"; + String holdGuaranteeFundsParamName = "holdGuaranteeFunds"; + String mandatoryGuaranteeParamName = "mandatoryGuarantee"; + String minimumGuaranteeFromOwnFundsParamName = "minimumGuaranteeFromOwnFunds"; + String minimumGuaranteeFromGuarantorParamName = "minimumGuaranteeFromGuarantor"; - public static final String principalThresholdForLastInstallmentParamName = "principalThresholdForLastInstallment"; - public static final BigDecimal DEFAULT_PRINCIPAL_THRESHOLD_FOR_MULTI_DISBURSE_LOAN = BigDecimal.valueOf(50); - public static final BigDecimal DEFAULT_PRINCIPAL_THRESHOLD_FOR_SINGLE_DISBURSE_LOAN = BigDecimal.valueOf(0); + String principalThresholdForLastInstallmentParamName = "principalThresholdForLastInstallment"; + BigDecimal DEFAULT_PRINCIPAL_THRESHOLD_FOR_MULTI_DISBURSE_LOAN = BigDecimal.valueOf(50); + BigDecimal DEFAULT_PRINCIPAL_THRESHOLD_FOR_SINGLE_DISBURSE_LOAN = BigDecimal.valueOf(0); // Fixed installment configuration related - public static final String canDefineEmiAmountParamName = "canDefineInstallmentAmount"; - public static final String installmentAmountInMultiplesOfParamName = "installmentAmountInMultiplesOf"; + String canDefineEmiAmountParamName = "canDefineInstallmentAmount"; + String installmentAmountInMultiplesOfParamName = "installmentAmountInMultiplesOf"; // Loan Configurable Attributes - public static final String allowAttributeOverridesParamName = "allowAttributeOverrides"; - public static final String amortizationTypeParamName = "amortizationType"; - public static final String interestTypeParamName = "interestType"; - public static final String transactionProcessingStrategyIdParamName = "transactionProcessingStrategyId"; - public static final String interestCalculationPeriodTypeParamName = "interestCalculationPeriodType"; - public static final String inArrearsToleranceParamName = "inArrearsTolerance"; - public static final String repaymentEveryParamName = "repaymentEvery"; - public static final String graceOnPrincipalAndInterestPaymentParamName = "graceOnPrincipalAndInterestPayment"; - public static final String allowCompoundingOnEodParamName = "allowCompoundingOnEod"; + String allowAttributeOverridesParamName = "allowAttributeOverrides"; + String amortizationTypeParamName = "amortizationType"; + String interestTypeParamName = "interestType"; + String transactionProcessingStrategyIdParamName = "transactionProcessingStrategyId"; + String interestCalculationPeriodTypeParamName = "interestCalculationPeriodType"; + String inArrearsToleranceParamName = "inArrearsTolerance"; + String repaymentEveryParamName = "repaymentEvery"; + String graceOnPrincipalAndInterestPaymentParamName = "graceOnPrincipalAndInterestPayment"; + String allowCompoundingOnEodParamName = "allowCompoundingOnEod"; // Variable Installments Settings - public static final String allowVariableInstallmentsParamName = "allowVariableInstallments"; - public static final String minimumGapBetweenInstallments = "minimumGap"; - public static final String maximumGapBetweenInstallments = "maximumGap"; + String allowVariableInstallmentsParamName = "allowVariableInstallments"; + String minimumGapBetweenInstallments = "minimumGap"; + String maximumGapBetweenInstallments = "maximumGap"; - public static final String ALLOW_PARTIAL_PERIOD_INTEREST_CALCUALTION_PARAM_NAME = "allowPartialPeriodInterestCalcualtion"; + String ALLOW_PARTIAL_PERIOD_INTEREST_CALCUALTION_PARAM_NAME = "allowPartialPeriodInterestCalcualtion"; - public static final String CAN_USE_FOR_TOPUP = "canUseForTopup"; + String CAN_USE_FOR_TOPUP = "canUseForTopup"; - public static final String IS_EQUAL_AMORTIZATION_PARAM = "isEqualAmortization"; + String IS_EQUAL_AMORTIZATION_PARAM = "isEqualAmortization"; - public static final String RATES_PARAM_NAME = "rates"; + String RATES_PARAM_NAME = "rates"; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/AmortizationMethod.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/AmortizationMethod.java index 53f3fcdbf..edeb14d87 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/AmortizationMethod.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/AmortizationMethod.java @@ -27,7 +27,7 @@ public enum AmortizationMethod { private final Integer value; private final String code; - private AmortizationMethod(final Integer value, final String code) { + AmortizationMethod(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestCalculationPeriodMethod.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestCalculationPeriodMethod.java index df814ee17..048fd8aa6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestCalculationPeriodMethod.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestCalculationPeriodMethod.java @@ -27,7 +27,7 @@ public enum InterestCalculationPeriodMethod { private final Integer value; private final String code; - private InterestCalculationPeriodMethod(final Integer value, final String code) { + InterestCalculationPeriodMethod(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestMethod.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestMethod.java index 6728ab964..b3ad45238 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestMethod.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestMethod.java @@ -25,7 +25,7 @@ public enum InterestMethod { private final Integer value; private final String code; - private InterestMethod(final Integer value, final String code) { + InterestMethod(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationCompoundingMethod.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationCompoundingMethod.java index 88c90a330..7fcbd3603 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationCompoundingMethod.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationCompoundingMethod.java @@ -53,7 +53,7 @@ public enum InterestRecalculationCompoundingMethod { return type; } - private InterestRecalculationCompoundingMethod(final Integer value, final String code) { + InterestRecalculationCompoundingMethod(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationPeriodMethod.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationPeriodMethod.java index 5d8f85367..fb5d326d4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationPeriodMethod.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationPeriodMethod.java @@ -57,7 +57,7 @@ public enum InterestRecalculationPeriodMethod { return type; } - private InterestRecalculationPeriodMethod(final Integer value, final String code) { + InterestRecalculationPeriodMethod(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanPreClosureInterestCalculationStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanPreClosureInterestCalculationStrategy.java index 4b4b64b22..5725631e8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanPreClosureInterestCalculationStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanPreClosureInterestCalculationStrategy.java @@ -58,7 +58,7 @@ public enum LoanPreClosureInterestCalculationStrategy { return type; } - private LoanPreClosureInterestCalculationStrategy(final Integer value, final String code) { + LoanPreClosureInterestCalculationStrategy(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductParamType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductParamType.java index dd403917f..fd6213cd8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductParamType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductParamType.java @@ -28,7 +28,7 @@ public enum LoanProductParamType { private final Integer value; private final String code; - private LoanProductParamType(final Integer value, final String code) { + LoanProductParamType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanRescheduleStrategyMethod.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanRescheduleStrategyMethod.java index 253ccd231..4045341fa 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanRescheduleStrategyMethod.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanRescheduleStrategyMethod.java @@ -52,7 +52,7 @@ public enum LoanRescheduleStrategyMethod { return type; } - private LoanRescheduleStrategyMethod(final Integer value, final String code) { + LoanRescheduleStrategyMethod(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/domain/ProductMixRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/domain/ProductMixRepository.java index c96dfa6a2..f041cefdf 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/domain/ProductMixRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/domain/ProductMixRepository.java @@ -26,9 +26,9 @@ import org.springframework.data.repository.query.Param; public interface ProductMixRepository extends JpaRepository, JpaSpecificationExecutor { - public static final String GET_PRODUCTMIXES_BY_PRODUCTID_SCHEMA = "select pm from ProductMix pm where pm.product.id = :productId"; - public static final String GET_RESTRICTED_PRODUCTIDS_SCHEMA = "Select pm.restrictedProduct.id from ProductMix pm where pm.product.id = :productId"; - public static final String GET_RESTRICTED_PRODUCTS_SCHEMA = "select pm from ProductMix pm where pm.restrictedProduct.id = :restrictedProductId"; + String GET_PRODUCTMIXES_BY_PRODUCTID_SCHEMA = "select pm from ProductMix pm where pm.product.id = :productId"; + String GET_RESTRICTED_PRODUCTIDS_SCHEMA = "Select pm.restrictedProduct.id from ProductMix pm where pm.product.id = :productId"; + String GET_RESTRICTED_PRODUCTS_SCHEMA = "select pm from ProductMix pm where pm.restrictedProduct.id = :restrictedProductId"; @Query(GET_PRODUCTMIXES_BY_PRODUCTID_SCHEMA) List findByProductId(@Param("productId") Long productId); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java index ba38224cb..84bad8f50 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java @@ -93,7 +93,7 @@ public class ProductMixReadPlatformServiceImpl implements ProductMixReadPlatform return "pm.product_id as productId, lp.name as name from m_product_mix pm join m_product_loan lp on lp.id=pm.product_id"; } - public ProductMixDataExtractor(final LoanProductReadPlatformService loanProductReadPlatformService, final Long productId) { + ProductMixDataExtractor(final LoanProductReadPlatformService loanProductReadPlatformService, final Long productId) { this.loanProductReadPlatformService = loanProductReadPlatformService; this.productId = productId; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java index d646cabdb..93ab1af8f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java @@ -180,7 +180,7 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo private final Collection rates; - public LoanProductMapper(final Collection charges, + LoanProductMapper(final Collection charges, final Collection borrowerCycleVariationDatas, final Collection rates) { this.charges = charges; this.borrowerCycleVariationDatas = borrowerCycleVariationDatas; @@ -644,7 +644,7 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo private static final class LoanProductFloatingRateMapper implements RowMapper { - public LoanProductFloatingRateMapper() {} + LoanProductFloatingRateMapper() {} public String schema() { return "lp.id as id, lp.name as name," + "lp.is_linked_to_floating_interest_rates as isLinkedToFloatingInterestRates, " diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/ClientAttendanceReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/ClientAttendanceReadPlatformService.java index 1a112967e..7dcbf1ede 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/ClientAttendanceReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/ClientAttendanceReadPlatformService.java @@ -23,5 +23,5 @@ import org.apache.fineract.portfolio.meeting.attendance.data.ClientAttendanceDat public interface ClientAttendanceReadPlatformService { - Collection retrieveClientAttendanceByMeetingId(final Long meetingId); + Collection retrieveClientAttendanceByMeetingId(Long meetingId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/service/MeetingReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/service/MeetingReadPlatformService.java index 22d9695bd..94f066a4a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/service/MeetingReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/service/MeetingReadPlatformService.java @@ -24,12 +24,11 @@ import org.apache.fineract.portfolio.meeting.data.MeetingData; public interface MeetingReadPlatformService { - MeetingData retrieveMeeting(final Long meetingId, Long entityId, Integer entityTypeId); + MeetingData retrieveMeeting(Long meetingId, Long entityId, Integer entityTypeId); - Collection retrieveMeetingsByEntity(final Long entityId, final Integer entityTypeId, Integer limit); + Collection retrieveMeetingsByEntity(Long entityId, Integer entityTypeId, Integer limit); - Collection retrieveMeetingsByEntityByCalendarType(final Long entityId, final Integer entityTypeId, - final List calendarTypeOptions); + Collection retrieveMeetingsByEntityByCalendarType(Long entityId, Integer entityTypeId, List calendarTypeOptions); MeetingData retrieveLastMeeting(Long calendarInstanceId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java index e422037f6..0ebf55034 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java @@ -23,7 +23,7 @@ import org.apache.fineract.portfolio.note.data.NoteData; public interface NoteReadPlatformService { - NoteData retrieveNote(final Long noteId, Long resourceId, Integer noteTypeId); + NoteData retrieveNote(Long noteId, Long resourceId, Integer noteTypeId); - Collection retrieveNotesByResource(final Long resourceId, final Integer noteTypeId); + Collection retrieveNotesByResource(Long resourceId, Integer noteTypeId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformService.java index 6a0111ec7..548d269c2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformService.java @@ -24,9 +24,9 @@ import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; public interface PaymentDetailWritePlatformService { - PaymentDetail createAndPersistPaymentDetail(final JsonCommand command, Map changes); + PaymentDetail createAndPersistPaymentDetail(JsonCommand command, Map changes); - PaymentDetail createPaymentDetail(final JsonCommand command, Map changes); + PaymentDetail createPaymentDetail(JsonCommand command, Map changes); PaymentDetail persistPaymentDetail(PaymentDetail paymentDetail); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteService.java index 258f62116..988602852 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteService.java @@ -23,9 +23,9 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; public interface PaymentTypeWriteService { - CommandProcessingResult createPaymentType(final JsonCommand command); + CommandProcessingResult createPaymentType(JsonCommand command); - CommandProcessingResult updatePaymentType(final Long id, final JsonCommand command); + CommandProcessingResult updatePaymentType(Long id, JsonCommand command); - CommandProcessingResult deletePaymentType(final Long id); + CommandProcessingResult deletePaymentType(Long id); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/constants/ProductsApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/constants/ProductsApiConstants.java index 75616df97..2d90dc80e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/constants/ProductsApiConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/constants/ProductsApiConstants.java @@ -20,7 +20,7 @@ package org.apache.fineract.portfolio.products.constants; public interface ProductsApiConstants { - public final String READPLATFORM_NAME = "ReadPlatformService"; - public final String PRODUCT_COMMANDSERVICE = "PRODUCT_COMMANDSERVICE"; + String READPLATFORM_NAME = "ReadPlatformService"; + String PRODUCT_COMMANDSERVICE = "PRODUCT_COMMANDSERVICE"; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/service/ProductCommandsService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/service/ProductCommandsService.java index 59504d735..b5adf3a72 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/service/ProductCommandsService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/service/ProductCommandsService.java @@ -20,5 +20,5 @@ package org.apache.fineract.portfolio.products.service; public interface ProductCommandsService { - public Object handleCommand(final Long productId, final String command, final String jsonBody); + public Object handleCommand(Long productId, String command, String jsonBody); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/service/ProductReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/service/ProductReadPlatformService.java index 674ee5d53..72cfd4dfc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/service/ProductReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/service/ProductReadPlatformService.java @@ -25,13 +25,13 @@ import org.apache.fineract.portfolio.products.data.ProductData; public interface ProductReadPlatformService { - public Page retrieveAllProducts(Integer offSet, Integer limit); + Page retrieveAllProducts(Integer offSet, Integer limit); - public ProductData retrieveOne(final Long productId, boolean includeTemplate); + ProductData retrieveOne(Long productId, boolean includeTemplate); - public ProductData retrieveTemplate(); + ProductData retrieveTemplate(); - public Set getResponseDataParams(); + Set getResponseDataParams(); - public Collection retrieveAllForLookup(); + Collection retrieveAllForLookup(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/RateAppliesTo.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/RateAppliesTo.java index 50d0477a8..ce68b0551 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/RateAppliesTo.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/RateAppliesTo.java @@ -26,7 +26,7 @@ public enum RateAppliesTo { private final Integer value; private final String code; - private RateAppliesTo(final Integer value, final String code) { + RateAppliesTo(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java index 916bfa986..0887c4159 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java @@ -125,7 +125,7 @@ public class RateReadServiceImpl implements RateReadService { return rateSchema() + " join m_product_loan_rate lr on lr.rate_id = r.id"; } - public RateMapper() {} + RateMapper() {} @Override public RateData mapRow(ResultSet resultSet, int i) throws SQLException { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteService.java index deef18de5..16bc92ac7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteService.java @@ -26,7 +26,7 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; */ public interface RateWriteService { - CommandProcessingResult createRate(final JsonCommand command); + CommandProcessingResult createRate(JsonCommand command); CommandProcessingResult updateRate(Long rateId, JsonCommand command); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountOnHoldTransactionType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountOnHoldTransactionType.java index 751782100..5d5d11adc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountOnHoldTransactionType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountOnHoldTransactionType.java @@ -32,7 +32,7 @@ public enum DepositAccountOnHoldTransactionType { private final Integer value; private final String code; - private DepositAccountOnHoldTransactionType(final Integer value, final String code) { + DepositAccountOnHoldTransactionType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/PreClosurePenalInterestOnType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/PreClosurePenalInterestOnType.java index ef6ad1f01..8bd52c853 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/PreClosurePenalInterestOnType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/PreClosurePenalInterestOnType.java @@ -32,7 +32,7 @@ public enum PreClosurePenalInterestOnType { private final Integer value; private final String code; - private PreClosurePenalInterestOnType(final Integer value, final String code) { + PreClosurePenalInterestOnType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/RecurringDepositType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/RecurringDepositType.java index c8fc720cd..1462121f0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/RecurringDepositType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/RecurringDepositType.java @@ -32,7 +32,7 @@ public enum RecurringDepositType { private final Integer value; private final String code; - private RecurringDepositType(final Integer value, final String code) { + RecurringDepositType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsAccountTransactionType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsAccountTransactionType.java index 65bb7cc0d..39fed1926 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsAccountTransactionType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsAccountTransactionType.java @@ -45,7 +45,7 @@ public enum SavingsAccountTransactionType { private final Integer value; private final String code; - private SavingsAccountTransactionType(final Integer value, final String code) { + SavingsAccountTransactionType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsCompoundingInterestPeriodType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsCompoundingInterestPeriodType.java index 0aa5290b1..ba4b61296 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsCompoundingInterestPeriodType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsCompoundingInterestPeriodType.java @@ -44,7 +44,7 @@ public enum SavingsCompoundingInterestPeriodType { private final Integer value; private final String code; - private SavingsCompoundingInterestPeriodType(final Integer value, final String code) { + SavingsCompoundingInterestPeriodType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsInterestCalculationDaysInYearType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsInterestCalculationDaysInYearType.java index d0f655267..616f017ab 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsInterestCalculationDaysInYearType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsInterestCalculationDaysInYearType.java @@ -38,7 +38,7 @@ public enum SavingsInterestCalculationDaysInYearType { private final Integer value; private final String code; - private SavingsInterestCalculationDaysInYearType(final Integer value, final String code) { + SavingsInterestCalculationDaysInYearType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsInterestCalculationType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsInterestCalculationType.java index a62f1af85..72701c72f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsInterestCalculationType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsInterestCalculationType.java @@ -51,7 +51,7 @@ public enum SavingsInterestCalculationType { private final Integer value; private final String code; - private SavingsInterestCalculationType(final Integer value, final String code) { + SavingsInterestCalculationType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsPeriodFrequencyType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsPeriodFrequencyType.java index 89fd08e9f..0fb4ccbc9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsPeriodFrequencyType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsPeriodFrequencyType.java @@ -35,7 +35,7 @@ public enum SavingsPeriodFrequencyType { private final Integer value; private final String code; - private SavingsPeriodFrequencyType(final Integer value, final String code) { + SavingsPeriodFrequencyType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsWithdrawalFeesType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsWithdrawalFeesType.java index b386e77ef..e8b1f8018 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsWithdrawalFeesType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsWithdrawalFeesType.java @@ -30,7 +30,7 @@ public enum SavingsWithdrawalFeesType { private final Integer value; private final String code; - private SavingsWithdrawalFeesType(final Integer value, final String code) { + SavingsWithdrawalFeesType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountStatusType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountStatusType.java index 15e832fa3..1cfdaae9e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountStatusType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountStatusType.java @@ -75,7 +75,7 @@ public enum SavingsAccountStatusType { return enumeration; } - private SavingsAccountStatusType(final Integer value, final String code) { + SavingsAccountStatusType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountSubStatusEnum.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountSubStatusEnum.java index 0a052884d..d43e3a266 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountSubStatusEnum.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountSubStatusEnum.java @@ -60,7 +60,7 @@ public enum SavingsAccountSubStatusEnum { return enumeration; } - private SavingsAccountSubStatusEnum(final Integer value, final String code) { + SavingsAccountSubStatusEnum(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/exception/PostInterestAsOnDateException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/exception/PostInterestAsOnDateException.java index cb785ddde..2c04a93f9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/exception/PostInterestAsOnDateException.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/exception/PostInterestAsOnDateException.java @@ -22,7 +22,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR public class PostInterestAsOnDateException extends AbstractPlatformDomainRuleException { - public static enum PostInterestAsOnExceptionType { + public enum PostInterestAsOnExceptionType { FUTURE_DATE, VALID_DATE, ACTIVATION_DATE, LAST_TRANSACTION_DATE; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformService.java index 85b8d3383..d210d73fd 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformService.java @@ -24,7 +24,6 @@ import org.apache.fineract.portfolio.savings.data.DepositAccountOnHoldTransactio public interface DepositAccountOnHoldTransactionReadPlatformService { - public Page retriveAll(final Long savingsId, final Long guarantorFundingId, - final SearchParameters searchParameters); + Page retriveAll(Long savingsId, Long guarantorFundingId, SearchParameters searchParameters); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java index ca95c893b..0da9ca23d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java @@ -95,7 +95,7 @@ public class DepositAccountOnHoldTransactionReadPlatformServiceImpl implements D private final String schemaSql; - public DepositAccountOnHoldTransactionsMapper() { + DepositAccountOnHoldTransactionsMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append(" tr.id as transactionId, tr.transaction_type_enum as transactionType, "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformService.java index 521271025..38ad12394 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformService.java @@ -29,27 +29,26 @@ import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionData; public interface DepositAccountReadPlatformService { - Collection retrieveAll(final DepositAccountType depositAccountType, - final PaginationParameters paginationParameters); + Collection retrieveAll(DepositAccountType depositAccountType, PaginationParameters paginationParameters); - Page retrieveAllPaged(final DepositAccountType depositAccountType, final PaginationParameters paginationParameters); + Page retrieveAllPaged(DepositAccountType depositAccountType, PaginationParameters paginationParameters); - Collection retrieveAllForLookup(final DepositAccountType depositAccountType); + Collection retrieveAllForLookup(DepositAccountType depositAccountType); - DepositAccountData retrieveOne(final DepositAccountType depositAccountType, Long accountId); + DepositAccountData retrieveOne(DepositAccountType depositAccountType, Long accountId); - DepositAccountData retrieveOneWithClosureTemplate(final DepositAccountType depositAccountType, Long accountId); + DepositAccountData retrieveOneWithClosureTemplate(DepositAccountType depositAccountType, Long accountId); - DepositAccountData retrieveOneWithChartSlabs(final DepositAccountType depositAccountType, Long productId); + DepositAccountData retrieveOneWithChartSlabs(DepositAccountType depositAccountType, Long productId); - Collection retrieveAllTransactions(final DepositAccountType depositAccountType, Long accountId); + Collection retrieveAllTransactions(DepositAccountType depositAccountType, Long accountId); - DepositAccountData retrieveTemplate(final DepositAccountType depositAccountType, Long clientId, Long groupId, Long productId, + DepositAccountData retrieveTemplate(DepositAccountType depositAccountType, Long clientId, Long groupId, Long productId, boolean staffInSelectedOfficeOnly); Collection retrieveForMaturityUpdate(); - SavingsAccountTransactionData retrieveRecurringAccountDepositTransactionTemplate(final Long accountId); + SavingsAccountTransactionData retrieveRecurringAccountDepositTransactionTemplate(Long accountId); Collection retrieveDataForInterestTransfer(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java index c2b0aacf2..1fb523890 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java @@ -766,7 +766,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead private final String schemaSql; - public FixedDepositAccountMapper() { + FixedDepositAccountMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append(super.selectFieldsSql()); @@ -847,7 +847,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead private final String schemaSql; - public RecurringDepositAccountMapper() { + RecurringDepositAccountMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append(this.selectFieldsSql()); @@ -1129,7 +1129,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead public abstract String schema(); @Override - public abstract DepositAccountData mapRow(final ResultSet rs, final int rowNum) throws SQLException; + public abstract DepositAccountData mapRow(ResultSet rs, int rowNum) throws SQLException; public DepositAccountData mapRow(final ResultSet rs) throws SQLException { @@ -1215,7 +1215,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead private final String schemaSql; - public FixedDepositAccountTemplateMapper(final ClientData client, final GroupGeneralData group) { + FixedDepositAccountTemplateMapper(final ClientData client, final GroupGeneralData group) { super(client, group); final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append(super.selectFieldsSql()); @@ -1283,7 +1283,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead private final String schemaSql; - public RecurringDepositAccountTemplateMapper(final ClientData client, final GroupGeneralData group) { + RecurringDepositAccountTemplateMapper(final ClientData client, final GroupGeneralData group) { super(client, group); final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append(this.selectFieldsSql()); @@ -1415,7 +1415,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead private final String schemaSql; - public RecurringAccountDepositTransactionTemplateMapper() { + RecurringAccountDepositTransactionTemplateMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append("sa.id as id, sa.account_no as accountNo, "); sqlBuilder.append( diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountWritePlatformService.java index 3b1386199..fdd5df9bc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountWritePlatformService.java @@ -40,11 +40,11 @@ public interface DepositAccountWritePlatformService { CommandProcessingResult depositToRDAccount(Long savingsId, JsonCommand command); - CommandProcessingResult withdrawal(Long savingsId, JsonCommand command, final DepositAccountType depositAccountType); + CommandProcessingResult withdrawal(Long savingsId, JsonCommand command, DepositAccountType depositAccountType); - CommandProcessingResult calculateInterest(Long savingsId, final DepositAccountType depositAccountType); + CommandProcessingResult calculateInterest(Long savingsId, DepositAccountType depositAccountType); - CommandProcessingResult postInterest(Long savingsId, final DepositAccountType depositAccountType); + CommandProcessingResult postInterest(Long savingsId, DepositAccountType depositAccountType); CommandProcessingResult undoFDTransaction(Long savingsId, Long transactionId, boolean allowAccountTransferModification); @@ -62,32 +62,32 @@ public interface DepositAccountWritePlatformService { CommandProcessingResult prematureCloseRDAccount(Long savingsId, JsonCommand command); - SavingsAccountTransaction initiateSavingsTransfer(Long accountId, LocalDate transferDate, final DepositAccountType depositAccountType); + SavingsAccountTransaction initiateSavingsTransfer(Long accountId, LocalDate transferDate, DepositAccountType depositAccountType); - SavingsAccountTransaction withdrawSavingsTransfer(Long accountId, LocalDate transferDate, final DepositAccountType depositAccountType); + SavingsAccountTransaction withdrawSavingsTransfer(Long accountId, LocalDate transferDate, DepositAccountType depositAccountType); - void rejectSavingsTransfer(Long accountId, final DepositAccountType depositAccountType); + void rejectSavingsTransfer(Long accountId, DepositAccountType depositAccountType); SavingsAccountTransaction acceptSavingsTransfer(Long accountId, LocalDate transferDate, Office acceptedInOffice, Staff staff, - final DepositAccountType depositAccountType); + DepositAccountType depositAccountType); - CommandProcessingResult addSavingsAccountCharge(JsonCommand command, final DepositAccountType depositAccountType); + CommandProcessingResult addSavingsAccountCharge(JsonCommand command, DepositAccountType depositAccountType); - CommandProcessingResult updateSavingsAccountCharge(JsonCommand command, final DepositAccountType depositAccountType); + CommandProcessingResult updateSavingsAccountCharge(JsonCommand command, DepositAccountType depositAccountType); CommandProcessingResult deleteSavingsAccountCharge(Long savingsAccountId, Long savingsAccountChargeId, JsonCommand command, - final DepositAccountType depositAccountType); + DepositAccountType depositAccountType); - CommandProcessingResult waiveCharge(Long savingsAccountId, Long savingsAccountChargeId, final DepositAccountType depositAccountType); + CommandProcessingResult waiveCharge(Long savingsAccountId, Long savingsAccountChargeId, DepositAccountType depositAccountType); CommandProcessingResult payCharge(Long savingsAccountId, Long savingsAccountChargeId, JsonCommand command, - final DepositAccountType depositAccountType); + DepositAccountType depositAccountType); - void applyChargeDue(final Long savingsAccountChargeId, final Long accountId, final DepositAccountType depositAccountType); + void applyChargeDue(Long savingsAccountChargeId, Long accountId, DepositAccountType depositAccountType); - void updateMaturityDetails(final Long depositAccountId, final DepositAccountType depositAccountType); + void updateMaturityDetails(Long depositAccountId, DepositAccountType depositAccountType); void transferInterestToSavings() throws JobExecutionException; - SavingsAccountTransaction mandatorySavingsAccountDeposit(final SavingsAccountTransactionDTO accountTransactionDTO); + SavingsAccountTransaction mandatorySavingsAccountDeposit(SavingsAccountTransactionDTO accountTransactionDTO); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformService.java index e2ae4a3e1..76a8c5937 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformService.java @@ -24,12 +24,12 @@ import org.apache.fineract.portfolio.savings.data.DepositProductData; public interface DepositProductReadPlatformService { - Collection retrieveAll(final DepositAccountType depositAccountType); + Collection retrieveAll(DepositAccountType depositAccountType); - Collection retrieveAllForLookup(final DepositAccountType depositAccountType); + Collection retrieveAllForLookup(DepositAccountType depositAccountType); - DepositProductData retrieveOne(final DepositAccountType depositAccountType, Long productId); + DepositProductData retrieveOne(DepositAccountType depositAccountType, Long productId); - DepositProductData retrieveOneWithChartSlabs(final DepositAccountType depositAccountType, Long productId); + DepositProductData retrieveOneWithChartSlabs(DepositAccountType depositAccountType, Long productId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java index e6822a47a..d542d5532 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java @@ -222,7 +222,7 @@ public class DepositProductReadPlatformServiceImpl implements DepositProductRead private final String schemaSql; - public FixedDepositProductMapper() { + FixedDepositProductMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append(super.schema()); sqlBuilder.append(", dptp.pre_closure_penal_applicable as preClosurePenalApplicable, "); @@ -286,7 +286,7 @@ public class DepositProductReadPlatformServiceImpl implements DepositProductRead private final String schemaSql; - public RecurringDepositProductMapper() { + RecurringDepositProductMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append(super.schema()); sqlBuilder.append(", dptp.pre_closure_penal_applicable as preClosurePenalApplicable, "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/GSIMReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/GSIMReadPlatformServiceImpl.java index ca6d4f2bd..3c45ed7fa 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/GSIMReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/GSIMReadPlatformServiceImpl.java @@ -245,7 +245,7 @@ public class GSIMReadPlatformServiceImpl implements GSIMReadPlatformService { final String schemaSql; - public SavingsAccountSummaryDataMapper() { + SavingsAccountSummaryDataMapper() { final StringBuilder accountsSummary = new StringBuilder(); accountsSummary.append( "sa.id as id, CONCAT('(',clnt.id,') ',clnt.display_name) as displayName,sa.account_no as accountNo, sa.external_id as externalId, sa.gsim_id as gsimId,gsim.account_number as parentAccountNo,sa.status_enum as statusEnum, "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountChargeReadPlatformServiceImpl.java index cf4bd2bb7..52d627d7b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountChargeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountChargeReadPlatformServiceImpl.java @@ -205,7 +205,7 @@ public class SavingsAccountChargeReadPlatformServiceImpl implements SavingsAccou private final String schemaSql; - public SavingsAccountChargeDueMapper() { + SavingsAccountChargeDueMapper() { final StringBuilder sqlBuilder = new StringBuilder(200); sqlBuilder.append("sac.id as id, "); sqlBuilder.append("sa.id as accountId, "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformService.java index 7cf7ed6d9..379b6d287 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformService.java @@ -35,8 +35,7 @@ public interface SavingsAccountReadPlatformService { Collection retrieveActiveForLookup(Long clientId, DepositAccountType depositAccountType); - public Collection retrieveActiveForLookup(final Long clientId, DepositAccountType depositAccountType, - String currencyCode); + Collection retrieveActiveForLookup(Long clientId, DepositAccountType depositAccountType, String currencyCode); SavingsAccountData retrieveOne(Long savingsId); @@ -59,8 +58,7 @@ public interface SavingsAccountReadPlatformService { List retrieveSavingsIdsPendingEscheat(LocalDate tenantLocalDate); - boolean isAccountBelongsToClient(final Long clientId, final Long accountId, final DepositAccountType depositAccountType, - final String currencyCode); + boolean isAccountBelongsToClient(Long clientId, Long accountId, DepositAccountType depositAccountType, String currencyCode); String retrieveAccountNumberByAccountId(Long accountId); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java index 018246aaa..bc1cad8b4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java @@ -235,7 +235,7 @@ public class SavingsAccountReadPlatformServiceImpl implements SavingsAccountRead private final String schemaSql; - public SavingAccountMapper() { + SavingAccountMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append("sa.id as id, sa.account_no as accountNo, sa.external_id as externalId, "); sqlBuilder.append("sa.deposit_type_enum as depositType, "); @@ -558,7 +558,7 @@ public class SavingsAccountReadPlatformServiceImpl implements SavingsAccountRead private final String schemaSql; - public SavingAccountMapperForLookup() { + SavingAccountMapperForLookup() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append("sa.id as id, sa.account_no as accountNo, "); sqlBuilder.append("sa.deposit_type_enum as depositType, "); @@ -773,7 +773,7 @@ public class SavingsAccountReadPlatformServiceImpl implements SavingsAccountRead private final String schemaSql; - public SavingsAccountTransactionsMapper() { + SavingsAccountTransactionsMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append("tr.id as transactionId, tr.transaction_type_enum as transactionType, "); @@ -887,7 +887,7 @@ public class SavingsAccountReadPlatformServiceImpl implements SavingsAccountRead private final String schemaSql; - public SavingsAccountTransactionTemplateMapper() { + SavingsAccountTransactionTemplateMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append("sa.id as id, sa.account_no as accountNo, "); sqlBuilder.append( @@ -931,7 +931,7 @@ public class SavingsAccountReadPlatformServiceImpl implements SavingsAccountRead private final String schemaSql; - public SavingAccountTemplateMapper(final ClientData client, final GroupGeneralData group) { + SavingAccountTemplateMapper(final ClientData client, final GroupGeneralData group) { this.client = client; this.group = group; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformService.java index 343a38815..30832edf3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformService.java @@ -36,7 +36,7 @@ public interface SavingsAccountWritePlatformService { CommandProcessingResult withdrawal(Long savingsId, JsonCommand command); - CommandProcessingResult applyAnnualFee(final Long savingsAccountChargeId, final Long accountId); + CommandProcessingResult applyAnnualFee(Long savingsAccountChargeId, Long accountId); CommandProcessingResult calculateInterest(Long savingsId); @@ -70,7 +70,7 @@ public interface SavingsAccountWritePlatformService { CommandProcessingResult unassignFieldOfficer(Long savingsAccountId, JsonCommand command); - void applyChargeDue(final Long savingsAccountChargeId, final Long accountId); + void applyChargeDue(Long savingsAccountChargeId, Long accountId); void processPostActiveActions(SavingsAccount account, DateTimeFormatter fmt, Set existingTransactionIds, Set existingReversedTransactionIds); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java index 1ad34a1df..8482c9252 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java @@ -108,7 +108,7 @@ public class SavingsProductReadPlatformServiceImpl implements SavingsProductRead private final String schemaSql; - public SavingProductMapper() { + SavingProductMapper() { final StringBuilder sqlBuilder = new StringBuilder(400); sqlBuilder.append("sp.id as id, sp.name as name, sp.short_name as shortName, sp.description as description, "); sqlBuilder.append( diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java index ebfcdfc38..f5d6a7a74 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java @@ -23,7 +23,7 @@ import java.util.Set; public class SearchConstants { - public static enum SearchResponseParameters { + public enum SearchResponseParameters { ENTITY_ID("entityId"), ENTITY_ACCOUNT_NO("entityAccountNo"), ENTITY_EXTERNAL_ID("entityExternalId"), ENTITY_NAME( "entityName"), ENTITY_TYPE("entityType"), PARENT_ID( @@ -31,7 +31,7 @@ public class SearchConstants { private final String value; - private SearchResponseParameters(final String value) { + SearchResponseParameters(String value) { this.value = value; } @@ -56,13 +56,13 @@ public class SearchConstants { } } - public static enum SearchSupportedParameters { + public enum SearchSupportedParameters { QUERY("query"), RESOURCE("resource"), EXACTMATCH("exactMatch"); private final String value; - private SearchSupportedParameters(final String value) { + SearchSupportedParameters(final String value) { this.value = value; } @@ -87,13 +87,13 @@ public class SearchConstants { } } - public static enum SearchSupportedResources { + public enum SearchSupportedResources { CLIENTS("clients"), GROUPS("groups"), LOANS("loans"), SAVINGS("savings"), SHARES("shares"), CLIENTIDENTIFIERS("clientIdentifiers"); private final String value; - private SearchSupportedResources(final String value) { + SearchSupportedResources(final String value) { this.value = value; } @@ -118,13 +118,13 @@ public class SearchConstants { } } - public static enum SearchLoanDate { + public enum SearchLoanDate { APPROVAL_DATE("approvalDate"), CREATED_DATE("createdDate"), DISBURSAL_DATE("disbursalDate"); private final String value; - private SearchLoanDate(final String value) { + SearchLoanDate(final String value) { this.value = value; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/data/AdHocQuerySearchConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/data/AdHocQuerySearchConstants.java index efd963935..855a3f1f9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/data/AdHocQuerySearchConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/data/AdHocQuerySearchConstants.java @@ -23,39 +23,39 @@ import java.util.List; public interface AdHocQuerySearchConstants { - public static final String AD_HOC_SEARCH_QUERY_RESOURCE_NAME = "adHocQuery"; + String AD_HOC_SEARCH_QUERY_RESOURCE_NAME = "adHocQuery"; - public static final String localeParamName = "locale"; - public static final String dateFormatParamName = "dateFormat"; - public static final String entitiesParamName = "entities"; - public static final String loanStatusParamName = "loanStatus"; - public static final String loanProductsParamName = "loanProducts"; - public static final String officesParamName = "offices"; - public static final String loanDateOptionParamName = "loanDateOption"; - public static final String loanFromDateParamName = "loanFromDate"; - public static final String loanToDateParamName = "loanToDate"; - public static final String includeOutStandingAmountPercentageParamName = "includeOutStandingAmountPercentage"; - public static final String outStandingAmountPercentageConditionParamName = "outStandingAmountPercentageCondition"; - public static final String minOutStandingAmountPercentageParamName = "minOutStandingAmountPercentage"; - public static final String maxOutStandingAmountPercentageParamName = "maxOutStandingAmountPercentage"; - public static final String outStandingAmountPercentageParamName = "outStandingAmountPercentage"; - public static final String includeOutstandingAmountParamName = "includeOutstandingAmount"; - public static final String outstandingAmountConditionParamName = "outstandingAmountCondition"; - public static final String minOutstandingAmountParamName = "minOutstandingAmount"; - public static final String maxOutstandingAmountParamName = "maxOutstandingAmount"; - public static final String outstandingAmountParamName = "outstandingAmount"; + String localeParamName = "locale"; + String dateFormatParamName = "dateFormat"; + String entitiesParamName = "entities"; + String loanStatusParamName = "loanStatus"; + String loanProductsParamName = "loanProducts"; + String officesParamName = "offices"; + String loanDateOptionParamName = "loanDateOption"; + String loanFromDateParamName = "loanFromDate"; + String loanToDateParamName = "loanToDate"; + String includeOutStandingAmountPercentageParamName = "includeOutStandingAmountPercentage"; + String outStandingAmountPercentageConditionParamName = "outStandingAmountPercentageCondition"; + String minOutStandingAmountPercentageParamName = "minOutStandingAmountPercentage"; + String maxOutStandingAmountPercentageParamName = "maxOutStandingAmountPercentage"; + String outStandingAmountPercentageParamName = "outStandingAmountPercentage"; + String includeOutstandingAmountParamName = "includeOutstandingAmount"; + String outstandingAmountConditionParamName = "outstandingAmountCondition"; + String minOutstandingAmountParamName = "minOutstandingAmount"; + String maxOutstandingAmountParamName = "maxOutstandingAmount"; + String outstandingAmountParamName = "outstandingAmount"; - public static final String approvalDateOption = "approvalDate"; - public static final String createDateOption = "createdDate"; - public static final String disbursalDateOption = "disbursalDate"; + String approvalDateOption = "approvalDate"; + String createDateOption = "createdDate"; + String disbursalDateOption = "disbursalDate"; - public static final String allLoanStatusOption = "all"; - public static final String activeLoanStatusOption = "active"; - public static final String overpaidLoanStatusOption = "overpaid"; - public static final String arrearsLoanStatusOption = "arrears"; - public static final String closedLoanStatusOption = "closed"; - public static final String writeoffLoanStatusOption = "writeoff"; + String allLoanStatusOption = "all"; + String activeLoanStatusOption = "active"; + String overpaidLoanStatusOption = "overpaid"; + String arrearsLoanStatusOption = "arrears"; + String closedLoanStatusOption = "closed"; + String writeoffLoanStatusOption = "writeoff"; - public static final List entityTypeOptions = List.copyOf(Arrays.asList("clients", "groups", "loans", "clientIdentifiers")); + List entityTypeOptions = List.copyOf(Arrays.asList("clients", "groups", "loans", "clientIdentifiers")); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfBeneficiariesTPTApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfBeneficiariesTPTApiConstants.java index 7b527ffc9..d03f047fc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfBeneficiariesTPTApiConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfBeneficiariesTPTApiConstants.java @@ -20,16 +20,16 @@ package org.apache.fineract.portfolio.self.account.api; public interface SelfBeneficiariesTPTApiConstants { - public static final String BENEFICIARY_ENTITY_NAME = "SSBENEFICIARYTPT"; - public static final String RESOURCE_NAME = "beneficiary"; - public static final String LOCALE = "locale"; - public static final String NAME_PARAM_NAME = "name"; - public static final String OFFICE_NAME_PARAM_NAME = "officeName"; - public static final String ACCOUNT_TYPE_PARAM_NAME = "accountType"; - public static final String ACCOUNT_NUMBER_PARAM_NAME = "accountNumber"; - public static final String TRANSFER_LIMIT_PARAM_NAME = "transferLimit"; + String BENEFICIARY_ENTITY_NAME = "SSBENEFICIARYTPT"; + String RESOURCE_NAME = "beneficiary"; + String LOCALE = "locale"; + String NAME_PARAM_NAME = "name"; + String OFFICE_NAME_PARAM_NAME = "officeName"; + String ACCOUNT_TYPE_PARAM_NAME = "accountType"; + String ACCOUNT_NUMBER_PARAM_NAME = "accountNumber"; + String TRANSFER_LIMIT_PARAM_NAME = "transferLimit"; - public static final String ID_PARAM_NAME = "id"; - public static final String CLIENT_NAME_PARAM_NAME = "clientName"; - public static final String ACCOUNT_TYPE_OPTIONS_PARAM_NAME = "accountTypeOptions"; + String ID_PARAM_NAME = "id"; + String CLIENT_NAME_PARAM_NAME = "clientName"; + String ACCOUNT_TYPE_OPTIONS_PARAM_NAME = "accountTypeOptions"; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTReadPlatformServiceImpl.java index 2dd1a1278..a6f33da4d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTReadPlatformServiceImpl.java @@ -66,7 +66,7 @@ public class SelfBeneficiariesTPTReadPlatformServiceImpl implements SelfBenefici private final String schemaSql; - public BeneficiaryMapper() { + BeneficiaryMapper() { final StringBuilder sqlBuilder = new StringBuilder("(select b.id as id, "); sqlBuilder.append(" b.name as name, "); sqlBuilder.append(" o.name as officeName, "); @@ -124,7 +124,7 @@ public class SelfBeneficiariesTPTReadPlatformServiceImpl implements SelfBenefici private final String schemaSql; - public AccountTemplateMapper() { + AccountTemplateMapper() { final StringBuilder sqlBuilder = new StringBuilder("(select o.name as officeName, "); sqlBuilder.append(" o.id as officeId, "); sqlBuilder.append(" c.display_name as clientName, "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadService.java index 319966782..b63108c43 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadService.java @@ -20,8 +20,8 @@ package org.apache.fineract.portfolio.self.client.service; public interface AppuserClientMapperReadService { - public Boolean isClientMappedToUser(Long clientId, Long appUserId); + Boolean isClientMappedToUser(Long clientId, Long appUserId); - public void validateAppuserClientsMapping(final Long clientId); + void validateAppuserClientsMapping(Long clientId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/service/AppuserLoansMapperReadService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/service/AppuserLoansMapperReadService.java index 0b28723fb..a4bbd7360 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/service/AppuserLoansMapperReadService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/service/AppuserLoansMapperReadService.java @@ -20,5 +20,5 @@ package org.apache.fineract.portfolio.self.loanaccount.service; public interface AppuserLoansMapperReadService { - public Boolean isLoanMappedToUser(Long loanId, Long appUserId); + Boolean isLoanMappedToUser(Long loanId, Long appUserId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/domain/SelfServiceRegistrationRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/domain/SelfServiceRegistrationRepository.java index 45693c825..92029a8a1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/domain/SelfServiceRegistrationRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/domain/SelfServiceRegistrationRepository.java @@ -26,7 +26,7 @@ import org.springframework.data.repository.query.Param; public interface SelfServiceRegistrationRepository extends JpaRepository, JpaSpecificationExecutor { - public static final String FIND_BY_REQUEST_AND_AUTHENTICATION_TOKEN = "select request from SelfServiceRegistration request where request.id = :id and " + String FIND_BY_REQUEST_AND_AUTHENTICATION_TOKEN = "select request from SelfServiceRegistration request where request.id = :id and " + "request.authenticationToken = :authenticationToken"; @Query(FIND_BY_REQUEST_AND_AUTHENTICATION_TOKEN) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationReadPlatformService.java index 9ff45b47b..6ba5860a6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationReadPlatformService.java @@ -20,7 +20,6 @@ package org.apache.fineract.portfolio.self.registration.service; public interface SelfServiceRegistrationReadPlatformService { - public boolean isClientExist(String accountNumber, String firstName, String lastName, String mobileNumber, - boolean isEmailAuthenticationMode); + boolean isClientExist(String accountNumber, String firstName, String lastName, String mobileNumber, boolean isEmailAuthenticationMode); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationWritePlatformService.java index 7827c447a..48abe1163 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationWritePlatformService.java @@ -23,7 +23,7 @@ import org.apache.fineract.useradministration.domain.AppUser; public interface SelfServiceRegistrationWritePlatformService { - public SelfServiceRegistration createRegistrationRequest(String apiRequestBodyAsJson); + SelfServiceRegistration createRegistrationRequest(String apiRequestBodyAsJson); - public AppUser createUser(String apiRequestBodyAsJson); + AppUser createUser(String apiRequestBodyAsJson); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/service/AppuserSavingsMapperReadService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/service/AppuserSavingsMapperReadService.java index c8693f543..fd55f694d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/service/AppuserSavingsMapperReadService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/service/AppuserSavingsMapperReadService.java @@ -20,6 +20,6 @@ package org.apache.fineract.portfolio.self.savings.service; public interface AppuserSavingsMapperReadService { - public Boolean isSavingsMappedToUser(Long savingsId, Long appUserId); + Boolean isSavingsMappedToUser(Long savingsId, Long appUserId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/service/AppUserShareAccountsMapperReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/service/AppUserShareAccountsMapperReadPlatformService.java index c0cd875bc..9b6b8cbba 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/service/AppUserShareAccountsMapperReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/service/AppUserShareAccountsMapperReadPlatformService.java @@ -21,6 +21,6 @@ package org.apache.fineract.portfolio.self.shareaccounts.service; public interface AppUserShareAccountsMapperReadPlatformService { - public Boolean isShareAccountsMappedToUser(Long accountId, Long appUserId); + Boolean isShareAccountsMappedToUser(Long accountId, Long appUserId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/PurchasedSharesStatusType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/PurchasedSharesStatusType.java index 3977d8a08..08dc59ee9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/PurchasedSharesStatusType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/PurchasedSharesStatusType.java @@ -27,7 +27,7 @@ public enum PurchasedSharesStatusType { private final Integer value; private final String code; - private PurchasedSharesStatusType(final Integer value, final String code) { + PurchasedSharesStatusType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountDividendStatusType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountDividendStatusType.java index 99b03c89b..7fab7abea 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountDividendStatusType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountDividendStatusType.java @@ -26,7 +26,7 @@ public enum ShareAccountDividendStatusType { private final Integer value; private final String code; - private ShareAccountDividendStatusType(final Integer value, final String code) { + ShareAccountDividendStatusType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountStatusType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountStatusType.java index cebb40a2a..dd93a401b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountStatusType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountStatusType.java @@ -56,7 +56,7 @@ public enum ShareAccountStatusType { return enumeration; } - private ShareAccountStatusType(final Integer value, final String code) { + ShareAccountStatusType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformService.java index 55c177c24..8f58bc14b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformService.java @@ -23,5 +23,5 @@ import org.apache.fineract.portfolio.shareaccounts.data.ShareAccountTransactionD public interface PurchasedSharesReadPlatformService { - public Collection retrievePurchasedShares(final Long accountId); + Collection retrievePurchasedShares(Long accountId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java index 2c58ac0b8..fdc300f80 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java @@ -53,7 +53,7 @@ public class PurchasedSharesReadPlatformServiceImpl implements PurchasedSharesRe private final String schema; - public PurchasedSharesDataRowMapper() { + PurchasedSharesDataRowMapper() { StringBuilder buff = new StringBuilder() .append("saps.id, saps.account_id, saps.transaction_date, saps.total_shares, saps.unit_price, ") .append("saps.status_enum, saps.type_enum, saps.amount, saps.charge_amount as chargeamount, ") diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformService.java index 3c49f6429..501008aaf 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformService.java @@ -23,5 +23,5 @@ import org.apache.fineract.portfolio.shareaccounts.data.ShareAccountChargeData; public interface ShareAccountChargeReadPlatformService { - Collection retrieveAccountCharges(final Long accountId, final String status); + Collection retrieveAccountCharges(Long accountId, String status); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java index 350d24db9..8de0cf6de 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java @@ -63,7 +63,7 @@ public class ShareAccountChargeReadPlatformServiceImpl implements ShareAccountCh private final String schema; - public ShareAccountChargeMapper() { + ShareAccountChargeMapper() { StringBuilder buff = new StringBuilder().append("sc.id as id, c.id as chargeId, sc.account_id as accountId, c.name as name, ") .append("sc.amount as amountDue, sc.amount_paid_derived as amountPaid, ") .append("sc.amount_waived_derived as amountWaived, sc.amount_writtenoff_derived as amountWrittenOff, ") diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountDividendReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountDividendReadPlatformServiceImpl.java index 2db6cd0a7..155fb2aa9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountDividendReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountDividendReadPlatformServiceImpl.java @@ -108,7 +108,7 @@ public class ShareAccountDividendReadPlatformServiceImpl implements ShareAccount private final String sql; - public ShareAccountDividendMapper() { + ShareAccountDividendMapper() { StringBuilder sb = new StringBuilder(); sb.append(" sadd.id as id, sadd.amount as amount,"); sb.append(" sadd.status as status, sadd.savings_transaction_id as savingsTransactionId,"); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformService.java index 828bca31a..92d11bb38 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformService.java @@ -27,13 +27,13 @@ import org.joda.time.LocalDate; public interface ShareAccountReadPlatformService extends AccountReadPlatformService { @Override - public ShareAccountData retrieveTemplate(final Long clientId, final Long productId); + ShareAccountData retrieveTemplate(Long clientId, Long productId); @Override - public ShareAccountData retrieveOne(Long id, boolean includeTemplate); + ShareAccountData retrieveOne(Long id, boolean includeTemplate); @Override - public Set getResponseDataParams(); + Set getResponseDataParams(); Collection retrieveAllShareAccountDataForDividends(Long productId, boolean fetchInActiveAccounts, LocalDate startDate); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java index 75a9daa4e..691495ff7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java @@ -251,7 +251,7 @@ public class ShareAccountReadPlatformServiceImpl implements ShareAccountReadPlat private final String schema; - public ShareAccountMapper(final Collection charges, + ShareAccountMapper(final Collection charges, final Collection purchasedShares) { this.charges = charges; this.purchasedShares = purchasedShares; @@ -379,7 +379,7 @@ public class ShareAccountReadPlatformServiceImpl implements ShareAccountReadPlat private final String schema; final PurchasedSharesDataRowMapper purchasedSharesDataRowMapper = new PurchasedSharesDataRowMapper(); - public ShareAccountMapperForDividents() { + ShareAccountMapperForDividents() { StringBuilder sb = new StringBuilder(); sb.append("sa.id as id, sa.status_enum as statusEnum, "); @@ -443,7 +443,7 @@ public class ShareAccountReadPlatformServiceImpl implements ShareAccountReadPlat private final String schema; - public PurchasedSharesDataRowMapper() { + PurchasedSharesDataRowMapper() { StringBuilder buff = new StringBuilder().append( "saps.id as purchasedId, saps.account_id as accountId, saps.transaction_date as transactionDate, saps.total_shares as purchasedShares, saps.unit_price as unitPrice, ") .append("saps.status_enum as purchaseStatus, saps.type_enum as purchaseType, saps.amount as amount, saps.charge_amount as chargeamount, ") diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountSchedularService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountSchedularService.java index 08abc8add..c73d855c7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountSchedularService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountSchedularService.java @@ -20,6 +20,6 @@ package org.apache.fineract.portfolio.shareaccounts.service; public interface ShareAccountSchedularService { - void postDividend(final Long dividendDetailId, final Long savingsId); + void postDividend(Long dividendDetailId, Long savingsId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformService.java index 8ceef4eed..b36109106 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformService.java @@ -23,25 +23,25 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; public interface ShareAccountWritePlatformService { - public CommandProcessingResult createShareAccount(JsonCommand jsonCommand); + CommandProcessingResult createShareAccount(JsonCommand jsonCommand); - public CommandProcessingResult updateShareAccount(Long accountId, JsonCommand jsonCommand); + CommandProcessingResult updateShareAccount(Long accountId, JsonCommand jsonCommand); - public CommandProcessingResult approveShareAccount(Long accountId, JsonCommand jsonCommand); + CommandProcessingResult approveShareAccount(Long accountId, JsonCommand jsonCommand); - public CommandProcessingResult activateShareAccount(Long accountId, JsonCommand jsonCommand); + CommandProcessingResult activateShareAccount(Long accountId, JsonCommand jsonCommand); - public CommandProcessingResult rejectShareAccount(Long entityId, JsonCommand jsonCommand); + CommandProcessingResult rejectShareAccount(Long entityId, JsonCommand jsonCommand); - public CommandProcessingResult undoApproveShareAccount(Long entityId, JsonCommand jsonCommand); + CommandProcessingResult undoApproveShareAccount(Long entityId, JsonCommand jsonCommand); - public CommandProcessingResult closeShareAccount(Long accountId, JsonCommand jsonCommand); + CommandProcessingResult closeShareAccount(Long accountId, JsonCommand jsonCommand); - public CommandProcessingResult applyAddtionalShares(final Long accountId, JsonCommand jsonCommand); + CommandProcessingResult applyAddtionalShares(Long accountId, JsonCommand jsonCommand); - public CommandProcessingResult approveAdditionalShares(Long accountId, JsonCommand jsonCommand); + CommandProcessingResult approveAdditionalShares(Long accountId, JsonCommand jsonCommand); - public CommandProcessingResult rejectAdditionalShares(Long accountId, JsonCommand jsonCommand); + CommandProcessingResult rejectAdditionalShares(Long accountId, JsonCommand jsonCommand); - public CommandProcessingResult redeemShares(Long accountId, JsonCommand jsonCommand); + CommandProcessingResult redeemShares(Long accountId, JsonCommand jsonCommand); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/SharePeriodFrequencyType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/SharePeriodFrequencyType.java index 65cbfe1c3..2506ee6f7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/SharePeriodFrequencyType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/SharePeriodFrequencyType.java @@ -35,7 +35,7 @@ public enum SharePeriodFrequencyType { private final Integer value; private final String code; - private SharePeriodFrequencyType(final Integer value, final String code) { + SharePeriodFrequencyType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/constants/ShareProductApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/constants/ShareProductApiConstants.java index 2fc7e45b9..3819ab94e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/constants/ShareProductApiConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/constants/ShareProductApiConstants.java @@ -21,9 +21,9 @@ package org.apache.fineract.portfolio.shareproducts.constants; public interface ShareProductApiConstants { // Command Strings - public final String PREIEW_DIVIDENDS_COMMAND_STRING = "previewdividends"; - public final String POST_DIVIDENdS_COMMAND_STRING = "postdividends"; - public final String SHARE_PRODUCT_RESOURCE_NAME = "shareproduct"; + String PREIEW_DIVIDENDS_COMMAND_STRING = "previewdividends"; + String POST_DIVIDENdS_COMMAND_STRING = "postdividends"; + String SHARE_PRODUCT_RESOURCE_NAME = "shareproduct"; String locale_paramname = "locale"; String dateFormatParamName = "dateFormat"; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/domain/ShareProductDividendStatusType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/domain/ShareProductDividendStatusType.java index 4edaf48e5..21c7e05be 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/domain/ShareProductDividendStatusType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/domain/ShareProductDividendStatusType.java @@ -26,7 +26,7 @@ public enum ShareProductDividendStatusType { private final Integer value; private final String code; - private ShareProductDividendStatusType(final Integer value, final String code) { + ShareProductDividendStatusType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDividendReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDividendReadPlatformServiceImpl.java index 56ae976a3..5a0b8d2a6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDividendReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDividendReadPlatformServiceImpl.java @@ -95,7 +95,7 @@ public class ShareProductDividendReadPlatformServiceImpl implements ShareProduct private final String sql; - public ShareProductDividendMapper() { + ShareProductDividendMapper() { StringBuilder sb = new StringBuilder(); sb.append(" pod.id as id, pod.amount as amount,"); sb.append(" pod.status as status, pod.dividend_period_start_date as startDate,"); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxApiConstants.java index d44b5fe72..ee8e78f5f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxApiConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxApiConstants.java @@ -20,19 +20,19 @@ package org.apache.fineract.portfolio.tax.api; public interface TaxApiConstants { - public static final String nameParamName = "name"; - public static final String percentageParamName = "percentage"; - public static final String debitAccountTypeParamName = "debitAccountType"; - public static final String debitAcountIdParamName = "debitAcountId"; - public static final String creditAccountTypeParamName = "creditAccountType"; - public static final String creditAcountIdParamName = "creditAcountId"; + String nameParamName = "name"; + String percentageParamName = "percentage"; + String debitAccountTypeParamName = "debitAccountType"; + String debitAcountIdParamName = "debitAcountId"; + String creditAccountTypeParamName = "creditAccountType"; + String creditAcountIdParamName = "creditAcountId"; - public static final String startDateParamName = "startDate"; - public static final String endDateParamName = "endDate"; + String startDateParamName = "startDate"; + String endDateParamName = "endDate"; - public static final String chargeIncludesTaxParamName = "chargeIncludesTax"; - public static final String taxComponentsParamName = "taxComponents"; - public static final String idParamName = "id"; - public static final String taxComponentIdParamName = "taxComponentId"; + String chargeIncludesTaxParamName = "chargeIncludesTax"; + String taxComponentsParamName = "taxComponents"; + String idParamName = "id"; + String taxComponentIdParamName = "taxComponentId"; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformService.java index 120aaa2ab..9ec3c8958 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformService.java @@ -24,15 +24,15 @@ import org.apache.fineract.portfolio.tax.data.TaxGroupData; public interface TaxReadPlatformService { - public TaxComponentData retrieveTaxComponentData(final Long id); + TaxComponentData retrieveTaxComponentData(Long id); - public TaxComponentData retrieveTaxComponentTemplate(); + TaxComponentData retrieveTaxComponentTemplate(); - public TaxGroupData retrieveTaxGroupData(final Long id); + TaxGroupData retrieveTaxGroupData(Long id); - public TaxGroupData retrieveTaxGroupWithTemplate(final Long id); + TaxGroupData retrieveTaxGroupWithTemplate(Long id); - public TaxGroupData retrieveTaxGroupTemplate(); + TaxGroupData retrieveTaxGroupTemplate(); Collection retrieveAllTaxComponents(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformServiceImpl.java index a8c138794..753ba05c5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformServiceImpl.java @@ -115,7 +115,7 @@ public class TaxReadPlatformServiceImpl implements TaxReadPlatformService { private final String schema; private TaxComponentHistoryDataMapper componentHistoryDataMapper = new TaxComponentHistoryDataMapper(); - public TaxComponentMapper() { + TaxComponentMapper() { StringBuilder sb = new StringBuilder(); sb.append("tc.id as id, tc.name as name,"); sb.append("tc.percentage as percentage, tc.start_date as startDate,"); @@ -202,7 +202,7 @@ public class TaxReadPlatformServiceImpl implements TaxReadPlatformService { private final String schema; private final TaxGroupMappingsDataMapper taxGroupMappingsDataMapper = new TaxGroupMappingsDataMapper(); - public TaxGroupMapper() { + TaxGroupMapper() { StringBuilder sb = new StringBuilder(); sb.append("tg.id as id, tg.name as name,"); sb.append("tgm.id as mappingId,"); @@ -257,7 +257,7 @@ public class TaxReadPlatformServiceImpl implements TaxReadPlatformService { private final String schema; - public TaxComponentLookUpMapper() { + TaxComponentLookUpMapper() { StringBuilder sb = new StringBuilder(); sb.append("tc.id as id, tc.name as name "); sb.append(" from m_tax_component tc "); @@ -281,7 +281,7 @@ public class TaxReadPlatformServiceImpl implements TaxReadPlatformService { private final String schema; - public TaxGroupLookUpMapper() { + TaxGroupLookUpMapper() { StringBuilder sb = new StringBuilder(); sb.append("tg.id as id, tg.name as name "); sb.append(" from m_tax_group tg "); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxWritePlatformService.java index 950b62b1f..0d96b18fa 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxWritePlatformService.java @@ -23,12 +23,12 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; public interface TaxWritePlatformService { - public CommandProcessingResult createTaxComponent(JsonCommand command); + CommandProcessingResult createTaxComponent(JsonCommand command); - public CommandProcessingResult updateTaxComponent(final Long id, final JsonCommand command); + CommandProcessingResult updateTaxComponent(Long id, JsonCommand command); - public CommandProcessingResult createTaxGroup(JsonCommand command); + CommandProcessingResult createTaxGroup(JsonCommand command); - public CommandProcessingResult updateTaxGroup(final Long id, final JsonCommand command); + CommandProcessingResult updateTaxGroup(Long id, JsonCommand command); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/exception/TransferNotSupportedException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/exception/TransferNotSupportedException.java index 317bf1cf6..bbbf56b0d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/exception/TransferNotSupportedException.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/exception/TransferNotSupportedException.java @@ -26,7 +26,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR public class TransferNotSupportedException extends AbstractPlatformDomainRuleException { /*** enum of reasons for invalid Journal Entry **/ - public static enum TransferNotSupportedReason { + public enum TransferNotSupportedReason { CLIENT_DESTINATION_GROUP_NOT_SPECIFIED, CLIENT_BELONGS_TO_MULTIPLE_GROUPS, SOURCE_AND_DESTINATION_GROUP_CANNOT_BE_SAME, ACTIVE_SAVINGS_ACCOUNT, BULK_CLIENT_TRANSFER_ACROSS_BRANCHES, DESTINATION_GROUP_MEETING_FREQUENCY_MISMATCH, DESTINATION_GROUP_HAS_NO_MEETING; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/service/TransferEventType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/service/TransferEventType.java index 5c6b6c6a1..6e5377d00 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/service/TransferEventType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/service/TransferEventType.java @@ -26,7 +26,7 @@ public enum TransferEventType { private final Integer value; private final String code; - private TransferEventType(final Integer value, final String code) { + TransferEventType(final Integer value, final String code) { this.value = value; this.code = code; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/service/TransferWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/service/TransferWritePlatformService.java index 59483abc9..9d418e5ad 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/service/TransferWritePlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/service/TransferWritePlatformService.java @@ -23,16 +23,16 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; public interface TransferWritePlatformService { - CommandProcessingResult transferClientsBetweenGroups(final Long sourceGroupId, final JsonCommand jsonCommand); + CommandProcessingResult transferClientsBetweenGroups(Long sourceGroupId, JsonCommand jsonCommand); - CommandProcessingResult proposeClientTransfer(final Long clientId, final JsonCommand jsonCommand); + CommandProcessingResult proposeClientTransfer(Long clientId, JsonCommand jsonCommand); - CommandProcessingResult withdrawClientTransfer(final Long clientId, final JsonCommand jsonCommand); + CommandProcessingResult withdrawClientTransfer(Long clientId, JsonCommand jsonCommand); - CommandProcessingResult acceptClientTransfer(final Long clientId, final JsonCommand jsonCommand); + CommandProcessingResult acceptClientTransfer(Long clientId, JsonCommand jsonCommand); - CommandProcessingResult rejectClientTransfer(final Long clientId, final JsonCommand jsonCommand); + CommandProcessingResult rejectClientTransfer(Long clientId, JsonCommand jsonCommand); - CommandProcessingResult proposeAndAcceptClientTransfer(final Long clientId, final JsonCommand jsonCommand); + CommandProcessingResult proposeAndAcceptClientTransfer(Long clientId, JsonCommand jsonCommand); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/spm/repository/LookupTableRepository.java b/fineract-provider/src/main/java/org/apache/fineract/spm/repository/LookupTableRepository.java index 2004c20c5..698b700a3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/spm/repository/LookupTableRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/spm/repository/LookupTableRepository.java @@ -25,7 +25,7 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface LookupTableRepository extends JpaRepository { - List findBySurvey(final Survey survey); + List findBySurvey(Survey survey); - List findByKey(final String spmKey); + List findByKey(String spmKey); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/spm/repository/ScorecardRepository.java b/fineract-provider/src/main/java/org/apache/fineract/spm/repository/ScorecardRepository.java index c51bdcab4..94e36e944 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/spm/repository/ScorecardRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/spm/repository/ScorecardRepository.java @@ -26,7 +26,7 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface ScorecardRepository extends JpaRepository { - List findBySurvey(final Survey survey); + List findBySurvey(Survey survey); - List findBySurveyAndClient(final Survey survey, final Client client); + List findBySurveyAndClient(Survey survey, Client client); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/spm/repository/SurveyRepository.java b/fineract-provider/src/main/java/org/apache/fineract/spm/repository/SurveyRepository.java index 6b9085706..13d390ac6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/spm/repository/SurveyRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/spm/repository/SurveyRepository.java @@ -28,11 +28,11 @@ import org.springframework.data.repository.query.Param; public interface SurveyRepository extends JpaRepository { @Query("select s from Survey s where :pointInTime between s.validFrom and s.validTo") - List fetchActiveSurveys(@Param("pointInTime") final Date pointInTime); + List fetchActiveSurveys(@Param("pointInTime") Date pointInTime); @Query("select s from Survey s ") List fetchAllSurveys(); @Query("select s from Survey s where s.key = :key and :pointInTime between s.validFrom and s.validTo") - Survey findByKey(@Param("key") final String key, @Param("pointInTime") final Date pointInTime); + Survey findByKey(@Param("key") String key, @Param("pointInTime") Date pointInTime); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/spm/service/ScorecardReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/spm/service/ScorecardReadPlatformService.java index a2dbc8b9a..32e8377d5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/spm/service/ScorecardReadPlatformService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/spm/service/ScorecardReadPlatformService.java @@ -23,9 +23,9 @@ import org.apache.fineract.spm.data.ScorecardData; public interface ScorecardReadPlatformService { - Collection retrieveScorecardByClient(final Long clientId); + Collection retrieveScorecardByClient(Long clientId); - Collection retrieveScorecardBySurveyAndClient(final Long surveyId, final Long clientId); + Collection retrieveScorecardBySurveyAndClient(Long surveyId, Long clientId); - Collection retrieveScorecardBySurvey(final Long surveyId); + Collection retrieveScorecardBySurvey(Long surveyId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateEntity.java b/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateEntity.java index c21556f42..bd9d44441 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateEntity.java +++ b/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateEntity.java @@ -31,7 +31,7 @@ public enum TemplateEntity { private final int id; private final String name; - private TemplateEntity(final int id, final String name) { + TemplateEntity(final int id, final String name) { this.id = id; this.name = name; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateType.java b/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateType.java index 97f071355..57db49893 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateType.java @@ -34,7 +34,7 @@ public enum TemplateType { private final int id; private final String name; - private TemplateType(final int id, final String name) { + TemplateType(final int id, final String name) { this.id = id; this.name = name; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateDomainService.java b/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateDomainService.java index 2a13bdb05..29b06eff9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateDomainService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateDomainService.java @@ -35,9 +35,9 @@ public interface TemplateDomainService { Template updateTemplate(Template template); - CommandProcessingResult createTemplate(final JsonCommand command); + CommandProcessingResult createTemplate(JsonCommand command); - CommandProcessingResult updateTemplate(final Long templateId, final JsonCommand command); + CommandProcessingResult updateTemplate(Long templateId, JsonCommand command); - CommandProcessingResult removeTemplate(final Long templateId); + CommandProcessingResult removeTemplate(Long templateId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUserPreviousPasswordRepository.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUserPreviousPasswordRepository.java index b569d14ef..f1f90f888 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUserPreviousPasswordRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUserPreviousPasswordRepository.java @@ -26,5 +26,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; public interface AppUserPreviousPasswordRepository extends JpaRepository, JpaSpecificationExecutor { - public List findByUserId(Long userId, Pageable pageable); + List findByUserId(Long userId, Pageable pageable); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/PasswordValidationPolicyRepository.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/PasswordValidationPolicyRepository.java index c9ee72e87..96f1527d4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/PasswordValidationPolicyRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/PasswordValidationPolicyRepository.java @@ -26,6 +26,6 @@ public interface PasswordValidationPolicyRepository extends JpaRepository, JpaSpecificationExecutor { @Query("select PVP from PasswordValidationPolicy PVP WHERE PVP.active = true") - public PasswordValidationPolicy findActivePasswordValidationPolicy(); + PasswordValidationPolicy findActivePasswordValidationPolicy(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserReadPlatformServiceImpl.java index c4e89387b..ea2fa1142 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserReadPlatformServiceImpl.java @@ -160,8 +160,7 @@ public class AppUserReadPlatformServiceImpl implements AppUserReadPlatformServic private final RoleReadPlatformService roleReadPlatformService; private final StaffReadPlatformService staffReadPlatformService; - public AppUserMapper(final RoleReadPlatformService roleReadPlatformService, - final StaffReadPlatformService staffReadPlatformService) { + AppUserMapper(final RoleReadPlatformService roleReadPlatformService, final StaffReadPlatformService staffReadPlatformService) { this.roleReadPlatformService = roleReadPlatformService; this.staffReadPlatformService = staffReadPlatformService; }