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

tidy up data classes in prep for deletion of project.

Browse Source
This commit is contained in:
Keith Woodlock
2012-05-31 17:55:50 +01:00
parent e0beb43f6f
commit a4a24a2669
17 changed files with 82 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-data/src/main/java/org/mifosng/data/command/UpdateUsernamePasswordCommand.java
-55
View File
@@ -1,55 +0,0 @@
package org.mifosng.data.command;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class UpdateUsernamePasswordCommand {
private boolean usernameToBeChanged = true;
private String oldUsername;
private String username;
private String password;
protected UpdateUsernamePasswordCommand() {
//
}
public UpdateUsernamePasswordCommand(final String oldUsername,
final String username, final String password) {
this.oldUsername = oldUsername;
this.username = username;
this.password = password;
}
public boolean isUsernameToBeChanged() {
return this.usernameToBeChanged;
}
public void setUsernameToBeChanged(final boolean usernameToBeChanged) {
this.usernameToBeChanged = usernameToBeChanged;
}
public String getOldUsername() {
return this.oldUsername;
}
public String getUsername() {
return this.username;
}
public String getPassword() {
return this.password;
}
public void setOldUsername(final String oldUsername) {
this.oldUsername = oldUsername;
}
public void setUsername(final String username) {
this.username = username;
}
public void setPassword(final String password) {
this.password = password;
}
}
mifosng-data/src/main/java/org/mifosng/data/query/CalculatePayoffQuery.java
-23
View File
@@ -1,23 +0,0 @@
package org.mifosng.data.query;
import javax.xml.bind.annotation.XmlRootElement;
import org.joda.time.LocalDate;
@XmlRootElement
public class CalculatePayoffQuery {
private LocalDate payoffDate;
protected CalculatePayoffQuery() {
//
}
public LocalDate getPayoffDate() {
return this.payoffDate;
}
public void setPayoffDate(final LocalDate payoffDate) {
this.payoffDate = payoffDate;
}
}
mifosng-individual-lending-app/build.gradle
-2
View File
@@ -91,8 +91,6 @@ dependencies {
[group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.6.4'],
[group: 'ch.qos.logback', name: 'logback-core', version: '1.0.1'],
[group: 'ch.qos.logback', name: 'logback-classic', version: '1.0.0'],
[group: 'org.mifosng.data', name: 'mifosng-data', version: '0.2'],
)
}
mifosng-data/src/main/java/org/mifosng/data/AuthenticatedUserData.java → mifosng-individual-lending-app/src/main/java/org/mifosng/platform/api/data/AuthenticatedUserData.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.mifosng.data;
package org.mifosng.platform.api.data;
import java.util.ArrayList;
import java.util.Collection;
mifosng-individual-lending-app/src/main/java/org/mifosng/ui/infrastructure/ApiDelegatingAuthenticationProvider.java
+1 -1
View File
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.Collection;
import org.mifosng.configuration.ApplicationConfigurationService;
import org.mifosng.data.AuthenticatedUserData;
import org.mifosng.platform.api.data.AuthenticatedUserData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
mifosng-provider/build.gradle
+1 -4
View File
@@ -1,5 +1,3 @@
dependsOn(':mifosng-data')
buildscript {
repositories {
add(new org.apache.ivy.plugins.resolver.URLResolver()) {
@@ -73,8 +71,7 @@ dependencies {
[group: 'javax.servlet', name: 'servlet-api', version: '2.5'],
)
compile( project(':mifosng-data'),
compile(
[group: 'javax.servlet', name: 'jstl', version: '1.2'],
[group: 'org.springframework', name: 'spring-core', version: springVersion],
mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingService.java
+2 -2
View File
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.ws.rs.core.StreamingOutput;
import org.mifosng.data.AdditionalFieldsSet;
import org.mifosng.data.reports.GenericResultset;
import org.mifosng.platform.api.data.AdditionalFieldsSet;
import org.mifosng.platform.api.data.GenericResultset;
public interface ReadExtraDataAndReportingService {
mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java
+4 -4
View File
@@ -16,10 +16,10 @@ import java.util.Set;
import javax.sql.DataSource;
import javax.ws.rs.core.StreamingOutput;
import org.mifosng.data.AdditionalFieldsSet;
import org.mifosng.data.reports.GenericResultset;
import org.mifosng.data.reports.ResultsetColumnHeader;
import org.mifosng.data.reports.ResultsetDataRow;
import org.mifosng.platform.api.data.AdditionalFieldsSet;
import org.mifosng.platform.api.data.GenericResultset;
import org.mifosng.platform.api.data.ResultsetColumnHeader;
import org.mifosng.platform.api.data.ResultsetDataRow;
import org.mifosng.platform.exceptions.AdditionalFieldsNotFoundException;
import org.mifosng.platform.exceptions.PlatformDataIntegrityException;
import org.mifosng.platform.exceptions.ReportNotFoundException;
mifosng-provider/src/main/java/org/mifosng/platform/api/AdditionalFieldsApiResource.java
+2 -2
View File
@@ -22,12 +22,12 @@ import javax.ws.rs.core.UriInfo;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import org.mifosng.data.AdditionalFieldsSet;
import org.mifosng.data.reports.GenericResultset;
import org.mifosng.platform.InvalidSqlException;
import org.mifosng.platform.ReadExtraDataAndReportingService;
import org.mifosng.platform.api.data.AdditionalFieldsSet;
import org.mifosng.platform.api.data.ApiParameterError;
import org.mifosng.platform.api.data.EntityIdentifier;
import org.mifosng.platform.api.data.GenericResultset;
import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService;
import org.mifosng.platform.exceptions.PlatformApiDataValidationException;
import org.slf4j.Logger;
mifosng-provider/src/main/java/org/mifosng/platform/api/AuthenticationApiResource.java
+1 -1
View File
@@ -11,7 +11,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.mifosng.data.AuthenticatedUserData;
import org.mifosng.platform.api.data.AuthenticatedUserData;
import org.mifosng.platform.user.domain.AppUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
mifosng-provider/src/main/java/org/mifosng/platform/api/ReportingApiResource.java
+1 -1
View File
@@ -16,8 +16,8 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
import javax.ws.rs.core.UriInfo;
import org.mifosng.data.reports.GenericResultset;
import org.mifosng.platform.ReadExtraDataAndReportingService;
import org.mifosng.platform.api.data.GenericResultset;
import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
mifosng-data/src/main/java/org/mifosng/data/AdditionalFieldsSet.java → mifosng-provider/src/main/java/org/mifosng/platform/api/data/AdditionalFieldsSet.java
+1 -4
View File
@@ -1,10 +1,7 @@
package org.mifosng.data;
import javax.xml.bind.annotation.XmlRootElement;
package org.mifosng.platform.api.data;
import org.codehaus.jackson.map.annotate.JsonFilter;
@XmlRootElement
@JsonFilter("myFilter")
public class AdditionalFieldsSet {
mifosng-provider/src/main/java/org/mifosng/platform/api/data/AuthenticatedUserData.java
+65
View File
@@ -0,0 +1,65 @@
package org.mifosng.platform.api.data;
import java.util.ArrayList;
import java.util.Collection;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class AuthenticatedUserData {
private String username;
private Long userId;
private String base64EncodedAuthenticationKey;
private boolean authenticated = false;
private Collection<String> permissions = new ArrayList<String>();
protected AuthenticatedUserData() {
//
}
public AuthenticatedUserData(final Collection<String> permissions) {
this.permissions = permissions;
}
public Collection<String> getPermissions() {
return this.permissions;
}
public void setPermissions(final Collection<String> permissions) {
this.permissions = permissions;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public boolean isAuthenticated() {
return authenticated;
}
public void setAuthenticated(boolean authenticated) {
this.authenticated = authenticated;
}
public String getBase64EncodedAuthenticationKey() {
return base64EncodedAuthenticationKey;
}
public void setBase64EncodedAuthenticationKey(
String base64EncodedAuthenticationKey) {
this.base64EncodedAuthenticationKey = base64EncodedAuthenticationKey;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
}
mifosng-data/src/main/java/org/mifosng/data/reports/GenericResultset.java → mifosng-provider/src/main/java/org/mifosng/platform/api/data/GenericResultset.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.mifosng.data.reports;
package org.mifosng.platform.api.data;
import java.util.ArrayList;
import java.util.List;
mifosng-data/src/main/java/org/mifosng/data/reports/ResultsetColumnHeader.java → mifosng-provider/src/main/java/org/mifosng/platform/api/data/ResultsetColumnHeader.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.mifosng.data.reports;
package org.mifosng.platform.api.data;
import java.util.ArrayList;
import java.util.List;
mifosng-data/src/main/java/org/mifosng/data/reports/ResultsetDataRow.java → mifosng-provider/src/main/java/org/mifosng/platform/api/data/ResultsetDataRow.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.mifosng.data.reports;
package org.mifosng.platform.api.data;
import java.util.ArrayList;
import java.util.List;
mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java
-39
View File
@@ -114,45 +114,6 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
realLoan.isWaitingForDisbursal());
return new LoanAccountData(realLoan.getId(), basicDetails, loanData, permissions);
// return new LoanAccountData(realLoan.isClosed(), realLoan.isOpen(),
// realLoan.isOpenWithRepaymentMade(), interestRebateOutstanding,
// realLoan.isSubmittedAndPendingApproval(),
// realLoan.isWaitingForDisbursal(), undoDisbursalAllowed,
// makeRepaymentAllowed, rejectAllowed,
// withdrawnByApplicantAllowed, undoApprovalAllowed,
// disbursalAllowed, realLoan.getLoanStatusDisplayName(),
// loanStatusDate, realLoan.getId(), realLoan.getExternalId(),
// realLoan.getLoanProduct().getName(),
// realLoan.getClosedOnDate(), realLoan.getSubmittedOnDate(),
// realLoan.getApprovedOnDate(), expectedDisbursementDate,
// realLoan.getDisbursedOnDate(),
// realLoan.getExpectedMaturityDate(),
// realLoan.getExpectedFirstRepaymentOnDate(),
// realLoan.getInterestCalculatedFromDate(), principal, realLoan
// .getLoanRepaymentScheduleDetail()
// .getAnnualNominalInterestRate(), realLoan
// .getLoanRepaymentScheduleDetail()
// .getNominalInterestRatePerPeriod(), realLoan
// .getLoanRepaymentScheduleDetail()
// .getInterestPeriodFrequencyType().getValue(), realLoan
// .getLoanRepaymentScheduleDetail()
// .getInterestPeriodFrequencyType().toString(), realLoan
// .getLoanRepaymentScheduleDetail().getInterestMethod()
// .getValue(), realLoan.getLoanRepaymentScheduleDetail()
// .getInterestMethod().toString(), realLoan
// .getLoanRepaymentScheduleDetail()
// .getAmortizationMethod().getValue(), realLoan
// .getLoanRepaymentScheduleDetail()
// .getAmortizationMethod().toString(), realLoan
// .getLoanRepaymentScheduleDetail()
// .getNumberOfRepayments(), realLoan
// .getLoanRepaymentScheduleDetail().getRepayEvery(),
// realLoan.getLoanRepaymentScheduleDetail()
// .getRepaymentPeriodFrequencyType().getValue(), realLoan
// .getLoanRepaymentScheduleDetail()
// .getRepaymentPeriodFrequencyType().toString(),
// tolerance, loanData, waiveAllowed, interestRebateOwed);
}
@Override