From 78857bcf81eaaf44d7e7cf834b437be07c5bf40c Mon Sep 17 00:00:00 2001 From: Percy Ayuk Ashu Date: Fri, 5 Jun 2020 10:28:00 +0100 Subject: [PATCH] FINERACT-822 Enabling MultiVariableDeclaration check (#981) --- fineract-provider/build.gradle | 4 ++-- ...iveInterestAndWriteOffIntegrationTest.java | 19 ++++++++++++++----- .../populator/CenterSheetPopulator.java | 6 ++++-- .../populator/ClientSheetPopulator.java | 6 ++++-- .../populator/GroupSheetPopulator.java | 6 ++++-- .../populator/PersonnelSheetPopulator.java | 6 ++++-- .../ChartOfAccountsWorkbook.java | 4 +++- ...edDepositTransactionWorkbookPopulator.java | 3 ++- .../guarantor/GuarantorWorkbookPopulator.java | 5 +++-- .../LoanRepaymentWorkbookPopulator.java | 3 ++- ...ngDepositTransactionWorkbookPopulator.java | 3 ++- .../SavingsTransactionsWorkbookPopulator.java | 3 ++- .../infrastructure/gcm/domain/Sender.java | 4 +++- ...WritePlatformServiceJpaRepositoryImpl.java | 3 ++- 14 files changed, 51 insertions(+), 24 deletions(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 2d7a25655..af0368010 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -338,6 +338,8 @@ tasks.withType(JavaCompile) { "ThreeLetterTimeZoneID", "VariableNameSameAsType", "UnnecessaryParentheses", + "MultipleTopLevelClasses", + "MultiVariableDeclaration", "AssertEqualsArgumentOrderChecker", // "ReturnMissingNullable", // "InconsistentOverloads", @@ -346,8 +348,6 @@ tasks.withType(JavaCompile) { // "ConstantField", // "EmptySetMultibindingContributions", // "MixedArrayDimensions", -// "MultipleTopLevelClasses", -// "MultiVariableDeclaration", // "PackageLocation", // "PrivateConstructorForNoninstantiableModule", // "UnnecessaryStaticImport", diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java index c5aacb81b..c0f186d56 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java @@ -46,11 +46,20 @@ public class LoanWithWaiveInterestAndWriteOffIntegrationTest { private ResponseSpecification responseSpec; private RequestSpecification requestSpec; - private final String LP_PRINCIPAL = "12,000.00", LP_REPAYMENTS = "2", LP_REPAYMENT_PERIOD = "6", LP_INTEREST_RATE = "1", - PRINCIPAL = "4,500.00", LOAN_TERM_FREQUENCY = "18", NUMBER_OF_REPAYMENTS = "9", REPAYMENT_PERIOD = "2", - DISBURSEMENT_DATE = "30 October 2010", LOAN_APPLICATION_SUBMISSION_DATE = "23 September 2010", - EXPECTED_DISBURSAL_DATE = "28 October 2010", RATE_OF_INTEREST_PER_PERIOD = "2", DATE_OF_JOINING = "04 March 2009", - INTEREST_VALUE_AMOUNT = "40.00"; + private final String LP_PRINCIPAL = "12,000.00"; + private final String LP_REPAYMENTS = "2"; + private final String LP_REPAYMENT_PERIOD = "6"; + private final String LP_INTEREST_RATE = "1"; + private final String PRINCIPAL = "4,500.00"; + private final String LOAN_TERM_FREQUENCY = "18"; + private final String NUMBER_OF_REPAYMENTS = "9"; + private final String REPAYMENT_PERIOD = "2"; + private final String DISBURSEMENT_DATE = "30 October 2010"; + private final String LOAN_APPLICATION_SUBMISSION_DATE = "23 September 2010"; + private final String EXPECTED_DISBURSAL_DATE = "28 October 2010"; + private final String RATE_OF_INTEREST_PER_PERIOD = "2"; + private final String DATE_OF_JOINING = "04 March 2009"; + private final String INTEREST_VALUE_AMOUNT = "40.00"; private LoanTransactionHelper loanTransactionHelper; @Before diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/CenterSheetPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/CenterSheetPopulator.java index 8bf09a98b..6c57c09aa 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/CenterSheetPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/CenterSheetPopulator.java @@ -64,7 +64,9 @@ public class CenterSheetPopulator extends AbstractWorkbookPopulator { } private void populateCentersByOfficeName(Sheet centerSheet) { - int rowIndex = 1, officeIndex = 0, startIndex = 1; + int rowIndex = 1; + int officeIndex = 0; + int startIndex = 1; officeNameToBeginEndIndexesOfCenters = new HashMap(); Row row = centerSheet.createRow(rowIndex); for (OfficeData office : offices) { @@ -120,4 +122,4 @@ public class CenterSheetPopulator extends AbstractWorkbookPopulator { return officeNameToBeginEndIndexesOfCenters; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/ClientSheetPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/ClientSheetPopulator.java index 99ea122ee..7b5c0ab34 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/ClientSheetPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/ClientSheetPopulator.java @@ -105,7 +105,9 @@ public class ClientSheetPopulator extends AbstractWorkbookPopulator { } private void populateClientsByOfficeName(Sheet clientSheet) { - int rowIndex = 1, startIndex = 1, officeIndex = 0; + int rowIndex = 1; + int startIndex = 1; + int officeIndex = 0; officeNameToBeginEndIndexesOfClients = new HashMap<>(); Row row = clientSheet.createRow(rowIndex); for (OfficeData office : officesDataList) { @@ -143,4 +145,4 @@ public class ClientSheetPopulator extends AbstractWorkbookPopulator { public Map getClientNameToSavingsAccountIds() { return clientNameToSavingsAccountIds; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/GroupSheetPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/GroupSheetPopulator.java index 8017136d0..1d530aafd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/GroupSheetPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/GroupSheetPopulator.java @@ -84,7 +84,9 @@ public class GroupSheetPopulator extends AbstractWorkbookPopulator { officeToGroups.put(key, values); } private void populateGroupsByOfficeName(Sheet groupSheet) { - int rowIndex = 1, officeIndex = 0, startIndex = 1; + int rowIndex = 1; + int officeIndex = 0; + int startIndex = 1; officeNameToBeginEndIndexesOfGroups = new HashMap<>(); Row row = groupSheet.createRow(rowIndex); for(OfficeData office : offices) { @@ -124,4 +126,4 @@ public class GroupSheetPopulator extends AbstractWorkbookPopulator { groupNameToGroupId.put(group.getName().trim(), group.getId()); } } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/PersonnelSheetPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/PersonnelSheetPopulator.java index 7375495f0..0a975e455 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/PersonnelSheetPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/PersonnelSheetPopulator.java @@ -72,7 +72,9 @@ public class PersonnelSheetPopulator extends AbstractWorkbookPopulator { private void populateStaffByOfficeName(Sheet staffSheet) { - int rowIndex = 1, startIndex = 1, officeIndex = 0; + int rowIndex = 1; + int startIndex = 1; + int officeIndex = 0; officeNameToBeginEndIndexesOfStaff = new HashMap<>(); Row row = staffSheet.createRow(rowIndex); for (OfficeData office : offices) { @@ -129,4 +131,4 @@ public class PersonnelSheetPopulator extends AbstractWorkbookPopulator { return officeNameToBeginEndIndexesOfStaff; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java index 0dab103be..79a90fc56 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java @@ -174,7 +174,9 @@ public class ChartOfAccountsWorkbook extends AbstractWorkbookPopulator { accountTypesNoDuplicatesList.add(glAccounts.get(i).getType().getValue()); } } - int rowIndex=1,startIndex=1,accountTypeIndex=0; + int rowIndex = 1; + int startIndex = 1; + int accountTypeIndex = 0; accountTypeToBeginEndIndexesofAccountNames= new HashMap(); for (String accountType: accountTypesNoDuplicatesList) { startIndex=rowIndex+1; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java index 746b83c6c..9aea37c14 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java @@ -146,7 +146,8 @@ public class FixedDepositTransactionWorkbookPopulator extends AbstractWorkbookPo HashMap clientNameToBeginEndIndexes = new HashMap<>(); ArrayList clientsWithActiveSavings = new ArrayList<>(); ArrayList clientIdsWithActiveSavings = new ArrayList<>(); - int startIndex = 1, endIndex = 1; + int startIndex = 1; + int endIndex = 1; String clientName = ""; Long clientId = null; for(int i = 0; i < savingsAccounts.size(); i++){ diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/guarantor/GuarantorWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/guarantor/GuarantorWorkbookPopulator.java index 949d2854f..a89d3eebd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/guarantor/GuarantorWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/guarantor/GuarantorWorkbookPopulator.java @@ -260,7 +260,8 @@ public class GuarantorWorkbookPopulator extends AbstractWorkbookPopulator { HashMap clientNameToBeginEndIndexes = new HashMap(); ArrayList clientsWithActiveLoans = new ArrayList(); ArrayList clientIdsWithActiveLoans = new ArrayList(); - int startIndex = 1, endIndex = 1; + int startIndex = 1; + int endIndex = 1; String clientName = ""; String clientId = ""; for(int i = 0; i < loans.size(); i++){ @@ -317,4 +318,4 @@ public class GuarantorWorkbookPopulator extends AbstractWorkbookPopulator { } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java index 5f230fe1c..554f5e349 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java @@ -191,7 +191,8 @@ public class LoanRepaymentWorkbookPopulator extends AbstractWorkbookPopulator { HashMap clientNameToBeginEndIndexes = new HashMap(); ArrayList clientsWithActiveLoans = new ArrayList(); ArrayList clientIdsWithActiveLoans = new ArrayList(); - int startIndex = 1, endIndex = 1; + int startIndex = 1; + int endIndex = 1; String clientName = ""; String clientId = ""; for (int i = 0; i < allloans.size(); i++) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/recurringdeposit/RecurringDepositTransactionWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/recurringdeposit/RecurringDepositTransactionWorkbookPopulator.java index c85a397fe..7afceb65b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/recurringdeposit/RecurringDepositTransactionWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/recurringdeposit/RecurringDepositTransactionWorkbookPopulator.java @@ -149,7 +149,8 @@ public class RecurringDepositTransactionWorkbookPopulator extends AbstractWorkbo HashMap clientNameToBeginEndIndexes = new HashMap<>(); ArrayList clientsWithActiveSavings = new ArrayList<>(); ArrayList clientIdsWithActiveSavings = new ArrayList<>(); - int startIndex = 1, endIndex = 1; + int startIndex = 1; + int endIndex = 1; String clientName = ""; Long clientId = null; for(int i = 0; i < savingsAccounts.size(); i++){ diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java index 75ebacac7..5ae45797c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java @@ -146,7 +146,8 @@ public class SavingsTransactionsWorkbookPopulator extends AbstractWorkbookPopula HashMap clientNameToBeginEndIndexes = new HashMap<>(); ArrayList clientsWithActiveSavings = new ArrayList<>(); ArrayList clientIdsWithActiveSavings = new ArrayList<>(); - int startIndex = 1, endIndex = 1; + int startIndex = 1; + int endIndex = 1; String clientName = ""; Long clientId = null; for(int i = 0; i < savingsAccounts.size(); i++){ diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java index 9d2f008ce..a28431ab1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java @@ -386,7 +386,9 @@ public class Sender { + attempt + " attempts"); } // calculate summary - int success = 0, failure = 0, canonicalIds = 0; + int success = 0; + int failure = 0; + int canonicalIds = 0; for (Result result : results.values()) { if (result.getMessageId() != null) { success++; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java index c0472a83c..8d468ef77 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java @@ -1313,7 +1313,8 @@ public void checkForProductMixRestrictions(final Loan loan) { CommandProcessingResult result=null; - int count=0,j=0; + int count = 0; + int j = 0; for(JsonElement approvals:approvalFormData) {