This is an automated email from the ASF dual-hosted git repository.
awasum pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 78857bc FINERACT-822 Enabling MultiVariableDeclaration check (#981)
78857bc is described below
commit 78857bcf81eaaf44d7e7cf834b437be07c5bf40c
Author: Percy Ayuk Ashu <[email protected]>
AuthorDate: Fri Jun 5 10:28:00 2020 +0100
FINERACT-822 Enabling MultiVariableDeclaration check (#981)
---
fineract-provider/build.gradle | 4 ++--
...anWithWaiveInterestAndWriteOffIntegrationTest.java | 19 ++++++++++++++-----
.../bulkimport/populator/CenterSheetPopulator.java | 6 ++++--
.../bulkimport/populator/ClientSheetPopulator.java | 6 ++++--
.../bulkimport/populator/GroupSheetPopulator.java | 6 ++++--
.../bulkimport/populator/PersonnelSheetPopulator.java | 6 ++++--
.../chartofaccounts/ChartOfAccountsWorkbook.java | 4 +++-
.../FixedDepositTransactionWorkbookPopulator.java | 3 ++-
.../guarantor/GuarantorWorkbookPopulator.java | 5 +++--
.../loanrepayment/LoanRepaymentWorkbookPopulator.java | 3 ++-
.../RecurringDepositTransactionWorkbookPopulator.java | 3 ++-
.../savings/SavingsTransactionsWorkbookPopulator.java | 3 ++-
.../fineract/infrastructure/gcm/domain/Sender.java | 4 +++-
...licationWritePlatformServiceJpaRepositoryImpl.java | 3 ++-
14 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 2d7a256..af03680 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 c5aacb8..c0f186d 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 8bf09a9..6c57c09 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<Integer,
Integer[]>();
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 99ea122..7b5c0ab 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<String, Long> 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 8017136..1d530aa 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 7375495..0a975e4 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 0dab103..79a90fc 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<Integer,Integer[]>();
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 746b83c..9aea37c 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<String, Integer[]> clientNameToBeginEndIndexes = new
HashMap<>();
ArrayList<String> clientsWithActiveSavings = new ArrayList<>();
ArrayList<Long> 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 949d285..a89d3ee 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<String, Integer[]> clientNameToBeginEndIndexes = new
HashMap<String, Integer[]>();
ArrayList<String> clientsWithActiveLoans = new ArrayList<String>();
ArrayList<String> clientIdsWithActiveLoans = new ArrayList<String>();
- 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 5f230fe..554f5e3 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<String, Integer[]> clientNameToBeginEndIndexes = new
HashMap<String, Integer[]>();
ArrayList<String> clientsWithActiveLoans = new ArrayList<String>();
ArrayList<String> clientIdsWithActiveLoans = new ArrayList<String>();
- 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 c85a397..7afceb6 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<String, Integer[]> clientNameToBeginEndIndexes = new
HashMap<>();
ArrayList<String> clientsWithActiveSavings = new ArrayList<>();
ArrayList<Long> 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 75ebaca..5ae4579 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<String, Integer[]> clientNameToBeginEndIndexes = new
HashMap<>();
ArrayList<String> clientsWithActiveSavings = new ArrayList<>();
ArrayList<Long> 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 9d2f008..a28431a 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 c0472a8..8d468ef 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)
{
