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

Merge pull request #684 from vorburger/spotbugs-extra

Browse Source 
more SpotBugs related / inspired code clean up (see FINERACT-702)
This commit is contained in:
Awasum Yannick
2020-01-14 08:37:20 +01:00
committed by GitHub
parent efb0a558c8 6ca1a678cb
commit fc786fa3f6
14 changed files with 124 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/build.gradle
-6
View File
@@ -64,7 +64,6 @@ apply plugin: 'openjpa'
apply plugin: "com.github.spotbugs" apply plugin: "com.github.spotbugs"
// apply plugin: 'pmd' // apply plugin: 'pmd'
// apply plugin: 'findbugs'
dependencyManagement { dependencyManagement {
imports { imports {
@@ -341,11 +340,6 @@ compileJava{
/* /*
pmd { pmd {
sourceSets = [sourceSets.main] sourceSets = [sourceSets.main]
ignoreFailures = true
}
findbugs {
ignoreFailures = true
sourceSets = [sourceSets.main]
} }
*/ */
fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
+8 -11
View File
@@ -21,8 +21,6 @@ package org.apache.fineract.accounting.common;
import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityData; import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityData;
import org.apache.fineract.accounting.glaccount.domain.GLAccountType; import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
import net.sf.ehcache.util.FindBugsSuppressWarnings;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -245,7 +243,15 @@ public class AccountingConstants {
private final Integer value; private final Integer value;
private final String code; private final String code;
private final GLAccountType mappedGLAccountType; private final GLAccountType mappedGLAccountType;
private static List<FinancialActivityData> financialActivities; private static List<FinancialActivityData> financialActivities;
static {
financialActivities = new ArrayList<>();
for (final FINANCIAL_ACTIVITY type : FINANCIAL_ACTIVITY.values()) {
FinancialActivityData financialActivityData = convertToFinancialActivityData(type);
financialActivities.add(financialActivityData);
}
}
private FINANCIAL_ACTIVITY(final Integer value, final String code, final GLAccountType mappedGLAccountType) { private FINANCIAL_ACTIVITY(final Integer value, final String code, final GLAccountType mappedGLAccountType) {
this.value = value; this.value = value;
@@ -291,16 +297,7 @@ public class AccountingConstants {
return convertToFinancialActivityData(type); return convertToFinancialActivityData(type);
} }
// TODO Fix this..
@FindBugsSuppressWarnings("LI_LAZY_INIT_UPDATE_STATIC")
public static List<FinancialActivityData> getAllFinancialActivities() { public static List<FinancialActivityData> getAllFinancialActivities() {
if (financialActivities == null) {
financialActivities = new ArrayList<>();
for (final FINANCIAL_ACTIVITY type : FINANCIAL_ACTIVITY.values()) {
FinancialActivityData financialActivityData = convertToFinancialActivityData(type);
financialActivities.add(financialActivityData);
}
}
return financialActivities; return financialActivities;
} }
fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalance.java
+8 -8
View File
@@ -67,7 +67,6 @@ public class TrialBalance extends AbstractPersistableCustom<Long> {
} }
protected TrialBalance() { protected TrialBalance() {
} }
public Long getOfficeId() { public Long getOfficeId() {
@@ -97,16 +96,17 @@ public class TrialBalance extends AbstractPersistableCustom<Long> {
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (!obj.getClass().equals(getClass())) return false; if (!obj.getClass().equals(getClass())) return false;
TrialBalance trialBalance = (TrialBalance) obj; TrialBalance other = (TrialBalance) obj;
return trialBalance.getOfficeId().equals(this.getOfficeId()) return Objects.equals(other.officeId, officeId)
&& trialBalance.getGlAccountId().equals(this.getGlAccountId()) && Objects.equals(other.glAccountId, glAccountId)
&& trialBalance.getEntryDate().equals(this.getEntryDate()) && Objects.equals(other.amount, amount)
&& trialBalance.getTransactionDate().equals(this.getTransactionDate()); && Objects.equals(other.entryDate, entryDate)
&& Objects.equals(other.transactionDate, transactionDate)
&& Objects.equals(other.closingBalance, closingBalance);
} }
@Override @Override
public int hashCode() { public int hashCode() {
// TODO return Objects.hash(officeId, glAccountId, amount, entryDate, transactionDate, closingBalance); return Objects.hash(officeId, glAccountId, amount, entryDate, transactionDate, closingBalance);
return Objects.hash(officeId, glAccountId, entryDate, transactionDate);
} }
} }
fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/LoanProductProvisioningEntry.java
+31 -22
View File
@@ -74,8 +74,8 @@ public class LoanProductProvisioningEntry extends AbstractPersistableCustom<Long
private GLAccount expenseAccount; private GLAccount expenseAccount;
protected LoanProductProvisioningEntry() { protected LoanProductProvisioningEntry() {
} }
public LoanProductProvisioningEntry(final LoanProduct loanProduct, final Office office, final String currencyCode, public LoanProductProvisioningEntry(final LoanProduct loanProduct, final Office office, final String currencyCode,
final ProvisioningCategory provisioningCategory, final Long overdueInDays, final BigDecimal reservedAmount, final ProvisioningCategory provisioningCategory, final Long overdueInDays, final BigDecimal reservedAmount,
final GLAccount liabilityAccount, final GLAccount expenseAccount, Long criteriaId) { final GLAccount liabilityAccount, final GLAccount expenseAccount, Long criteriaId) {
@@ -95,41 +95,50 @@ public class LoanProductProvisioningEntry extends AbstractPersistableCustom<Long
} }
public BigDecimal getReservedAmount() { public BigDecimal getReservedAmount() {
return this.reservedAmount ; return this.reservedAmount;
} }
public void addReservedAmount(BigDecimal value) { public void addReservedAmount(BigDecimal value) {
this.reservedAmount = this.reservedAmount.add(value) ; this.reservedAmount = this.reservedAmount.add(value);
} }
public Office getOffice() { public Office getOffice() {
return this.office ; return this.office;
} }
public GLAccount getLiabilityAccount() {
return this.liabilityAccount;
}
public String getCurrencyCode() {
return this.currencyCode;
}
public GLAccount getExpenseAccount() {
return this.expenseAccount;
}
// TODO Note that this domain class does equals() & hashCode() on getId() for @JoinColumn attributes, which not all other classes do...
public GLAccount getLiabilityAccount() {
return this.liabilityAccount ;
}
public String getCurrencyCode() {
return this.currencyCode ;
}
public GLAccount getExpenseAccount() {
return this.expenseAccount ;
}
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (!obj.getClass().equals(getClass())) return false; if (!obj.getClass().equals(getClass())) return false;
LoanProductProvisioningEntry other = (LoanProductProvisioningEntry) obj; LoanProductProvisioningEntry other = (LoanProductProvisioningEntry) obj;
return Objects.equals(other.loanProduct.getId(), this.loanProduct.getId()) return Objects.equals(other.entry.getId(), this.entry.getId())
&& Objects.equals(other.provisioningCategory.getId(), this.provisioningCategory.getId()) && Objects.equals(other.criteriaId, this.criteriaId)
&& Objects.equals(other.office.getId(), this.office.getId()) && Objects.equals(other.office.getId(), this.office.getId())
&& Objects.equals(other.getCurrencyCode(), this.getCurrencyCode()); && Objects.equals(other.currencyCode, this.currencyCode)
&& Objects.equals(other.loanProduct.getId(), this.loanProduct.getId())
&& Objects.equals(other.provisioningCategory.getId(), this.provisioningCategory.getId())
&& Objects.equals(other.overdueInDays, this.overdueInDays)
&& Objects.equals(other.reservedAmount, this.reservedAmount)
&& Objects.equals(other.liabilityAccount.getId(), this.liabilityAccount.getId())
&& Objects.equals(other.expenseAccount.getId(), this.expenseAccount.getId());
} }
@Override @Override
public int hashCode() { public int hashCode() {
// TODO equals() must match: return Objects.hash(entry, criteriaId, office, currencyCode, loanProduct, provisioningCategory, overdueInDays, reservedAmount, liabilityAccount, expenseAccount); // NOT return Objects.hash(entry, criteriaId, office, currencyCode, loanProduct, provisioningCategory, overdueInDays, reservedAmount, liabilityAccount, expenseAccount);
return Objects.hash(loanProduct.getId(), provisioningCategory.getId(), office.getId(), getCurrencyCode()); // to remain consistent with the implementation in equals(), also use getId() here.
return Objects.hash(entry.getId(), criteriaId, office.getId(), currencyCode, loanProduct.getId(), provisioningCategory.getId(), overdueInDays, reservedAmount, liabilityAccount.getId(), expenseAccount.getId());
} }
} }
fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/ApplicationExitUtil.java
+2 -1
View File
@@ -22,6 +22,7 @@ import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
@@ -38,7 +39,7 @@ public abstract class ApplicationExitUtil {
System.out.println("\nHit Enter to quit..."); System.out.println("\nHit Enter to quit...");
// NOTE: In Eclipse, System.console() is not available.. so: // NOTE: In Eclipse, System.console() is not available.. so:
// (@see https://bugs.eclipse.org/bugs/show_bug.cgi?id=122429) // (@see https://bugs.eclipse.org/bugs/show_bug.cgi?id=122429)
BufferedReader d = new BufferedReader(new InputStreamReader(System.in, Charset.defaultCharset())); BufferedReader d = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
d.readLine(); d.readLine();
ctx.stop(); ctx.stop();
fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractPersistableCustom.java
+1 -17
View File
@@ -35,36 +35,20 @@ public abstract class AbstractPersistableCustom<PK extends Serializable> impleme
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id; private Long id;
/*
* (non-Javadoc)
*
* @see org.springframework.data.domain.Persistable#getId()
*/
@Override @Override
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* Sets the id of the entity.
*
* @param id the id to set
*/
protected void setId(final Long id) { protected void setId(final Long id) {
this.id = id; this.id = id;
} }
/*
* (non-Javadoc)
*
* @see org.springframework.data.domain.Persistable#isNew()
*/
@Override @Override
public boolean isNew() { public boolean isNew() {
return null == this.id; return null == this.id;
} }
//We have removed toString(), hashCode() and equals() methods. By adding them end up issues with OpenJPA // We have removed toString(), hashCode() and equals() methods here, because by adding them here, we end up with issues on OpenJPA.
} }
fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/domain/MoneyHelper.java
+1
View File
@@ -40,6 +40,7 @@ public class MoneyHelper {
private ConfigurationDomainService configurationDomainService; private ConfigurationDomainService configurationDomainService;
@PostConstruct @PostConstruct
// This is a hack, but fixing this is not trivial, because some @Entity domain classes use this helper
@FindBugsSuppressWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD") @FindBugsSuppressWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
public void someFunction () { public void someFunction () {
staticConfigurationDomainService = configurationDomainService; staticConfigurationDomainService = configurationDomainService;
fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java
+19 -24
View File
@@ -112,7 +112,6 @@ public class Charge extends AbstractPersistableCustom<Long> {
private TaxGroup taxGroup; private TaxGroup taxGroup;
public static Charge fromJson(final JsonCommand command, final GLAccount account, final TaxGroup taxGroup) { public static Charge fromJson(final JsonCommand command, final GLAccount account, final TaxGroup taxGroup) {
final String name = command.stringValueOfParameterNamed("name"); final String name = command.stringValueOfParameterNamed("name");
final BigDecimal amount = command.bigDecimalValueOfParameterNamed("amount"); final BigDecimal amount = command.bigDecimalValueOfParameterNamed("amount");
final String currencyCode = command.stringValueOfParameterNamed("currencyCode"); final String currencyCode = command.stringValueOfParameterNamed("currencyCode");
@@ -138,7 +137,6 @@ public class Charge extends AbstractPersistableCustom<Long> {
} }
protected Charge() { protected Charge() {
//
} }
private Charge(final String name, final BigDecimal amount, final String currencyCode, final ChargeAppliesTo chargeAppliesTo, private Charge(final String name, final BigDecimal amount, final String currencyCode, final ChargeAppliesTo chargeAppliesTo,
@@ -288,7 +286,6 @@ public class Charge extends AbstractPersistableCustom<Long> {
} }
public Map<String, Object> update(final JsonCommand command) { public Map<String, Object> update(final JsonCommand command) {
final Map<String, Object> actualChanges = new LinkedHashMap<>(7); final Map<String, Object> actualChanges = new LinkedHashMap<>(7);
final String localeAsInput = command.locale(); final String localeAsInput = command.locale();
@@ -507,7 +504,6 @@ public class Charge extends AbstractPersistableCustom<Long> {
} }
public ChargeData toData() { public ChargeData toData() {
final EnumOptionData chargeTimeType = ChargeEnumerations.chargeTimeType(this.chargeTimeType); final EnumOptionData chargeTimeType = ChargeEnumerations.chargeTimeType(this.chargeTimeType);
final EnumOptionData chargeAppliesTo = ChargeEnumerations.chargeAppliesTo(this.chargeAppliesTo); final EnumOptionData chargeAppliesTo = ChargeEnumerations.chargeAppliesTo(this.chargeAppliesTo);
final EnumOptionData chargeCalculationType = ChargeEnumerations.chargeCalculationType(this.chargeCalculation); final EnumOptionData chargeCalculationType = ChargeEnumerations.chargeCalculationType(this.chargeCalculation);
@@ -605,26 +601,25 @@ public class Charge extends AbstractPersistableCustom<Long> {
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (!(o instanceof Charge)) return false; if (!(o instanceof Charge)) return false;
Charge charge = (Charge) o; Charge other= (Charge) o;
return Objects.equals(name, charge.name) && return Objects.equals(name, other.name) &&
Objects.equals(amount, charge.amount) && Objects.equals(amount, other.amount) &&
Objects.equals(currencyCode, charge.currencyCode) && Objects.equals(currencyCode, other.currencyCode) &&
Objects.equals(chargeAppliesTo, charge.chargeAppliesTo) && Objects.equals(chargeAppliesTo, other.chargeAppliesTo) &&
Objects.equals(chargeTimeType, charge.chargeTimeType) && Objects.equals(chargeTimeType, other.chargeTimeType) &&
Objects.equals(chargeCalculation, charge.chargeCalculation) && Objects.equals(chargeCalculation, other.chargeCalculation) &&
Objects.equals(chargePaymentMode, charge.chargePaymentMode) && Objects.equals(chargePaymentMode, other.chargePaymentMode) &&
Objects.equals(feeOnDay, charge.feeOnDay) && Objects.equals(feeOnDay, other.feeOnDay) &&
Objects.equals(feeInterval, charge.feeInterval) && Objects.equals(feeInterval, other.feeInterval) &&
Objects.equals(feeOnMonth, charge.feeOnMonth) && Objects.equals(feeOnMonth, other.feeOnMonth) &&
Objects.equals(penalty, charge.penalty) && penalty == other.penalty &&
Objects.equals(active, charge.active) && active == other.active &&
Objects.equals(deleted, charge.deleted) && deleted == other.deleted &&
Objects.equals(minCap, charge.minCap) && Objects.equals(minCap, other.minCap) &&
Objects.equals(maxCap, charge.maxCap) && Objects.equals(maxCap, other.maxCap) &&
Objects.equals(feeFrequency, charge.feeFrequency) && Objects.equals(feeFrequency, other.feeFrequency) &&
Objects.equals(account, charge.account) && Objects.equals(account, other.account) &&
Objects.equals(taxGroup, charge.taxGroup); Objects.equals(taxGroup, other.taxGroup);
} }
@Override @Override
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+11 -7
View File
@@ -734,15 +734,12 @@ public class Loan extends AbstractPersistableCustom<Long> {
updateLoanSummaryDerivedFields(); updateLoanSummaryDerivedFields();
} }
// TODO Fix this correctly...
// See this review: https://github.com/apache/fineract/pull/670/files/0409af3903d350afe43ef4837e4d915ccbe14285#r357920211
@FindBugsSuppressWarnings("GC_UNRELATED_TYPES")
private void removeOrModifyTransactionAssociatedWithLoanChargeIfDueAtDisbursement(final LoanCharge loanCharge) { private void removeOrModifyTransactionAssociatedWithLoanChargeIfDueAtDisbursement(final LoanCharge loanCharge) {
if (loanCharge.isDueAtDisbursement()) { if (loanCharge.isDueAtDisbursement()) {
LoanTransaction transactionToRemove = null; LoanTransaction transactionToRemove = null;
List<LoanTransaction> transactions = getLoanTransactions() ; List<LoanTransaction> transactions = getLoanTransactions() ;
for (final LoanTransaction transaction : transactions) { for (final LoanTransaction transaction : transactions) {
if (transaction.isRepaymentAtDisbursement() && transaction.getLoanChargesPaid().contains(loanCharge)) { if (transaction.isRepaymentAtDisbursement() && doesLoanChargePaidByContainLoanCharge(transaction.getLoanChargesPaid(), loanCharge)) {
final MonetaryCurrency currency = loanCurrency(); final MonetaryCurrency currency = loanCurrency();
final Money chargeAmount = Money.of(currency, loanCharge.amount()); final Money chargeAmount = Money.of(currency, loanCharge.amount());
@@ -764,6 +761,15 @@ public class Loan extends AbstractPersistableCustom<Long> {
} }
} }
private boolean doesLoanChargePaidByContainLoanCharge(Set<LoanChargePaidBy> loanChargePaidBys, LoanCharge loanCharge) {
for (LoanChargePaidBy loanChargePaidBy : loanChargePaidBys) {
if (loanChargePaidBy.getLoanCharge().equals(loanCharge)) {
return true;
}
}
return false;
}
public Map<String, Object> updateLoanCharge(final LoanCharge loanCharge, final JsonCommand command) { public Map<String, Object> updateLoanCharge(final LoanCharge loanCharge, final JsonCommand command) {
final Map<String, Object> actualChanges = new LinkedHashMap<>(3); final Map<String, Object> actualChanges = new LinkedHashMap<>(3);
@@ -2719,8 +2725,6 @@ public class Loan extends AbstractPersistableCustom<Long> {
return chargesPayment; return chargesPayment;
} }
// TODO FIX THIS
@FindBugsSuppressWarnings("EC_UNRELATED_TYPES") // see this review: https://github.com/apache/fineract/pull/670/files/0409af3903d350afe43ef4837e4d915ccbe14285#r357920364
public Map<String, Object> undoDisbursal(final ScheduleGeneratorDTO scheduleGeneratorDTO, final List<Long> existingTransactionIds, public Map<String, Object> undoDisbursal(final ScheduleGeneratorDTO scheduleGeneratorDTO, final List<Long> existingTransactionIds,
final List<Long> existingReversedTransactionIds, AppUser currentUser) { final List<Long> existingReversedTransactionIds, AppUser currentUser) {
@@ -2741,7 +2745,7 @@ public class Loan extends AbstractPersistableCustom<Long> {
this.actualDisbursementDate = null; this.actualDisbursementDate = null;
this.disbursedBy = null; this.disbursedBy = null;
boolean isDisbursedAmountChanged = boolean isDisbursedAmountChanged =
!this.approvedPrincipal.equals(this.loanRepaymentScheduleDetail.getPrincipal()); !this.approvedPrincipal.equals(this.loanRepaymentScheduleDetail.getPrincipal().getAmount());
this.loanRepaymentScheduleDetail.setPrincipal(this.approvedPrincipal); this.loanRepaymentScheduleDetail.setPrincipal(this.approvedPrincipal);
if (this.loanProduct.isMultiDisburseLoan()) { if (this.loanProduct.isMultiDisburseLoan()) {
for (final LoanDisbursementDetails details : this.disbursementDetails) { for (final LoanDisbursementDetails details : this.disbursementDetails) {
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java
+2
View File
@@ -796,4 +796,6 @@ public class LoanTransaction extends AbstractPersistableCustom<Long> {
&& !(this.isDisbursement() || this.isAccrual() || this.isRepaymentAtDisbursement() || this.isNonMonetaryTransaction() || this && !(this.isDisbursement() || this.isAccrual() || this.isRepaymentAtDisbursement() || this.isNonMonetaryTransaction() || this
.isIncomePosting()); .isIncomePosting());
} }
// TODO missing hashCode(), equals(Object obj), but probably OK as long as this is never stored in a Collection.
} }
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductBorrowerCycleVariations.java
+9 -22
View File
@@ -56,7 +56,6 @@ public class LoanProductBorrowerCycleVariations extends AbstractPersistableCusto
private BigDecimal defaultValue; private BigDecimal defaultValue;
protected LoanProductBorrowerCycleVariations() { protected LoanProductBorrowerCycleVariations() {
} }
public LoanProductBorrowerCycleVariations(final Integer borrowerCycleNumber, final Integer paramType, final Integer valueConditionType, public LoanProductBorrowerCycleVariations(final Integer borrowerCycleNumber, final Integer paramType, final Integer valueConditionType,
@@ -83,30 +82,19 @@ public class LoanProductBorrowerCycleVariations extends AbstractPersistableCusto
@Override @Override
public boolean equals(final Object obj) { public boolean equals(final Object obj) {
final LoanProductBorrowerCycleVariations borrowerCycleVariations = (LoanProductBorrowerCycleVariations) obj; final LoanProductBorrowerCycleVariations other = (LoanProductBorrowerCycleVariations) obj;
boolean minValequal = false; return Objects.equals(loanProduct, other.loanProduct)
if (borrowerCycleVariations.minValue == null && this.minValue == null) { && Objects.equals(borrowerCycleNumber, other.borrowerCycleNumber)
minValequal = true; && Objects.equals(paramType, other.paramType)
} else if (borrowerCycleVariations.minValue != null && this.minValue != null) { && Objects.equals(valueConditionType, other.valueConditionType)
minValequal = borrowerCycleVariations.minValue.equals(this.minValue); && Objects.equals(minValue, other.minValue)
} && Objects.equals(maxValue, other.maxValue)
&& Objects.equals(defaultValue, other.defaultValue);
boolean maxValequal = false;
if (borrowerCycleVariations.maxValue == null && this.maxValue == null) {
maxValequal = true;
} else if (borrowerCycleVariations.maxValue != null && this.maxValue != null) {
maxValequal = borrowerCycleVariations.maxValue.equals(this.maxValue);
}
if (borrowerCycleVariations.borrowerCycleNumber.equals(this.borrowerCycleNumber)
&& borrowerCycleVariations.defaultValue.equals(this.defaultValue) && minValequal && maxValequal
&& borrowerCycleVariations.valueConditionType.equals(this.valueConditionType)
&& borrowerCycleVariations.paramType.equals(this.paramType)) { return true; }
return false;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(borrowerCycleNumber, minValue, maxValue); return Objects.hash(loanProduct, borrowerCycleNumber, paramType, valueConditionType, minValue, maxValue, defaultValue);
} }
public void copy(final LoanProductBorrowerCycleVariations borrowerCycleVariations) { public void copy(final LoanProductBorrowerCycleVariations borrowerCycleVariations) {
@@ -132,5 +120,4 @@ public class LoanProductBorrowerCycleVariations extends AbstractPersistableCusto
public BigDecimal getDefaultValue() { public BigDecimal getDefaultValue() {
return this.defaultValue; return this.defaultValue;
} }
} }
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductConfigurableAttributes.java
-2
View File
@@ -18,8 +18,6 @@
*/ */
package org.apache.fineract.portfolio.loanproduct.domain; package org.apache.fineract.portfolio.loanproduct.domain;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.api.JsonCommand;
import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
import org.apache.fineract.portfolio.loanproduct.LoanProductConstants; import org.apache.fineract.portfolio.loanproduct.LoanProductConstants;
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/data/SelfLoansDataValidator.java
+2 -13
View File
@@ -40,8 +40,6 @@ import org.springframework.stereotype.Component;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import net.sf.ehcache.util.FindBugsSuppressWarnings;
@Component @Component
public class SelfLoansDataValidator { public class SelfLoansDataValidator {
private static final Set<String> allowedAssociationParameters = new HashSet<>( private static final Set<String> allowedAssociationParameters = new HashSet<>(
@@ -85,9 +83,6 @@ public class SelfLoansDataValidator {
} }
// TODO fix this!
@FindBugsSuppressWarnings("EC_UNRELATED_TYPES")
// See review here: https://github.com/apache/fineract/pull/670
public HashMap<String, Object> validateLoanApplication(final String json){ public HashMap<String, Object> validateLoanApplication(final String json){
if (StringUtils.isBlank(json)) { throw new InvalidJsonException(); } if (StringUtils.isBlank(json)) { throw new InvalidJsonException(); }
@@ -98,7 +93,7 @@ public class SelfLoansDataValidator {
final String loanTypeParameterName = "loanType"; final String loanTypeParameterName = "loanType";
final String loanTypeStr = this.fromApiJsonHelper.extractStringNamed(loanTypeParameterName, element); final String loanTypeStr = this.fromApiJsonHelper.extractStringNamed(loanTypeParameterName, element);
baseDataValidator.reset().parameter(loanTypeParameterName).value(loanTypeStr).notNull().equals("individual"); baseDataValidator.reset().parameter(loanTypeParameterName).value(loanTypeStr).notNull().isOneOfTheseStringValues("individual");
final String clientIdParameterName = "clientId"; final String clientIdParameterName = "clientId";
final String clientId = this.fromApiJsonHelper.extractStringNamed(clientIdParameterName, element); final String clientId = this.fromApiJsonHelper.extractStringNamed(clientIdParameterName, element);
@@ -110,12 +105,8 @@ public class SelfLoansDataValidator {
retAttr.put("clientId", Long.parseLong(clientId)); retAttr.put("clientId", Long.parseLong(clientId));
return retAttr; return retAttr;
} }
// TODO fix this!
@FindBugsSuppressWarnings("EC_UNRELATED_TYPES")
// See review here: https://github.com/apache/fineract/pull/670/files/0409af3903d350afe43ef4837e4d915ccbe14285#r357920937
public HashMap<String, Object> validateModifyLoanApplication(final String json) { public HashMap<String, Object> validateModifyLoanApplication(final String json) {
final List<ApiParameterError> dataValidationErrors = new ArrayList<>(); final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("loan"); final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("loan");
@@ -125,7 +116,7 @@ public class SelfLoansDataValidator {
final String loanTypeParameterName = "loanType"; final String loanTypeParameterName = "loanType";
if(this.fromApiJsonHelper.parameterExists(loanTypeParameterName, element)){ if(this.fromApiJsonHelper.parameterExists(loanTypeParameterName, element)){
final String loanTypeStr = this.fromApiJsonHelper.extractStringNamed(loanTypeParameterName, element); final String loanTypeStr = this.fromApiJsonHelper.extractStringNamed(loanTypeParameterName, element);
baseDataValidator.reset().parameter(loanTypeParameterName).value(loanTypeStr).notNull().equals("individual"); baseDataValidator.reset().parameter(loanTypeParameterName).value(loanTypeStr).notNull().isOneOfTheseStringValues("individual");
} }
final String clientIdParameterName = "clientId"; final String clientIdParameterName = "clientId";
@@ -159,6 +150,4 @@ public class SelfLoansDataValidator {
unsupportedParams.add("template"); unsupportedParams.add("template");
} }
} }
} }
fineract-provider/src/test/java/org/apache/fineract/accounting/common/AccountingConstantsTest.java
+30
View File
@@ -0,0 +1,30 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.fineract.accounting.common;
import org.junit.Test;
import org.springframework.util.Assert;
public class AccountingConstantsTest {
@Test
public void testGetAllFinancialActivities() {
Assert.notEmpty(AccountingConstants.FINANCIAL_ACTIVITY.getAllFinancialActivities(), "static initialization of collection of all enums is broken");
}
}