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/26 07:31:08 UTC
[fineract] branch develop updated: FINERACT-821 Added and Enforced
upperEll 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 01e8014 FINERACT-821 Added and Enforced upperEll checkstyle
01e8014 is described below
commit 01e8014ea2ac2b90a0d3992899ff5ea67dc60e92
Author: Manthan Surkar <ma...@gmail.com>
AuthorDate: Tue May 26 04:44:24 2020 +0530
FINERACT-821 Added and Enforced upperEll checkstyle
---
fineract-provider/config/checkstyle/checkstyle.xml | 3 ++-
.../fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java | 2 +-
.../org/apache/fineract/portfolio/group/data/GroupGeneralData.java | 2 +-
.../java/org/apache/fineract/portfolio/group/domain/GroupTypes.java | 6 +++---
.../apache/fineract/portfolio/loanaccount/domain/LoanCharge.java | 2 +-
.../fineract/portfolio/savings/domain/FixedDepositAccount.java | 2 +-
.../fineract/portfolio/savings/domain/RecurringDepositAccount.java | 2 +-
.../apache/fineract/portfolio/savings/domain/SavingsAccount.java | 4 ++--
.../fineract/portfolio/savings/domain/SavingsAccountCharge.java | 2 +-
.../fineract/portfolio/shareaccounts/domain/ShareAccountCharge.java | 4 ++--
.../scheduledjobs/service/ScheduledJobRunnerServiceImpl.java | 2 +-
.../org/apache/fineract/mix/report/service/XBRLBuilderTest.java | 2 +-
12 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/fineract-provider/config/checkstyle/checkstyle.xml b/fineract-provider/config/checkstyle/checkstyle.xml
index 368720e..7f156dc 100644
--- a/fineract-provider/config/checkstyle/checkstyle.xml
+++ b/fineract-provider/config/checkstyle/checkstyle.xml
@@ -86,6 +86,7 @@
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
+ <module name="UpperEll"/>
<!-- TODO Enable many more checks (go about this one by one, step by step, raise separate PRs fixing and then enforcing):
<module name="HiddenField">
@@ -147,7 +148,7 @@
<module name="ArrayTypeStyle"/>
<module name="MissingSwitchDefault"/>
<module name="FallThrough"/>
- <module name="UpperEll"/>
+
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<module name="EmptyLineSeparator">
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
index b6fb336..2458249 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
@@ -69,7 +69,7 @@ public class IPv4Helper {
*/
public static String longToIpAddress(long ip) {
// if ip is bigger than 255.255.255.255 or smaller than 0.0.0.0
- if (ip > 4294967295l || ip < 0) {
+ if (ip > 4294967295L || ip < 0) {
throw new IllegalArgumentException("invalid ip");
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/data/GroupGeneralData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/data/GroupGeneralData.java
index 47d4f3c..6bb042c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/data/GroupGeneralData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/data/GroupGeneralData.java
@@ -251,7 +251,7 @@ public class GroupGeneralData implements Serializable {
this.externalId = externalId;
this.status = status;
if (status != null) {
- this.active = status.getId().equals(300l);
+ this.active = status.getId().equals(300L);
} else {
this.active = null;
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupTypes.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupTypes.java
index 20331f0..428c987 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupTypes.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupTypes.java
@@ -23,9 +23,9 @@ import java.util.Map;
public enum GroupTypes {
- INVALID(0l, "lendingStrategy.invalid", "invalid"), //
- CENTER(1l, "groupTypes.center", "center"), //
- GROUP(2l, "groupTypes.group", "group"); //
+ INVALID(0L, "lendingStrategy.invalid", "invalid"), //
+ CENTER(1L, "groupTypes.center", "center"), //
+ GROUP(2L, "groupTypes.group", "group"); //
private Long id;
private String code;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
index b7b9526..7391b57 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
@@ -623,7 +623,7 @@ public class LoanCharge extends AbstractPersistableCustom {
if (isGreaterThanZero(value)) {
final MathContext mc = new MathContext(8, MoneyHelper.getRoundingMode());
- final BigDecimal multiplicand = percentage.divide(BigDecimal.valueOf(100l), mc);
+ final BigDecimal multiplicand = percentage.divide(BigDecimal.valueOf(100L), mc);
percentageOf = value.multiply(multiplicand, mc);
}
return percentageOf;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/FixedDepositAccount.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/FixedDepositAccount.java
index 2c909ef..2aa97d8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/FixedDepositAccount.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/FixedDepositAccount.java
@@ -182,7 +182,7 @@ public class FixedDepositAccount extends SavingsAccount {
}
this.nominalAnnualInterestRate = applicableInterestRate;
- return applicableInterestRate.divide(BigDecimal.valueOf(100l), mc);
+ return applicableInterestRate.divide(BigDecimal.valueOf(100L), mc);
}
public void updateMaturityDateAndAmountBeforeAccountActivation(final MathContext mc, final boolean isPreMatureClosure,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java
index 79d592d..ac2003e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java
@@ -235,7 +235,7 @@ public class RecurringDepositAccount extends SavingsAccount {
this.nominalAnnualInterestRate = applicableInterestRate;
- return applicableInterestRate.divide(BigDecimal.valueOf(100l), mc);
+ return applicableInterestRate.divide(BigDecimal.valueOf(100L), mc);
}
public void updateMaturityDateAndAmount(final MathContext mc, final boolean isPreMatureClosure,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccount.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccount.java
index c52e676..393ac3b 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccount.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccount.java
@@ -782,12 +782,12 @@ public class SavingsAccount extends AbstractPersistableCustom {
}
private BigDecimal getEffectiveOverdraftInterestRateAsFraction(MathContext mc) {
- return this.nominalAnnualInterestRateOverdraft.divide(BigDecimal.valueOf(100l), mc);
+ return this.nominalAnnualInterestRateOverdraft.divide(BigDecimal.valueOf(100L), mc);
}
@SuppressWarnings("unused")
protected BigDecimal getEffectiveInterestRateAsFraction(final MathContext mc, final LocalDate upToInterestCalculationDate) {
- return this.nominalAnnualInterestRate.divide(BigDecimal.valueOf(100l), mc);
+ return this.nominalAnnualInterestRate.divide(BigDecimal.valueOf(100L), mc);
}
protected List<SavingsAccountTransaction> retreiveOrderedNonInterestPostingTransactions() {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountCharge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountCharge.java
index 068b81c..81f9d07 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountCharge.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountCharge.java
@@ -544,7 +544,7 @@ public class SavingsAccountCharge extends AbstractPersistableCustom {
if (isGreaterThanZero(value)) {
final MathContext mc = new MathContext(8, MoneyHelper.getRoundingMode());
- final BigDecimal multiplicand = percentage.divide(BigDecimal.valueOf(100l), mc);
+ final BigDecimal multiplicand = percentage.divide(BigDecimal.valueOf(100L), mc);
percentageOf = value.multiply(multiplicand, mc);
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountCharge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountCharge.java
index f9a4e77..d0d5cca 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountCharge.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountCharge.java
@@ -238,7 +238,7 @@ public class ShareAccountCharge extends AbstractPersistableCustom {
BigDecimal percentageOf = BigDecimal.ZERO;
if (isGreaterThanZero(value)) {
final MathContext mc = new MathContext(8, MoneyHelper.getRoundingMode());
- final BigDecimal multiplicand = percentage.divide(BigDecimal.valueOf(100l), mc);
+ final BigDecimal multiplicand = percentage.divide(BigDecimal.valueOf(100L), mc);
percentageOf = value.multiply(multiplicand, mc);
}
return percentageOf;
@@ -341,7 +341,7 @@ public class ShareAccountCharge extends AbstractPersistableCustom {
if (ChargeCalculationType.fromInt(this.chargeCalculation).isFlat()) {
amountPaybale = this.amount;
} else if (ChargeCalculationType.fromInt(this.chargeCalculation).isPercentageOfAmount()) {
- amountPaybale = transactionAmount.multiply(this.percentage).divide(BigDecimal.valueOf(100l));
+ amountPaybale = transactionAmount.multiply(this.percentage).divide(BigDecimal.valueOf(100L));
}
this.amountOutstanding = amountPaybale;
return amountPaybale;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java
index 3d0a705..24aa8f1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java
@@ -326,7 +326,7 @@ public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService
for (Map<String, Object> details : scheduleDetails) {
Long count = (Long) details.get("futureInstallemts");
if (count == null) {
- count = 0l;
+ count = 0L;
}
final Long savingsId = (Long) details.get("savingsId");
final BigDecimal amount = (BigDecimal) details.get("amount");
diff --git a/fineract-provider/src/test/java/org/apache/fineract/mix/report/service/XBRLBuilderTest.java b/fineract-provider/src/test/java/org/apache/fineract/mix/report/service/XBRLBuilderTest.java
index 9c7b3e4..c16dcb9 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/mix/report/service/XBRLBuilderTest.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/mix/report/service/XBRLBuilderTest.java
@@ -61,7 +61,7 @@ public class XBRLBuilderTest {
public void setUp() {
this.readNamespaceService = Mockito.mock(NamespaceReadPlatformServiceImpl.class);
lenient().when(this.readNamespaceService.retrieveNamespaceByPrefix(ArgumentMatchers.anyString()))
- .thenReturn(new NamespaceData(1l, "mockedprefix", "mockedurl"));
+ .thenReturn(new NamespaceData(1L, "mockedprefix", "mockedurl"));
}
@Test