use JdbcSupport throughout backend.

This commit is contained in:
Keith Woodlock
2012-05-27 23:26:46 +01:00
parent 1465f24298
commit 986cf32fc8
15 changed files with 92 additions and 107 deletions
@@ -3,12 +3,9 @@ package org.mifosng.data;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonFilter;
@XmlRootElement(name = "user")
@JsonIgnoreProperties({ "orgId" })
@JsonFilter("userFilter")
public class AppUserData {
@@ -4,11 +4,8 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.map.annotate.JsonFilter;
@XmlRootElement(name = "configuration")
@JsonFilter("myFilter")
public class ConfigurationData implements Serializable {
@@ -5,16 +5,16 @@ import java.io.Serializable;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "option")
public class EnumOptionReadModel implements Serializable {
public class EnumOptionData implements Serializable {
private Long id;
private String value;
public EnumOptionReadModel() {
public EnumOptionData() {
//
}
public EnumOptionReadModel(final String value, final Long id) {
public EnumOptionData(final String value, final Long id) {
this.value = value;
this.id = id;
}
@@ -9,21 +9,21 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class EnumOptionList {
private Collection<EnumOptionReadModel> options = new ArrayList<EnumOptionReadModel>();
private Collection<EnumOptionData> options = new ArrayList<EnumOptionData>();
protected EnumOptionList() {
//
}
public EnumOptionList(final List<EnumOptionReadModel> options) {
public EnumOptionList(final List<EnumOptionData> options) {
this.options = options;
}
public Collection<EnumOptionReadModel> getOptions() {
public Collection<EnumOptionData> getOptions() {
return this.options;
}
public void setOptions(final Collection<EnumOptionReadModel> options) {
public void setOptions(final Collection<EnumOptionData> options) {
this.options = options;
}
}
@@ -5,12 +5,9 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.map.annotate.JsonFilter;
import org.joda.time.DateTime;
@XmlRootElement(name = "loanProduct")
@JsonFilter("myFilter")
public class LoanProductData implements Serializable {
@@ -34,11 +31,11 @@ public class LoanProductData implements Serializable {
private DateTime lastModifedOn;
private List<CurrencyData> possibleCurrencies = new ArrayList<CurrencyData>();
private List<EnumOptionReadModel> possibleAmortizationOptions = new ArrayList<EnumOptionReadModel>();
private List<EnumOptionReadModel> possibleInterestOptions = new ArrayList<EnumOptionReadModel>();
private List<EnumOptionReadModel> possibleInterestRateCalculatedInPeriodOptions = new ArrayList<EnumOptionReadModel>();
private List<EnumOptionReadModel> repaymentFrequencyOptions = new ArrayList<EnumOptionReadModel>();
private List<EnumOptionReadModel> interestFrequencyOptions = new ArrayList<EnumOptionReadModel>();
private List<EnumOptionData> possibleAmortizationOptions = new ArrayList<EnumOptionData>();
private List<EnumOptionData> possibleInterestOptions = new ArrayList<EnumOptionData>();
private List<EnumOptionData> possibleInterestRateCalculatedInPeriodOptions = new ArrayList<EnumOptionData>();
private List<EnumOptionData> repaymentFrequencyOptions = new ArrayList<EnumOptionData>();
private List<EnumOptionData> interestFrequencyOptions = new ArrayList<EnumOptionData>();
public LoanProductData() {
//
@@ -199,39 +196,39 @@ public class LoanProductData implements Serializable {
this.possibleCurrencies = possibleCurrencies;
}
public List<EnumOptionReadModel> getPossibleAmortizationOptions() {
public List<EnumOptionData> getPossibleAmortizationOptions() {
return possibleAmortizationOptions;
}
public void setPossibleAmortizationOptions(
List<EnumOptionReadModel> possibleAmortizationOptions) {
List<EnumOptionData> possibleAmortizationOptions) {
this.possibleAmortizationOptions = possibleAmortizationOptions;
}
public List<EnumOptionReadModel> getPossibleInterestOptions() {
public List<EnumOptionData> getPossibleInterestOptions() {
return possibleInterestOptions;
}
public void setPossibleInterestOptions(
List<EnumOptionReadModel> possibleInterestOptions) {
List<EnumOptionData> possibleInterestOptions) {
this.possibleInterestOptions = possibleInterestOptions;
}
public List<EnumOptionReadModel> getRepaymentFrequencyOptions() {
public List<EnumOptionData> getRepaymentFrequencyOptions() {
return repaymentFrequencyOptions;
}
public void setRepaymentFrequencyOptions(
List<EnumOptionReadModel> repaymentFrequencyOptions) {
List<EnumOptionData> repaymentFrequencyOptions) {
this.repaymentFrequencyOptions = repaymentFrequencyOptions;
}
public List<EnumOptionReadModel> getInterestFrequencyOptions() {
public List<EnumOptionData> getInterestFrequencyOptions() {
return interestFrequencyOptions;
}
public void setInterestFrequencyOptions(
List<EnumOptionReadModel> interestFrequencyOptions) {
List<EnumOptionData> interestFrequencyOptions) {
this.interestFrequencyOptions = interestFrequencyOptions;
}
@@ -251,12 +248,12 @@ public class LoanProductData implements Serializable {
this.interestRateCalculatedInPeriod = interestRateCalculatedInPeriod;
}
public List<EnumOptionReadModel> getPossibleInterestRateCalculatedInPeriodOptions() {
public List<EnumOptionData> getPossibleInterestRateCalculatedInPeriodOptions() {
return possibleInterestRateCalculatedInPeriodOptions;
}
public void setPossibleInterestRateCalculatedInPeriodOptions(
List<EnumOptionReadModel> possibleInterestRateCalculatedInPeriodOptions) {
List<EnumOptionData> possibleInterestRateCalculatedInPeriodOptions) {
this.possibleInterestRateCalculatedInPeriodOptions = possibleInterestRateCalculatedInPeriodOptions;
}
}
@@ -4,12 +4,9 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.map.annotate.JsonFilter;
import org.joda.time.LocalDate;
@XmlRootElement(name = "office")
@JsonFilter("myFilter")
public class OfficeData implements Serializable {
@@ -3,12 +3,9 @@ package org.mifosng.data;
import java.util.ArrayList;
import java.util.Collection;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonFilter;
@XmlRootElement(name = "role")
@JsonIgnoreProperties({ "orgId" })
@JsonFilter("roleFilter")
public class RoleData {