CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

FINERACT-821 Added and Enforced ParenPad Checkstyle

Browse Source
This commit is contained in:
thesmallstar
2020-06-16 20:58:28 +02:00
committed by Michael Vorburger ⛑️
parent ce34c880da
commit c78ff0b12b
5 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/config/checkstyle/checkstyle.xml
+2 -1
View File
@@ -166,6 +166,7 @@
<message key="ws.notPreceded" <message key="ws.notPreceded"
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
</module> </module>
<module name="ParenPad" />
<!-- TODO Enable many more checks (go about this one by one, step by step, raise separate PRs fixing and then enforcing): <!-- TODO Enable many more checks (go about this one by one, step by step, raise separate PRs fixing and then enforcing):
<module name="HiddenField"> <module name="HiddenField">
@@ -196,7 +197,7 @@
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, STATIC_INIT, INSTANCE_INIT"/> <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, STATIC_INIT, INSTANCE_INIT"/>
</module> </module>
<module name="ParenPad" />
<module name="MultipleVariableDeclarations"/> <module name="MultipleVariableDeclarations"/>
fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDropdownReadPlatformServiceImpl.java
+5 -8
View File
@@ -61,11 +61,10 @@ public class SmsCampaignDropdownReadPlatformServiceImpl implements SmsCampaignDr
@Override @Override
public Collection<EnumOptionData> retrieveCampaignTriggerTypes() { public Collection<EnumOptionData> retrieveCampaignTriggerTypes() {
final List<EnumOptionData> triggerTypeCodeValues = Arrays.asList( // final List<EnumOptionData> triggerTypeCodeValues = Arrays.asList(
SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.DIRECT), // SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.DIRECT),
SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.SCHEDULE), // SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.SCHEDULE),
SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.TRIGGERED) // SmsCampaignEnumerations.smscampaignTriggerType(SmsCampaignTriggerType.TRIGGERED));
);
return triggerTypeCodeValues; return triggerTypeCodeValues;
} }
@@ -90,9 +89,7 @@ public class SmsCampaignDropdownReadPlatformServiceImpl implements SmsCampaignDr
@Override @Override
public Collection<EnumOptionData> retrieveCampaignTypes() { public Collection<EnumOptionData> retrieveCampaignTypes() {
final List<EnumOptionData> campaignTypeCodeValues = Arrays.asList( // final List<EnumOptionData> campaignTypeCodeValues = Arrays.asList(SmsCampaignEnumerations.smscampaignType(CampaignType.SMS));
SmsCampaignEnumerations.smscampaignType(CampaignType.SMS)//
);
return campaignTypeCodeValues; return campaignTypeCodeValues;
} }
fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
+2 -2
View File
@@ -105,8 +105,8 @@ public class TenantDatabaseUpgradeService {
LOG.info("upgradeTenantDB: FINERACT_DEFAULT_TENANTDB_HOSTNAME = {}, FINERACT_DEFAULT_TENANTDB_PORT = {}", dbHostname, dbPort); LOG.info("upgradeTenantDB: FINERACT_DEFAULT_TENANTDB_HOSTNAME = {}, FINERACT_DEFAULT_TENANTDB_PORT = {}", dbHostname, dbPort);
final Flyway flyway = Flyway.configure().dataSource(tenantDataSource).locations("sql/migrations/list_db").outOfOrder(true) final Flyway flyway = Flyway.configure().dataSource(tenantDataSource).locations("sql/migrations/list_db").outOfOrder(true)
.placeholders(Map.of( // FINERACT-773 // FINERACT-773
"fineract_default_tenantdb_hostname", dbHostname, "fineract_default_tenantdb_port", dbPort, .placeholders(Map.of("fineract_default_tenantdb_hostname", dbHostname, "fineract_default_tenantdb_port", dbPort,
"fineract_default_tenantdb_uid", dbUid, "fineract_default_tenantdb_pwd", dbPwd)) "fineract_default_tenantdb_uid", dbUid, "fineract_default_tenantdb_pwd", dbPwd))
.configuration(Map.of("flyway.table", "schema_version")) // FINERACT-979 .configuration(Map.of("flyway.table", "schema_version")) // FINERACT-979
.load(); .load();
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsDropdownReadPlatformServiceImpl.java
+19 -26
View File
@@ -35,22 +35,19 @@ public class SavingsDropdownReadPlatformServiceImpl implements SavingsDropdownRe
@Override @Override
public Collection<EnumOptionData> retrievewithdrawalFeeTypeOptions() { public Collection<EnumOptionData> retrievewithdrawalFeeTypeOptions() {
final List<EnumOptionData> allowedOptions = Arrays.asList( // final List<EnumOptionData> allowedOptions = Arrays.asList(SavingsEnumerations.withdrawalFeeType(SavingsWithdrawalFeesType.FLAT),
SavingsEnumerations.withdrawalFeeType(SavingsWithdrawalFeesType.FLAT), // SavingsEnumerations.withdrawalFeeType(SavingsWithdrawalFeesType.PERCENT_OF_AMOUNT));
SavingsEnumerations.withdrawalFeeType(SavingsWithdrawalFeesType.PERCENT_OF_AMOUNT) //
);
return allowedOptions; return allowedOptions;
} }
@Override @Override
public List<EnumOptionData> retrieveLockinPeriodFrequencyTypeOptions() { public List<EnumOptionData> retrieveLockinPeriodFrequencyTypeOptions() {
final List<EnumOptionData> allowedLockinPeriodFrequencyTypeOptions = Arrays.asList( // final List<EnumOptionData> allowedLockinPeriodFrequencyTypeOptions = Arrays.asList(
SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.DAYS), // SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.DAYS),
SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.WEEKS), // SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.WEEKS),
SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.MONTHS), // SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.MONTHS),
SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.YEARS) // SavingsEnumerations.lockinPeriodFrequencyType(SavingsPeriodFrequencyType.YEARS));
);
return allowedLockinPeriodFrequencyTypeOptions; return allowedLockinPeriodFrequencyTypeOptions;
} }
@@ -58,8 +55,7 @@ public class SavingsDropdownReadPlatformServiceImpl implements SavingsDropdownRe
@Override @Override
public Collection<EnumOptionData> retrieveCompoundingInterestPeriodTypeOptions() { public Collection<EnumOptionData> retrieveCompoundingInterestPeriodTypeOptions() {
final List<EnumOptionData> allowedOptions = Arrays.asList( final List<EnumOptionData> allowedOptions = Arrays.asList(
// SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.DAILY),
SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.DAILY), //
// SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.WEEKLY), // SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.WEEKLY),
// // // //
// SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.BIWEEKLY), // SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.BIWEEKLY),
@@ -78,32 +74,29 @@ public class SavingsDropdownReadPlatformServiceImpl implements SavingsDropdownRe
@Override @Override
public Collection<EnumOptionData> retrieveInterestPostingPeriodTypeOptions() { public Collection<EnumOptionData> retrieveInterestPostingPeriodTypeOptions() {
final List<EnumOptionData> allowedOptions = Arrays.asList( // final List<EnumOptionData> allowedOptions = Arrays.asList(
SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.MONTHLY), // SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.MONTHLY),
SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.QUATERLY), // SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.QUATERLY),
SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.BIANNUAL), // SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.BIANNUAL),
SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.ANNUAL) // SavingsEnumerations.interestPostingPeriodType(SavingsPostingInterestPeriodType.ANNUAL));
);
return allowedOptions; return allowedOptions;
} }
@Override @Override
public Collection<EnumOptionData> retrieveInterestCalculationTypeOptions() { public Collection<EnumOptionData> retrieveInterestCalculationTypeOptions() {
final List<EnumOptionData> allowedOptions = Arrays.asList( // final List<EnumOptionData> allowedOptions = Arrays.asList(
SavingsEnumerations.interestCalculationType(SavingsInterestCalculationType.DAILY_BALANCE), // SavingsEnumerations.interestCalculationType(SavingsInterestCalculationType.DAILY_BALANCE),
SavingsEnumerations.interestCalculationType(SavingsInterestCalculationType.AVERAGE_DAILY_BALANCE) // SavingsEnumerations.interestCalculationType(SavingsInterestCalculationType.AVERAGE_DAILY_BALANCE));
);
return allowedOptions; return allowedOptions;
} }
@Override @Override
public Collection<EnumOptionData> retrieveInterestCalculationDaysInYearTypeOptions() { public Collection<EnumOptionData> retrieveInterestCalculationDaysInYearTypeOptions() {
final List<EnumOptionData> allowedOptions = Arrays.asList( // final List<EnumOptionData> allowedOptions = Arrays.asList(
SavingsEnumerations.interestCalculationDaysInYearType(SavingsInterestCalculationDaysInYearType.DAYS_360), // SavingsEnumerations.interestCalculationDaysInYearType(SavingsInterestCalculationDaysInYearType.DAYS_360),
SavingsEnumerations.interestCalculationDaysInYearType(SavingsInterestCalculationDaysInYearType.DAYS_365) // SavingsEnumerations.interestCalculationDaysInYearType(SavingsInterestCalculationDaysInYearType.DAYS_365));
);
return allowedOptions; return allowedOptions;
} }
fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDropdownReadPlatformServiceImpl.java
+7 -9
View File
@@ -31,21 +31,19 @@ public class ShareProductDropdownReadPlatformServiceImpl implements ShareProduct
@Override @Override
public Collection<EnumOptionData> retrieveLockinPeriodFrequencyTypeOptions() { public Collection<EnumOptionData> retrieveLockinPeriodFrequencyTypeOptions() {
final List<EnumOptionData> allowedLockinPeriodFrequencyTypeOptions = Arrays.asList( // final List<EnumOptionData> allowedLockinPeriodFrequencyTypeOptions = Arrays.asList(
SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.DAYS), // SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.DAYS),
SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.WEEKS), // SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.WEEKS),
SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.MONTHS), // SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.MONTHS),
SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.YEARS) // SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.YEARS));
);
return allowedLockinPeriodFrequencyTypeOptions; return allowedLockinPeriodFrequencyTypeOptions;
} }
@Override @Override
public Collection<EnumOptionData> retrieveMinimumActivePeriodFrequencyTypeOptions() { public Collection<EnumOptionData> retrieveMinimumActivePeriodFrequencyTypeOptions() {
final List<EnumOptionData> minimumActivePeriodFrequencyTypeOptions = Arrays.asList( // final List<EnumOptionData> minimumActivePeriodFrequencyTypeOptions = Arrays
SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.DAYS) // .asList(SharesEnumerations.lockinPeriodFrequencyType(SharePeriodFrequencyType.DAYS));
);
return minimumActivePeriodFrequencyTypeOptions; return minimumActivePeriodFrequencyTypeOptions;
} }