From 1fe9856eb2efd9e6d7752f401ee7fb413eecda9b Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Thu, 13 Sep 2012 01:05:56 +0100 Subject: [PATCH] some supressing of warnings and retaining loanAccountData as immutable (of sorts). --- .../platform/api/data/LoanAccountData.java | 18 +++++---------- .../api/data/LoanBasicDetailsData.java | 22 +++++++------------ .../mifosng/platform/client/domain/Note.java | 3 ++- .../saving/domain/DepositAccount.java | 1 - 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java index 0d3900306..c58c764b7 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java @@ -20,8 +20,8 @@ public class LoanAccountData { private final EnumOptionData status; private final Long fundId; private final String fundName; - private Long loanOfficerId; - private String loanOfficerName; + private final Long loanOfficerId; + private final String loanOfficerName; private final CurrencyData currency; private final BigDecimal principal; private final BigDecimal inArrearsTolerance; @@ -58,6 +58,8 @@ public class LoanAccountData { private final LoanConvenienceData convenienceData; // template + @SuppressWarnings("unused") + private final Collection loanOfficerOptions; private final Collection productOptions; private final Collection termFrequencyTypeOptions; private final Collection repaymentFrequencyTypeOptions; @@ -68,8 +70,8 @@ public class LoanAccountData { private final Collection interestCalculationPeriodTypeOptions; private final Collection fundOptions; private final Collection chargeOptions; - private final ChargeData chargeTemplate; - private final Collection loanOfficerOptions; + @SuppressWarnings("unused") + private final ChargeData chargeTemplate; public LoanAccountData( final LoanBasicDetailsData basicDetails, @@ -380,15 +382,7 @@ public class LoanAccountData { return loanOfficerId; } - public void setLoanOfficerId(Long loanOfficerId) { - this.loanOfficerId = loanOfficerId; - } - public String getLoanOfficerName() { return loanOfficerName; } - - public void setLoanOfficerName(String loanOfficerName) { - this.loanOfficerName = loanOfficerName; - } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanBasicDetailsData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanBasicDetailsData.java index 513fa69cd..2dbf25412 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanBasicDetailsData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanBasicDetailsData.java @@ -13,10 +13,6 @@ import org.joda.time.Months; */ public class LoanBasicDetailsData { - public Long getClientOfficeId() { - return clientOfficeId; - } - private final Long id; private final String externalId; private final Long clientId; @@ -28,8 +24,8 @@ public class LoanBasicDetailsData { private final EnumOptionData status; private final Long fundId; private final String fundName; - private Long loanOfficerId; - private String loanOfficerName; + private final Long loanOfficerId; + private final String loanOfficerName; private final CurrencyData currency; private final BigDecimal principal; private final BigDecimal inArrearsTolerance; @@ -105,6 +101,8 @@ public class LoanBasicDetailsData { this.status = null; this.fundId = fundId; this.fundName = fundName; + this.loanOfficerId = null; + this.loanOfficerName = null; this.currency = currency; this.principal = principal; this.inArrearsTolerance = inArrearsTolerance; @@ -367,6 +365,10 @@ public class LoanBasicDetailsData { public String getClientName() { return clientName; } + + public Long getClientOfficeId() { + return clientOfficeId; + } public Long getFundId() { return fundId; @@ -496,15 +498,7 @@ public class LoanBasicDetailsData { return loanOfficerId; } - public void setLoanOfficerId(Long loanOfficerId) { - this.loanOfficerId = loanOfficerId; - } - public String getLoanOfficerName() { return loanOfficerName; } - - public void setLoanOfficerName(String loanOfficerName) { - this.loanOfficerName = loanOfficerName; - } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Note.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Note.java index 3306bae0a..0ba963d85 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Note.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Note.java @@ -38,7 +38,8 @@ public class Note extends AbstractAuditableCustom { @Column(name = "note_type_enum") private Integer noteTypeId; - @ManyToOne + @SuppressWarnings("unused") + @ManyToOne @JoinColumn(name = "deposit_account_id", nullable = true) private DepositAccount depositAccount; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java index b52240294..1a2160420 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java @@ -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" })) public class DepositAccount extends AbstractAuditableCustom { - @SuppressWarnings("unused") @ManyToOne @JoinColumn(name = "client_id", nullable = false) private Client client;