You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by vo...@apache.org on 2020/05/27 09:27:40 UTC
[fineract] branch develop updated: FINERACT-821 Added and Enforced
ArrayTypeStyle checkstyle
This is an automated email from the ASF dual-hosted git repository.
vorburger 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 ef538e5 FINERACT-821 Added and Enforced ArrayTypeStyle checkstyle
ef538e5 is described below
commit ef538e5c75f5200cc3e6546bfcb8047f10a40e3a
Author: Manthan Surkar <ma...@gmail.com>
AuthorDate: Tue May 26 03:31:30 2020 +0530
FINERACT-821 Added and Enforced ArrayTypeStyle checkstyle
---
fineract-provider/config/checkstyle/checkstyle.xml | 4 +++-
.../AccountingScenarioIntegrationTest.java | 4 ++--
.../importhandler/client/ClientEntityImportHandler.java | 14 +++++++-------
.../importhandler/client/ClientPersonImportHandler.java | 12 ++++++------
.../importhandler/guarantor/GuarantorImportHandler.java | 4 ++--
.../loanrepayment/LoanRepaymentImportHandler.java | 2 +-
.../populator/chartofaccounts/ChartOfAccountsWorkbook.java | 4 ++--
.../infrastructure/core/service/PaginationHelper.java | 2 +-
8 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/fineract-provider/config/checkstyle/checkstyle.xml b/fineract-provider/config/checkstyle/checkstyle.xml
index 8e46fe2..ecc297d 100644
--- a/fineract-provider/config/checkstyle/checkstyle.xml
+++ b/fineract-provider/config/checkstyle/checkstyle.xml
@@ -88,6 +88,8 @@
</module>
<module name="UpperEll"/>
<module name="NeedBraces"/>
+ <module name="ArrayTypeStyle"/>
+
<!-- TODO Enable many more checks (go about this one by one, step by step, raise separate PRs fixing and then enforcing):
<module name="HiddenField">
@@ -146,7 +148,7 @@
<module name="ParenPad" />
<module name="MultipleVariableDeclarations"/>
- <module name="ArrayTypeStyle"/>
+
<module name="MissingSwitchDefault"/>
<module name="FallThrough"/>
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java
index 8b6eac7..27ab037 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java
@@ -95,8 +95,8 @@ public class AccountingScenarioIntegrationTest {
Float SP_WITHDRAWAL_AMOUNT = Float.valueOf(WITHDRAWAL_AMOUNT);
Float SP_WITHDRAWAL_AMOUNT_ADJUSTED = Float.valueOf(WITHDRAWAL_AMOUNT_ADJUSTED);
- private final String REPAYMENT_DATE[] = { "", "04 May 2011", "04 July 2011", "04 September 2011", "04 November 2011", "04 January 2012" };
- private final Float REPAYMENT_AMOUNT[] = { .0f, 2200.0f, 3000.0f, 900.0f, 2000.0f, 2500.0f };
+ private final String[] REPAYMENT_DATE = { "", "04 May 2011", "04 July 2011", "04 September 2011", "04 November 2011", "04 January 2012" };
+ private final Float[] REPAYMENT_AMOUNT = { .0f, 2200.0f, 3000.0f, 900.0f, 2000.0f, 2500.0f };
private final Float AMOUNT_TO_BE_WAIVE = 400.0f;
private LoanTransactionHelper loanTransactionHelper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java
index 56e3e14..3a5665e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java
@@ -99,7 +99,7 @@ public class ClientEntityImportHandler implements ImportHandler {
String clientType=ImportHandlerUtils.readAsString(ClientEntityConstants.CLIENT_TYPE_COL, row);
Long clientTypeId = null;
if (clientType!=null) {
- String clientTypeAr[] =clientType .split("-");
+ String[] clientTypeAr =clientType .split("-");
if (clientTypeAr[1] != null) {
clientTypeId = Long.parseLong(clientTypeAr[1]);
}
@@ -107,7 +107,7 @@ public class ClientEntityImportHandler implements ImportHandler {
String clientClassification= ImportHandlerUtils.readAsString(ClientEntityConstants.CLIENT_CLASSIFICATION_COL, row);
Long clientClassicationId = null;
if (clientClassification!=null) {
- String clientClassificationAr[] =clientClassification.split("-");
+ String[] clientClassificationAr =clientClassification.split("-");
if (clientClassificationAr[1] != null) {
clientClassicationId = Long.parseLong(clientClassificationAr[1]);
}
@@ -117,7 +117,7 @@ public class ClientEntityImportHandler implements ImportHandler {
String mainBusinessLine=ImportHandlerUtils.readAsString(ClientEntityConstants.MAIN_BUSINESS_LINE,row);
Long mainBusinessId = null;
if (mainBusinessLine!=null) {
- String mainBusinessLineAr[] = ImportHandlerUtils.readAsString(ClientEntityConstants.MAIN_BUSINESS_LINE, row).split("-");
+ String[] mainBusinessLineAr = ImportHandlerUtils.readAsString(ClientEntityConstants.MAIN_BUSINESS_LINE, row).split("-");
if (mainBusinessLineAr[1] != null) {
mainBusinessId = Long.parseLong(mainBusinessLineAr[1]);
}
@@ -125,7 +125,7 @@ public class ClientEntityImportHandler implements ImportHandler {
String constitution= ImportHandlerUtils.readAsString(ClientEntityConstants.CONSTITUTION_COL,row);
Long constitutionId = null;
if (constitution!=null) {
- String constitutionAr[] = constitution.split("-");
+ String[] constitutionAr = constitution.split("-");
if (constitutionAr[1] != null) {
constitutionId = Long.parseLong(constitutionAr[1]);
}
@@ -151,7 +151,7 @@ public class ClientEntityImportHandler implements ImportHandler {
String addressType = ImportHandlerUtils.readAsString(ClientEntityConstants.ADDRESS_TYPE_COL, row);
Long addressTypeId = null;
if (addressType!=null) {
- String addressTypeAr[] = addressType.split("-");
+ String[] addressTypeAr = addressType.split("-");
if (addressTypeAr[1] != null) {
addressTypeId = Long.parseLong(addressTypeAr[1]);
}
@@ -168,7 +168,7 @@ public class ClientEntityImportHandler implements ImportHandler {
String stateProvince=ImportHandlerUtils.readAsString(ClientEntityConstants.STATE_PROVINCE_COL, row);
Long stateProvinceId = null;
if (stateProvince!=null) {
- String stateProvinceAr[] = stateProvince.split("-");
+ String[] stateProvinceAr = stateProvince.split("-");
if (stateProvinceAr[1] != null) {
stateProvinceId = Long.parseLong(stateProvinceAr[1]);
}
@@ -176,7 +176,7 @@ public class ClientEntityImportHandler implements ImportHandler {
String country= ImportHandlerUtils.readAsString(ClientEntityConstants.COUNTRY_COL, row);
Long countryId = null;
if (country!=null) {
- String countryAr[] = country.split("-");
+ String[] countryAr = country.split("-");
if (countryAr[1] != null) {
countryId = Long.parseLong(countryAr[1]);
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java
index 25732aa..85cf95f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java
@@ -104,7 +104,7 @@ public class ClientPersonImportHandler implements ImportHandler {
String clientType=ImportHandlerUtils.readAsString(ClientPersonConstants.CLIENT_TYPE_COL, row);
Long clientTypeId = null;
if (clientType!=null) {
- String clientTypeAr[] = clientType.split("-");
+ String[] clientTypeAr = clientType.split("-");
if (clientTypeAr[1] != null) {
clientTypeId = Long.parseLong(clientTypeAr[1]);
}
@@ -112,7 +112,7 @@ public class ClientPersonImportHandler implements ImportHandler {
String gender=ImportHandlerUtils.readAsString(ClientPersonConstants.GENDER_COL, row);
Long genderId = null;
if (gender!=null) {
- String genderAr[] = gender.split("-");
+ String[] genderAr = gender.split("-");
if (genderAr[1] != null) {
genderId = Long.parseLong(genderAr[1]);
}
@@ -120,7 +120,7 @@ public class ClientPersonImportHandler implements ImportHandler {
String clientClassification= ImportHandlerUtils.readAsString(ClientPersonConstants.CLIENT_CLASSIFICATION_COL, row);
Long clientClassicationId = null;
if (clientClassification!=null) {
- String clientClassificationAr[] = clientClassification.split("-");
+ String[] clientClassificationAr = clientClassification.split("-");
if (clientClassificationAr[1] != null) {
clientClassicationId = Long.parseLong(clientClassificationAr[1]);
}
@@ -133,7 +133,7 @@ public class ClientPersonImportHandler implements ImportHandler {
String addressType=ImportHandlerUtils.readAsString(ClientPersonConstants.ADDRESS_TYPE_COL, row);
Long addressTypeId = null;
if (addressType!=null) {
- String addressTypeAr[] = addressType.split("-");
+ String[] addressTypeAr = addressType.split("-");
if (addressTypeAr[1] != null) {
addressTypeId = Long.parseLong(addressTypeAr[1]);
@@ -151,7 +151,7 @@ public class ClientPersonImportHandler implements ImportHandler {
String stateProvince=ImportHandlerUtils.readAsString(ClientPersonConstants.STATE_PROVINCE_COL, row);
Long stateProvinceId = null;
if (stateProvince!=null) {
- String stateProvinceAr[] = stateProvince.split("-");
+ String[] stateProvinceAr = stateProvince.split("-");
if (stateProvinceAr[1] != null) {
stateProvinceId = Long.parseLong(stateProvinceAr[1]);
}
@@ -159,7 +159,7 @@ public class ClientPersonImportHandler implements ImportHandler {
String country=ImportHandlerUtils.readAsString(ClientPersonConstants.COUNTRY_COL, row);
Long countryId=null;
if (country!=null) {
- String countryAr[] = country.split("-");
+ String[] countryAr = country.split("-");
if (countryAr[1] != null) {
countryId = Long.parseLong(countryAr[1]);
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java
index 59b95d3..fd197b7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java
@@ -84,7 +84,7 @@ public class GuarantorImportHandler implements ImportHandler {
private GuarantorData ReadGuarantor(Row row,String locale,String dateFormat) {
String loanaccountInfo=ImportHandlerUtils.readAsString(GuarantorConstants.LOAN_ACCOUNT_NO_COL, row);
if (loanaccountInfo!=null){
- String loanAccountAr[]=loanaccountInfo.split("-");
+ String[] loanAccountAr=loanaccountInfo.split("-");
loanAccountId=Long.parseLong(loanAccountAr[0]);
}
String guarantorType = ImportHandlerUtils.readAsString(GuarantorConstants.GUARANTO_TYPE_COL, row);
@@ -102,7 +102,7 @@ public class GuarantorImportHandler implements ImportHandler {
String clientRelationshipTypeInfo=ImportHandlerUtils.readAsString(GuarantorConstants.CLIENT_RELATIONSHIP_TYPE_COL, row);
Integer clientRelationshipTypeId=null;
if (clientRelationshipTypeInfo!=null){
- String clientRelationshipTypeAr[]=clientRelationshipTypeInfo.split("-");
+ String[] clientRelationshipTypeAr=clientRelationshipTypeInfo.split("-");
clientRelationshipTypeId=Integer.parseInt(clientRelationshipTypeAr[1]);
}
String firstname = ImportHandlerUtils.readAsString(GuarantorConstants.FIRST_NAME_COL, row);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java
index 19127f0..e21d3b6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java
@@ -83,7 +83,7 @@ public class LoanRepaymentImportHandler implements ImportHandler {
private LoanTransactionData readLoanRepayment(Row row,String locale, String dateFormat) {
String loanaccountInfo=ImportHandlerUtils.readAsString(LoanRepaymentConstants.LOAN_ACCOUNT_NO_COL, row);
if (loanaccountInfo!=null){
- String loanAccountAr[]=loanaccountInfo.split("-");
+ String[] loanAccountAr=loanaccountInfo.split("-");
loanAccountId = this.loanReadPlatformService.retrieveLoanIdByAccountNumber(loanAccountAr[0]);
}
BigDecimal repaymentAmount=null;
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 9c74be1..0dab103 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
@@ -184,7 +184,7 @@ public class ChartOfAccountsWorkbook extends AbstractWorkbookPopulator {
if (!accountNamesandTags.isEmpty()){
for (String accountNameandTag:accountNamesandTags) {
if (chartOfAccountsSheet.getRow(rowIndex)!=null){
- String accountNameAndTagAr[]=accountNameandTag.split("-");
+ String[] accountNameAndTagAr=accountNameandTag.split("-");
writeString(ChartOfAcountsConstants.LOOKUP_ACCOUNT_NAME_COL,row,accountNameAndTagAr[0]);
writeString(ChartOfAcountsConstants.LOOKUP_ACCOUNT_ID_COL,row,accountNameAndTagAr[1]);
writeString(ChartOfAcountsConstants.LOOKUP_TAG_COL,row,accountNameAndTagAr[2]);
@@ -192,7 +192,7 @@ public class ChartOfAccountsWorkbook extends AbstractWorkbookPopulator {
rowIndex++;
}else{
row =chartOfAccountsSheet.createRow(rowIndex);
- String accountNameAndTagAr[]=accountNameandTag.split("-");
+ String[] accountNameAndTagAr=accountNameandTag.split("-");
writeString(ChartOfAcountsConstants.LOOKUP_ACCOUNT_NAME_COL,row,accountNameAndTagAr[0]);
writeString(ChartOfAcountsConstants.LOOKUP_ACCOUNT_ID_COL,row,accountNameAndTagAr[1]);
writeString(ChartOfAcountsConstants.LOOKUP_TAG_COL,row,accountNameAndTagAr[2]);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/PaginationHelper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/PaginationHelper.java
index f2a8fbd..0ad18af 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/PaginationHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/PaginationHelper.java
@@ -25,7 +25,7 @@ import org.springframework.jdbc.core.RowMapper;
public class PaginationHelper<E> {
- public Page<E> fetchPage(final JdbcTemplate jt, final String sqlCountRows, final String sqlFetchRows, final Object args[],
+ public Page<E> fetchPage(final JdbcTemplate jt, final String sqlCountRows, final String sqlFetchRows, final Object[] args,
final RowMapper<E> rowMapper) {
final List<E> items = jt.query(sqlFetchRows, args, rowMapper);