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

some supressing of warnings and retaining loanAccountData as immutable (of sorts).

Browse Source
This commit is contained in:
Keith Woodlock
2012-09-13 01:05:56 +01:00
parent c90b98c12e
commit 1fe9856eb2
4 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java
+6 -12
View File
@@ -20,8 +20,8 @@ public class LoanAccountData {
private final EnumOptionData status; private final EnumOptionData status;
private final Long fundId; private final Long fundId;
private final String fundName; private final String fundName;
private Long loanOfficerId; private final Long loanOfficerId;
private String loanOfficerName; private final String loanOfficerName;
private final CurrencyData currency; private final CurrencyData currency;
private final BigDecimal principal; private final BigDecimal principal;
private final BigDecimal inArrearsTolerance; private final BigDecimal inArrearsTolerance;
@@ -58,6 +58,8 @@ public class LoanAccountData {
private final LoanConvenienceData convenienceData; private final LoanConvenienceData convenienceData;
// template // template
@SuppressWarnings("unused")
private final Collection<StaffData> loanOfficerOptions;
private final Collection<LoanProductLookup> productOptions; private final Collection<LoanProductLookup> productOptions;
private final Collection<EnumOptionData> termFrequencyTypeOptions; private final Collection<EnumOptionData> termFrequencyTypeOptions;
private final Collection<EnumOptionData> repaymentFrequencyTypeOptions; private final Collection<EnumOptionData> repaymentFrequencyTypeOptions;
@@ -68,8 +70,8 @@ public class LoanAccountData {
private final Collection<EnumOptionData> interestCalculationPeriodTypeOptions; private final Collection<EnumOptionData> interestCalculationPeriodTypeOptions;
private final Collection<FundData> fundOptions; private final Collection<FundData> fundOptions;
private final Collection<ChargeData> chargeOptions; private final Collection<ChargeData> chargeOptions;
private final ChargeData chargeTemplate; @SuppressWarnings("unused")
private final Collection<StaffData> loanOfficerOptions; private final ChargeData chargeTemplate;
public LoanAccountData( public LoanAccountData(
final LoanBasicDetailsData basicDetails, final LoanBasicDetailsData basicDetails,
@@ -380,15 +382,7 @@ public class LoanAccountData {
return loanOfficerId; return loanOfficerId;
} }
public void setLoanOfficerId(Long loanOfficerId) {
this.loanOfficerId = loanOfficerId;
}
public String getLoanOfficerName() { public String getLoanOfficerName() {
return loanOfficerName; return loanOfficerName;
} }
public void setLoanOfficerName(String loanOfficerName) {
this.loanOfficerName = loanOfficerName;
}
} }
mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanBasicDetailsData.java
+8 -14
View File
@@ -13,10 +13,6 @@ import org.joda.time.Months;
*/ */
public class LoanBasicDetailsData { public class LoanBasicDetailsData {
public Long getClientOfficeId() {
return clientOfficeId;
}
private final Long id; private final Long id;
private final String externalId; private final String externalId;
private final Long clientId; private final Long clientId;
@@ -28,8 +24,8 @@ public class LoanBasicDetailsData {
private final EnumOptionData status; private final EnumOptionData status;
private final Long fundId; private final Long fundId;
private final String fundName; private final String fundName;
private Long loanOfficerId; private final Long loanOfficerId;
private String loanOfficerName; private final String loanOfficerName;
private final CurrencyData currency; private final CurrencyData currency;
private final BigDecimal principal; private final BigDecimal principal;
private final BigDecimal inArrearsTolerance; private final BigDecimal inArrearsTolerance;
@@ -105,6 +101,8 @@ public class LoanBasicDetailsData {
this.status = null; this.status = null;
this.fundId = fundId; this.fundId = fundId;
this.fundName = fundName; this.fundName = fundName;
this.loanOfficerId = null;
this.loanOfficerName = null;
this.currency = currency; this.currency = currency;
this.principal = principal; this.principal = principal;
this.inArrearsTolerance = inArrearsTolerance; this.inArrearsTolerance = inArrearsTolerance;
@@ -367,6 +365,10 @@ public class LoanBasicDetailsData {
public String getClientName() { public String getClientName() {
return clientName; return clientName;
} }
public Long getClientOfficeId() {
return clientOfficeId;
}
public Long getFundId() { public Long getFundId() {
return fundId; return fundId;
@@ -496,15 +498,7 @@ public class LoanBasicDetailsData {
return loanOfficerId; return loanOfficerId;
} }
public void setLoanOfficerId(Long loanOfficerId) {
this.loanOfficerId = loanOfficerId;
}
public String getLoanOfficerName() { public String getLoanOfficerName() {
return loanOfficerName; return loanOfficerName;
} }
public void setLoanOfficerName(String loanOfficerName) {
this.loanOfficerName = loanOfficerName;
}
} }
mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Note.java
+2 -1
View File
@@ -38,7 +38,8 @@ public class Note extends AbstractAuditableCustom<AppUser, Long> {
@Column(name = "note_type_enum") @Column(name = "note_type_enum")
private Integer noteTypeId; private Integer noteTypeId;
@ManyToOne @SuppressWarnings("unused")
@ManyToOne
@JoinColumn(name = "deposit_account_id", nullable = true) @JoinColumn(name = "deposit_account_id", nullable = true)
private DepositAccount depositAccount; private DepositAccount depositAccount;
mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java
-1
View File
@@ -36,7 +36,6 @@ import org.mifosng.platform.user.domain.AppUser;
@Table(name = "m_deposit_account", uniqueConstraints = @UniqueConstraint(name="deposit_acc_external_id", columnNames = { "external_id" })) @Table(name = "m_deposit_account", uniqueConstraints = @UniqueConstraint(name="deposit_acc_external_id", columnNames = { "external_id" }))
public class DepositAccount extends AbstractAuditableCustom<AppUser, Long> { public class DepositAccount extends AbstractAuditableCustom<AppUser, Long> {
@SuppressWarnings("unused")
@ManyToOne @ManyToOne
@JoinColumn(name = "client_id", nullable = false) @JoinColumn(name = "client_id", nullable = false)
private Client client; private Client client;