From bdb549253c21a3b65e505a3b2788bf2913f7e44f Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Wed, 30 May 2012 16:50:45 +0100 Subject: [PATCH] tidy up by moving mifosng-data files back into platform project. --- .../java/org/mifosng/platform/DataValidatorBuilder.java | 2 +- .../platform/api/AdditionalFieldsApiResource.java | 4 ++-- .../java/org/mifosng/platform/api/ClientApiResource.java | 4 ++-- .../mifosng/platform/api/ConfigurationApiResource.java | 2 +- .../org/mifosng/platform/api/LoanProductApiResource.java | 2 +- .../java/org/mifosng/platform/api/LoansApiResource.java | 6 +++--- .../java/org/mifosng/platform/api/OfficeApiResource.java | 2 +- .../java/org/mifosng/platform/api/RoleApiResource.java | 2 +- .../java/org/mifosng/platform/api/UserApiResource.java | 2 +- .../mifosng/platform/api}/data/ApiErrorMessageArg.java | 4 +--- .../platform/api}/data/ApiGlobalErrorResponse.java | 4 +--- .../mifosng/platform/api}/data/ApiParameterError.java | 5 +---- .../mifosng/platform/api}/data/ConfigurationData.java | 3 ++- .../org/mifosng/platform/api}/data/EntityIdentifier.java | 4 +--- .../org/mifosng/platform/api}/data/EnumOptionData.java | 2 +- .../org/mifosng/platform/api/data/LoanProductData.java | 1 - ...{NewLoanWorkflowStepOneData.java => NewLoanData.java} | 7 ++----- .../java/org/mifosng/platform/api}/data/NoteData.java | 5 +---- .../java/org/mifosng/platform/api/data/OfficeLookup.java | 3 --- .../api/errorhandling/AccessDeniedExceptionMapper.java | 2 +- .../api/errorhandling/BadCredentialsExceptionMapper.java | 2 +- .../errorhandling/NoAuthorizationExceptionMapper.java | 2 +- .../PlatformApiDataValidationExceptionMapper.java | 2 +- .../PlatformDataIntegrityExceptionMapper.java | 2 +- .../errorhandling/PlatformDomainRuleExceptionMapper.java | 2 +- .../PlatformInternalServerExceptionMapper.java | 2 +- .../PlatformResourceNotFoundExceptionMapper.java | 2 +- .../UnAuthenticatedUserExceptionMapper.java | 2 +- .../UnrecognizedPropertyExceptionMapper.java | 4 ++-- .../UnrecognizedQueryParamExceptionMapper.java | 4 ++-- .../api/infrastructure/ApiDataConversionServiceImpl.java | 2 +- .../platform/client/service/ClientCommandValidator.java | 2 +- .../client/service/ClientReadPlatformService.java | 2 +- .../client/service/ClientReadPlatformServiceImpl.java | 2 +- .../client/service/ClientWritePlatformService.java | 2 +- .../ClientWritePlatformServiceJpaRepositoryImpl.java | 2 +- .../service/ConfigurationReadPlatformService.java | 2 +- .../service/ConfigurationReadPlatformServiceImpl.java | 2 +- ...nfigurationWritePlatformServiceJpaRepositoryImpl.java | 2 +- .../exceptions/PlatformApiDataValidationException.java | 2 +- .../platform/loan/domain/DerivedLoanDataProcessor.java | 1 - .../loan/domain}/LoanRepaymentDataComparator.java | 2 +- .../service/AdjustLoanTransactionCommandValidator.java | 2 +- .../service/CalculateLoanScheduleCommandValidator.java | 2 +- .../loan/service/CalculationPlatformService.java | 1 - .../loan/service/CalculationPlatformServiceImpl.java | 1 - .../platform/loan/service}/LoanPayoffReadModel.java | 9 +++++---- .../platform/loan/service/LoanReadPlatformService.java | 4 ++-- .../loan/service/LoanReadPlatformServiceImpl.java | 6 +++--- .../service/LoanStateTransitionCommandValidator.java | 2 +- .../loan/service/LoanTransactionCommandValidator.java | 2 +- .../platform/loan/service/LoanWritePlatformService.java | 2 +- .../LoanWritePlatformServiceJpaRepositoryImpl.java | 2 +- .../service/SubmitLoanApplicationCommandValidator.java | 2 +- .../service/LoanDropdownReadPlatformService.java | 2 +- .../service/LoanDropdownReadPlatformServiceImpl.java | 2 +- .../platform/loanproduct/service/LoanEnumerations.java | 2 +- .../loanproduct/service/LoanProductCommandValidator.java | 2 +- .../service/LoanProductReadPlatformServiceImpl.java | 2 +- .../service/LoanProductWritePlatformService.java | 2 +- ...LoanProductWritePlatformServiceJpaRepositoryImpl.java | 2 +- .../organisation/service/OfficeCommandValidator.java | 2 +- .../java/org/mifosng/platform/rest/LoanOpenResource.java | 2 +- .../AppUserWritePlatformServiceJpaRepositoryImpl.java | 2 +- .../platform/user/service/RoleCommandValidator.java | 2 +- .../platform/user/service/UserCommandValidator.java | 2 +- 66 files changed, 76 insertions(+), 96 deletions(-) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/ApiErrorMessageArg.java (80%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/ApiGlobalErrorResponse.java (98%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/ApiParameterError.java (96%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/ConfigurationData.java (91%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/EntityIdentifier.java (73%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/EnumOptionData.java (94%) rename mifosng-provider/src/main/java/org/mifosng/platform/api/data/{NewLoanWorkflowStepOneData.java => NewLoanData.java} (96%) rename {mifosng-data/src/main/java/org/mifosng => mifosng-provider/src/main/java/org/mifosng/platform/api}/data/NoteData.java (96%) rename {mifosng-data/src/main/java/org/mifosng/data => mifosng-provider/src/main/java/org/mifosng/platform/loan/domain}/LoanRepaymentDataComparator.java (88%) rename {mifosng-data/src/main/java/org/mifosng/data => mifosng-provider/src/main/java/org/mifosng/platform/loan/service}/LoanPayoffReadModel.java (97%) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/DataValidatorBuilder.java b/mifosng-provider/src/main/java/org/mifosng/platform/DataValidatorBuilder.java index a301d2999..d8387ac35 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/DataValidatorBuilder.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/DataValidatorBuilder.java @@ -4,7 +4,7 @@ import java.math.BigDecimal; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.mifosng.data.ApiParameterError; +import org.mifosng.platform.api.data.ApiParameterError; import org.springframework.util.ObjectUtils; public class DataValidatorBuilder { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/AdditionalFieldsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/AdditionalFieldsApiResource.java index 2d2ccb694..8d641db47 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/AdditionalFieldsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/AdditionalFieldsApiResource.java @@ -23,11 +23,11 @@ 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.ApiParameterError; -import org.mifosng.data.EntityIdentifier; import org.mifosng.data.reports.GenericResultset; import org.mifosng.platform.InvalidSqlException; import org.mifosng.platform.ReadExtraDataAndReportingService; +import org.mifosng.platform.api.data.ApiParameterError; +import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; import org.slf4j.Logger; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java index fc6ec1907..8d698917c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java @@ -18,11 +18,11 @@ import javax.ws.rs.core.UriInfo; import org.joda.time.LocalDate; import org.mifosng.data.ClientLoanAccountSummaryCollectionData; -import org.mifosng.data.EntityIdentifier; -import org.mifosng.data.NoteData; import org.mifosng.platform.api.commands.ClientCommand; import org.mifosng.platform.api.commands.NoteCommand; import org.mifosng.platform.api.data.ClientData; +import org.mifosng.platform.api.data.EntityIdentifier; +import org.mifosng.platform.api.data.NoteData; import org.mifosng.platform.api.data.OfficeLookup; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/ConfigurationApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/ConfigurationApiResource.java index 006f1c78f..70c1ca8e0 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/ConfigurationApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/ConfigurationApiResource.java @@ -10,8 +10,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.mifosng.data.ConfigurationData; import org.mifosng.platform.api.commands.OrganisationCurrencyCommand; +import org.mifosng.platform.api.data.ConfigurationData; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.configuration.service.ConfigurationReadPlatformService; import org.mifosng.platform.configuration.service.ConfigurationWritePlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanProductApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanProductApiResource.java index 860207d38..b58dcda05 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanProductApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoanProductApiResource.java @@ -16,8 +16,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.mifosng.data.EntityIdentifier; import org.mifosng.platform.api.commands.LoanProductCommand; +import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.data.LoanProductData; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java index 74e450d56..b1116f1a2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java @@ -18,7 +18,6 @@ import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; import org.joda.time.LocalDate; -import org.mifosng.data.EntityIdentifier; import org.mifosng.data.LoanAccountData; import org.mifosng.data.LoanRepaymentData; import org.mifosng.data.LoanSchedule; @@ -28,7 +27,8 @@ import org.mifosng.platform.api.commands.LoanStateTransitionCommand; import org.mifosng.platform.api.commands.LoanTransactionCommand; import org.mifosng.platform.api.commands.SubmitLoanApplicationCommand; import org.mifosng.platform.api.commands.UndoStateTransitionCommand; -import org.mifosng.platform.api.data.NewLoanWorkflowStepOneData; +import org.mifosng.platform.api.data.EntityIdentifier; +import org.mifosng.platform.api.data.NewLoanData; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.exceptions.UnrecognizedQueryParamException; @@ -76,7 +76,7 @@ public class LoansApiResource { @QueryParam("productId") final Long productId, @Context UriInfo uriInfo) { - NewLoanWorkflowStepOneData workflowData = this.loanReadPlatformService + NewLoanData workflowData = this.loanReadPlatformService .retrieveClientAndProductDetails(clientId, productId); String selectedFields = ""; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeApiResource.java index 9f23a8904..40a15d9c1 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeApiResource.java @@ -16,8 +16,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.joda.time.LocalDate; -import org.mifosng.data.EntityIdentifier; import org.mifosng.platform.api.commands.OfficeCommand; +import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.data.OfficeData; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/RoleApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/RoleApiResource.java index 365faffbf..ea16eb056 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/RoleApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/RoleApiResource.java @@ -15,8 +15,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.mifosng.data.EntityIdentifier; import org.mifosng.platform.api.commands.RoleCommand; +import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.data.PermissionData; import org.mifosng.platform.api.data.RoleData; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/UserApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/UserApiResource.java index e07b6c51f..bcd761b05 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/UserApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/UserApiResource.java @@ -15,9 +15,9 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.mifosng.data.EntityIdentifier; import org.mifosng.platform.api.commands.UserCommand; import org.mifosng.platform.api.data.AppUserData; +import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.user.service.AppUserReadPlatformService; import org.mifosng.platform.user.service.AppUserWritePlatformService; diff --git a/mifosng-data/src/main/java/org/mifosng/data/ApiErrorMessageArg.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/ApiErrorMessageArg.java similarity index 80% rename from mifosng-data/src/main/java/org/mifosng/data/ApiErrorMessageArg.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/ApiErrorMessageArg.java index 22843ba22..dda4de0ae 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/ApiErrorMessageArg.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/ApiErrorMessageArg.java @@ -1,8 +1,6 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; -import javax.xml.bind.annotation.XmlRootElement; -@XmlRootElement(name="messageArg") public class ApiErrorMessageArg { /** diff --git a/mifosng-data/src/main/java/org/mifosng/data/ApiGlobalErrorResponse.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/ApiGlobalErrorResponse.java similarity index 98% rename from mifosng-data/src/main/java/org/mifosng/data/ApiGlobalErrorResponse.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/ApiGlobalErrorResponse.java index fb300155c..72be66252 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/ApiGlobalErrorResponse.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/ApiGlobalErrorResponse.java @@ -1,16 +1,14 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.util.ArrayList; import java.util.List; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; /** * */ -@XmlRootElement public class ApiGlobalErrorResponse { /** diff --git a/mifosng-data/src/main/java/org/mifosng/data/ApiParameterError.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/ApiParameterError.java similarity index 96% rename from mifosng-data/src/main/java/org/mifosng/data/ApiParameterError.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/ApiParameterError.java index d959e99ba..e00358ce7 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/ApiParameterError.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/ApiParameterError.java @@ -1,11 +1,8 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name="apiParameterError") public class ApiParameterError { /** diff --git a/mifosng-data/src/main/java/org/mifosng/data/ConfigurationData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/ConfigurationData.java similarity index 91% rename from mifosng-data/src/main/java/org/mifosng/data/ConfigurationData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/ConfigurationData.java index 888b86362..9da380973 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/ConfigurationData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/ConfigurationData.java @@ -1,10 +1,11 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import org.codehaus.jackson.map.annotate.JsonFilter; +import org.mifosng.data.CurrencyData; @JsonFilter("myFilter") public class ConfigurationData implements Serializable { diff --git a/mifosng-data/src/main/java/org/mifosng/data/EntityIdentifier.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/EntityIdentifier.java similarity index 73% rename from mifosng-data/src/main/java/org/mifosng/data/EntityIdentifier.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/EntityIdentifier.java index 161ba75a1..1a00a820a 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/EntityIdentifier.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/EntityIdentifier.java @@ -1,8 +1,6 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; -import javax.xml.bind.annotation.XmlRootElement; -@XmlRootElement(name = "identifier") public class EntityIdentifier { private Long entityId; diff --git a/mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/EnumOptionData.java similarity index 94% rename from mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/EnumOptionData.java index 7e207cc83..31fc647d6 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/EnumOptionData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/EnumOptionData.java @@ -1,4 +1,4 @@ -package org.mifosng.data; +package org.mifosng.platform.api.data; import java.io.Serializable; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanProductData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanProductData.java index f1879ea6f..85f3eeb0b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanProductData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanProductData.java @@ -8,7 +8,6 @@ import java.util.List; import org.codehaus.jackson.map.annotate.JsonFilter; import org.joda.time.DateTime; import org.mifosng.data.CurrencyData; -import org.mifosng.data.EnumOptionData; import org.mifosng.data.MoneyData; @JsonFilter("myFilter") diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/NewLoanWorkflowStepOneData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/NewLoanData.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/data/NewLoanWorkflowStepOneData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/NewLoanData.java index 04242a43e..bb4e5392e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/NewLoanWorkflowStepOneData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/NewLoanData.java @@ -4,17 +4,14 @@ import java.io.Serializable; 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; import org.joda.time.LocalDate; import org.mifosng.data.LoanSchedule; -@XmlRootElement(name = "newloanworkflow") @JsonIgnoreProperties({ "organisationId", "organisationName" }) @JsonFilter("myFilter") -public class NewLoanWorkflowStepOneData implements Serializable { +public class NewLoanData implements Serializable { private Long organisationId; private String organisationName; @@ -44,7 +41,7 @@ public class NewLoanWorkflowStepOneData implements Serializable { private LoanProductData selectedProduct; - public NewLoanWorkflowStepOneData() { + public NewLoanData() { // } diff --git a/mifosng-data/src/main/java/org/mifosng/data/NoteData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/NoteData.java similarity index 96% rename from mifosng-data/src/main/java/org/mifosng/data/NoteData.java rename to mifosng-provider/src/main/java/org/mifosng/platform/api/data/NoteData.java index 533fd7d91..16cc225f3 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/NoteData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/NoteData.java @@ -1,11 +1,8 @@ -package org.mifosng.data; - -import javax.xml.bind.annotation.XmlRootElement; +package org.mifosng.platform.api.data; import org.codehaus.jackson.map.annotate.JsonFilter; import org.joda.time.DateTime; -@XmlRootElement(name = "note") @JsonFilter("myFilter") public class NoteData { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/OfficeLookup.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/OfficeLookup.java index 9352b89fb..bc0eaba33 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/OfficeLookup.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/OfficeLookup.java @@ -2,9 +2,6 @@ package org.mifosng.platform.api.data; import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "officeLookup") public class OfficeLookup implements Serializable { private Long id; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/AccessDeniedExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/AccessDeniedExceptionMapper.java index 2e823f383..21373b66d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/AccessDeniedExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/AccessDeniedExceptionMapper.java @@ -5,7 +5,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.mifosng.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; import org.springframework.context.annotation.Scope; import org.springframework.security.access.AccessDeniedException; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/BadCredentialsExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/BadCredentialsExceptionMapper.java index 32ca44277..e8e8f09ff 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/BadCredentialsExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/BadCredentialsExceptionMapper.java @@ -5,7 +5,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.mifosng.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; import org.springframework.context.annotation.Scope; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/NoAuthorizationExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/NoAuthorizationExceptionMapper.java index 9081bdcc5..ad72f9dfd 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/NoAuthorizationExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/NoAuthorizationExceptionMapper.java @@ -5,7 +5,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.mifosng.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; import org.mifosng.platform.exceptions.NoAuthorizationException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformApiDataValidationExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformApiDataValidationExceptionMapper.java index 8fdd13777..12c6e14fc 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformApiDataValidationExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformApiDataValidationExceptionMapper.java @@ -5,7 +5,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.mifosng.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDataIntegrityExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDataIntegrityExceptionMapper.java index 12edc343a..e08cb3105 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDataIntegrityExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDataIntegrityExceptionMapper.java @@ -5,7 +5,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.mifosng.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; import org.mifosng.platform.exceptions.PlatformDataIntegrityException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDomainRuleExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDomainRuleExceptionMapper.java index fcf782c33..e9622eec4 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDomainRuleExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDomainRuleExceptionMapper.java @@ -5,7 +5,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.mifosng.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; import org.mifosng.platform.exceptions.AbstractPlatformDomainRuleException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformInternalServerExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformInternalServerExceptionMapper.java index 36cb4246d..2d763fa99 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformInternalServerExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformInternalServerExceptionMapper.java @@ -5,7 +5,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.mifosng.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; import org.mifosng.platform.exceptions.PlatformInternalServerException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformResourceNotFoundExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformResourceNotFoundExceptionMapper.java index 8ed1cb71c..e9c647330 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformResourceNotFoundExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformResourceNotFoundExceptionMapper.java @@ -5,7 +5,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.mifosng.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; import org.mifosng.platform.exceptions.AbstractPlatformResourceNotFoundException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnAuthenticatedUserExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnAuthenticatedUserExceptionMapper.java index 8d04556ef..5f82b515c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnAuthenticatedUserExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnAuthenticatedUserExceptionMapper.java @@ -5,7 +5,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.mifosng.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; import org.mifosng.platform.exceptions.UnAuthenticatedUserException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedPropertyExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedPropertyExceptionMapper.java index f38aea031..b9b6e9166 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedPropertyExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedPropertyExceptionMapper.java @@ -9,8 +9,8 @@ import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; import org.codehaus.jackson.map.exc.UnrecognizedPropertyException; -import org.mifosng.data.ApiGlobalErrorResponse; -import org.mifosng.data.ApiParameterError; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiParameterError; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedQueryParamExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedQueryParamExceptionMapper.java index dd3c437ed..df9321fd3 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedQueryParamExceptionMapper.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedQueryParamExceptionMapper.java @@ -9,8 +9,8 @@ import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; import org.codehaus.jackson.map.exc.UnrecognizedPropertyException; -import org.mifosng.data.ApiGlobalErrorResponse; -import org.mifosng.data.ApiParameterError; +import org.mifosng.platform.api.data.ApiGlobalErrorResponse; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.UnrecognizedQueryParamException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java index adad00b29..9c46532c8 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java @@ -10,7 +10,7 @@ import java.util.Locale; import org.apache.commons.lang.StringUtils; import org.joda.time.LocalDate; import org.joda.time.format.DateTimeFormat; -import org.mifosng.data.ApiParameterError; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientCommandValidator.java index 09b6ef64d..fb4ab417d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientCommandValidator.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.DataValidatorBuilder; import org.mifosng.platform.api.commands.ClientCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; public class ClientCommandValidator { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformService.java index 76489a832..fee62e6c6 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformService.java @@ -3,8 +3,8 @@ package org.mifosng.platform.client.service; import java.util.Collection; import org.mifosng.data.ClientLoanAccountSummaryCollectionData; -import org.mifosng.data.NoteData; import org.mifosng.platform.api.data.ClientData; +import org.mifosng.platform.api.data.NoteData; public interface ClientReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java index 575eb2609..e0f29e90b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java @@ -13,9 +13,9 @@ import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.mifosng.data.ClientLoanAccountSummaryCollectionData; import org.mifosng.data.ClientLoanAccountSummaryData; -import org.mifosng.data.NoteData; import org.mifosng.platform.api.data.AppUserData; import org.mifosng.platform.api.data.ClientData; +import org.mifosng.platform.api.data.NoteData; import org.mifosng.platform.api.data.OfficeData; import org.mifosng.platform.api.data.OfficeLookup; import org.mifosng.platform.exceptions.ClientNotFoundException; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformService.java index 76a527a4a..61adfef1f 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformService.java @@ -1,8 +1,8 @@ package org.mifosng.platform.client.service; -import org.mifosng.data.EntityIdentifier; import org.mifosng.platform.api.commands.ClientCommand; import org.mifosng.platform.api.commands.NoteCommand; +import org.mifosng.platform.api.data.EntityIdentifier; import org.springframework.security.access.prepost.PreAuthorize; public interface ClientWritePlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java index 25909f335..8dc02c6bf 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java @@ -5,9 +5,9 @@ import static org.mifosng.platform.Specifications.notesThatMatch; import static org.mifosng.platform.Specifications.officesThatMatch; import org.apache.commons.lang.StringUtils; -import org.mifosng.data.EntityIdentifier; import org.mifosng.platform.api.commands.ClientCommand; import org.mifosng.platform.api.commands.NoteCommand; +import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.client.domain.Client; import org.mifosng.platform.client.domain.ClientRepository; import org.mifosng.platform.client.domain.Note; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationReadPlatformService.java index 06013758f..2f29e6c02 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationReadPlatformService.java @@ -1,6 +1,6 @@ package org.mifosng.platform.configuration.service; -import org.mifosng.data.ConfigurationData; +import org.mifosng.platform.api.data.ConfigurationData; public interface ConfigurationReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationReadPlatformServiceImpl.java index d01d0e959..566c8bac0 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationReadPlatformServiceImpl.java @@ -3,8 +3,8 @@ package org.mifosng.platform.configuration.service; import java.util.ArrayList; import java.util.List; -import org.mifosng.data.ConfigurationData; import org.mifosng.data.CurrencyData; +import org.mifosng.platform.api.data.ConfigurationData; import org.mifosng.platform.currency.service.CurrencyReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationWritePlatformServiceJpaRepositoryImpl.java index 3a65eaa4c..dcb1905e2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/configuration/service/ConfigurationWritePlatformServiceJpaRepositoryImpl.java @@ -5,9 +5,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.DataValidatorBuilder; import org.mifosng.platform.api.commands.OrganisationCurrencyCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.currency.domain.ApplicationCurrencyRepository; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/exceptions/PlatformApiDataValidationException.java b/mifosng-provider/src/main/java/org/mifosng/platform/exceptions/PlatformApiDataValidationException.java index a4edcb675..9364ecd7d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/exceptions/PlatformApiDataValidationException.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/exceptions/PlatformApiDataValidationException.java @@ -2,7 +2,7 @@ package org.mifosng.platform.exceptions; import java.util.List; -import org.mifosng.data.ApiParameterError; +import org.mifosng.platform.api.data.ApiParameterError; public class PlatformApiDataValidationException extends RuntimeException { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DerivedLoanDataProcessor.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DerivedLoanDataProcessor.java index 974936700..b7dccdfe2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DerivedLoanDataProcessor.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/DerivedLoanDataProcessor.java @@ -9,7 +9,6 @@ import org.mifosng.data.CurrencyData; import org.mifosng.data.DerivedLoanData; import org.mifosng.data.LoanAccountSummaryData; import org.mifosng.data.LoanRepaymentData; -import org.mifosng.data.LoanRepaymentDataComparator; import org.mifosng.data.LoanRepaymentPeriodData; import org.mifosng.data.LoanRepaymentScheduleData; import org.mifosng.data.MoneyData; diff --git a/mifosng-data/src/main/java/org/mifosng/data/LoanRepaymentDataComparator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanRepaymentDataComparator.java similarity index 88% rename from mifosng-data/src/main/java/org/mifosng/data/LoanRepaymentDataComparator.java rename to mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanRepaymentDataComparator.java index 7d1ae9967..8df7366cb 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/LoanRepaymentDataComparator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanRepaymentDataComparator.java @@ -1,4 +1,4 @@ -package org.mifosng.data; +package org.mifosng.platform.loan.domain; import java.util.Comparator; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/AdjustLoanTransactionCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/AdjustLoanTransactionCommandValidator.java index 576201613..0368b73f2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/AdjustLoanTransactionCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/AdjustLoanTransactionCommandValidator.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.api.commands.AdjustLoanTransactionCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; public class AdjustLoanTransactionCommandValidator { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculateLoanScheduleCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculateLoanScheduleCommandValidator.java index e3cf97cca..2ba0b2568 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculateLoanScheduleCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculateLoanScheduleCommandValidator.java @@ -3,9 +3,9 @@ package org.mifosng.platform.loan.service; import java.util.ArrayList; import java.util.List; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.DataValidatorBuilder; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; public class CalculateLoanScheduleCommandValidator { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java index d231030a2..bc3d4a681 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformService.java @@ -1,7 +1,6 @@ package org.mifosng.platform.loan.service; import org.joda.time.LocalDate; -import org.mifosng.data.LoanPayoffReadModel; import org.mifosng.data.LoanSchedule; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java index 0058a4ffb..e3081837f 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/CalculationPlatformServiceImpl.java @@ -4,7 +4,6 @@ import java.math.BigDecimal; import org.joda.time.LocalDate; import org.mifosng.data.CurrencyData; -import org.mifosng.data.LoanPayoffReadModel; import org.mifosng.data.LoanSchedule; import org.mifosng.data.MoneyData; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; diff --git a/mifosng-data/src/main/java/org/mifosng/data/LoanPayoffReadModel.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanPayoffReadModel.java similarity index 97% rename from mifosng-data/src/main/java/org/mifosng/data/LoanPayoffReadModel.java rename to mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanPayoffReadModel.java index 537ce016c..46b99e86a 100644 --- a/mifosng-data/src/main/java/org/mifosng/data/LoanPayoffReadModel.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanPayoffReadModel.java @@ -1,11 +1,12 @@ -package org.mifosng.data; - -import javax.xml.bind.annotation.XmlRootElement; +package org.mifosng.platform.loan.service; import org.joda.time.LocalDate; import org.joda.time.format.DateTimeFormatter; +import org.mifosng.data.MoneyData; -@XmlRootElement +/** + * + */ public class LoanPayoffReadModel { private String reference; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java index a3c5b9b49..4f7a0105f 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java @@ -2,13 +2,13 @@ package org.mifosng.platform.loan.service; import org.mifosng.data.LoanAccountData; import org.mifosng.data.LoanRepaymentData; -import org.mifosng.platform.api.data.NewLoanWorkflowStepOneData; +import org.mifosng.platform.api.data.NewLoanData; public interface LoanReadPlatformService { LoanAccountData retrieveLoanAccountDetails(Long loanId); - NewLoanWorkflowStepOneData retrieveClientAndProductDetails(Long clientId, Long productId); + NewLoanData retrieveClientAndProductDetails(Long clientId, Long productId); LoanRepaymentData retrieveNewLoanRepaymentDetails(Long loanId); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java index 137b5c847..5ad47fb0e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java @@ -14,7 +14,7 @@ import org.mifosng.data.LoanRepaymentData; import org.mifosng.data.MoneyData; import org.mifosng.platform.api.data.ClientData; import org.mifosng.platform.api.data.LoanProductData; -import org.mifosng.platform.api.data.NewLoanWorkflowStepOneData; +import org.mifosng.platform.api.data.NewLoanData; import org.mifosng.platform.client.service.ClientReadPlatformService; import org.mifosng.platform.currency.domain.ApplicationCurrency; import org.mifosng.platform.currency.domain.ApplicationCurrencyRepository; @@ -168,11 +168,11 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { } @Override - public NewLoanWorkflowStepOneData retrieveClientAndProductDetails(final Long clientId, final Long productId) { + public NewLoanData retrieveClientAndProductDetails(final Long clientId, final Long productId) { AppUser currentUser = context.authenticatedUser(); - NewLoanWorkflowStepOneData workflowData = new NewLoanWorkflowStepOneData(); + NewLoanData workflowData = new NewLoanData(); workflowData.setOrganisationId(currentUser.getOrganisation().getId()); workflowData.setOrganisationName(currentUser.getOrganisation().getName()); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanStateTransitionCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanStateTransitionCommandValidator.java index 4920e2eab..891807a6d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanStateTransitionCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanStateTransitionCommandValidator.java @@ -3,9 +3,9 @@ package org.mifosng.platform.loan.service; import java.util.ArrayList; import java.util.List; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.DataValidatorBuilder; import org.mifosng.platform.api.commands.LoanStateTransitionCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; public class LoanStateTransitionCommandValidator { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanTransactionCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanTransactionCommandValidator.java index 67547122f..6d2e46178 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanTransactionCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanTransactionCommandValidator.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.api.commands.LoanTransactionCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; public class LoanTransactionCommandValidator { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformService.java index 9bac31baf..3fa7a0a70 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformService.java @@ -1,11 +1,11 @@ package org.mifosng.platform.loan.service; -import org.mifosng.data.EntityIdentifier; import org.mifosng.platform.api.commands.AdjustLoanTransactionCommand; import org.mifosng.platform.api.commands.LoanStateTransitionCommand; import org.mifosng.platform.api.commands.LoanTransactionCommand; import org.mifosng.platform.api.commands.SubmitLoanApplicationCommand; import org.mifosng.platform.api.commands.UndoStateTransitionCommand; +import org.mifosng.platform.api.data.EntityIdentifier; import org.springframework.security.access.prepost.PreAuthorize; public interface LoanWritePlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java index cfcea1f5a..96344aa9b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -7,7 +7,6 @@ import java.util.List; import org.apache.commons.lang.StringUtils; import org.joda.time.LocalDate; -import org.mifosng.data.EntityIdentifier; import org.mifosng.data.LoanSchedule; import org.mifosng.data.ScheduledLoanInstallment; import org.mifosng.platform.api.commands.AdjustLoanTransactionCommand; @@ -16,6 +15,7 @@ import org.mifosng.platform.api.commands.LoanStateTransitionCommand; import org.mifosng.platform.api.commands.LoanTransactionCommand; import org.mifosng.platform.api.commands.SubmitLoanApplicationCommand; import org.mifosng.platform.api.commands.UndoStateTransitionCommand; +import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.client.domain.Note; import org.mifosng.platform.client.domain.NoteRepository; import org.mifosng.platform.currency.domain.MonetaryCurrency; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/SubmitLoanApplicationCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/SubmitLoanApplicationCommandValidator.java index fdfd4c1c4..ea81f4d8c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/SubmitLoanApplicationCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/SubmitLoanApplicationCommandValidator.java @@ -3,9 +3,9 @@ package org.mifosng.platform.loan.service; import java.util.ArrayList; import java.util.List; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.api.commands.CalculateLoanScheduleCommand; import org.mifosng.platform.api.commands.SubmitLoanApplicationCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; public class SubmitLoanApplicationCommandValidator { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformService.java index 69360069c..8ac1e9917 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformService.java @@ -2,7 +2,7 @@ package org.mifosng.platform.loanproduct.service; import java.util.List; -import org.mifosng.data.EnumOptionData; +import org.mifosng.platform.api.data.EnumOptionData; public interface LoanDropdownReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java index 03f1cc3b2..ecd042b2b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanDropdownReadPlatformServiceImpl.java @@ -9,7 +9,7 @@ import static org.mifosng.platform.loanproduct.service.LoanEnumerations.repaymen import java.util.Arrays; import java.util.List; -import org.mifosng.data.EnumOptionData; +import org.mifosng.platform.api.data.EnumOptionData; import org.mifosng.platform.loan.domain.AmortizationMethod; import org.mifosng.platform.loan.domain.InterestCalculationPeriodMethod; import org.mifosng.platform.loan.domain.InterestMethod; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanEnumerations.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanEnumerations.java index b107be79c..33918d842 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanEnumerations.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanEnumerations.java @@ -1,6 +1,6 @@ package org.mifosng.platform.loanproduct.service; -import org.mifosng.data.EnumOptionData; +import org.mifosng.platform.api.data.EnumOptionData; import org.mifosng.platform.loan.domain.AmortizationMethod; import org.mifosng.platform.loan.domain.InterestCalculationPeriodMethod; import org.mifosng.platform.loan.domain.InterestMethod; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductCommandValidator.java index 9fcfcdad6..6c81d5fa0 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductCommandValidator.java @@ -3,9 +3,9 @@ package org.mifosng.platform.loanproduct.service; import java.util.ArrayList; import java.util.List; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.DataValidatorBuilder; import org.mifosng.platform.api.commands.LoanProductCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; public class LoanProductCommandValidator { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformServiceImpl.java index 505759aba..51b522055 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformServiceImpl.java @@ -10,8 +10,8 @@ import javax.sql.DataSource; import org.joda.time.DateTime; import org.mifosng.data.CurrencyData; -import org.mifosng.data.EnumOptionData; import org.mifosng.data.MoneyData; +import org.mifosng.platform.api.data.EnumOptionData; import org.mifosng.platform.api.data.LoanProductData; import org.mifosng.platform.currency.service.CurrencyReadPlatformService; import org.mifosng.platform.exceptions.LoanProductNotFoundException; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductWritePlatformService.java index 2bc61a8ef..32db27e33 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductWritePlatformService.java @@ -1,7 +1,7 @@ package org.mifosng.platform.loanproduct.service; -import org.mifosng.data.EntityIdentifier; import org.mifosng.platform.api.commands.LoanProductCommand; +import org.mifosng.platform.api.data.EntityIdentifier; import org.springframework.security.access.prepost.PreAuthorize; public interface LoanProductWritePlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java index 79a70e299..c1400554b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java @@ -4,8 +4,8 @@ import static org.mifosng.platform.Specifications.productThatMatches; import java.math.BigDecimal; -import org.mifosng.data.EntityIdentifier; import org.mifosng.platform.api.commands.LoanProductCommand; +import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.currency.domain.MonetaryCurrency; import org.mifosng.platform.exceptions.LoanProductNotFoundException; import org.mifosng.platform.loan.domain.AmortizationMethod; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeCommandValidator.java index d3002362c..20796021f 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeCommandValidator.java @@ -3,9 +3,9 @@ package org.mifosng.platform.organisation.service; import java.util.ArrayList; import java.util.List; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.DataValidatorBuilder; import org.mifosng.platform.api.commands.OfficeCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; public class OfficeCommandValidator { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanOpenResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanOpenResource.java index d35f73163..a44778e60 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanOpenResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanOpenResource.java @@ -15,9 +15,9 @@ import org.codehaus.jettison.json.JSONObject; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; -import org.mifosng.data.LoanPayoffReadModel; import org.mifosng.data.MoneyData; import org.mifosng.platform.loan.service.CalculationPlatformService; +import org.mifosng.platform.loan.service.LoanPayoffReadModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java index e70db836d..2c812f6c4 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.Set; import org.apache.commons.lang.StringUtils; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.api.commands.UserCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.OfficeNotFoundException; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; import org.mifosng.platform.exceptions.PlatformDataIntegrityException; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleCommandValidator.java index b4aec2c12..8ae5c4061 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleCommandValidator.java @@ -3,9 +3,9 @@ package org.mifosng.platform.user.service; import java.util.ArrayList; import java.util.List; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.DataValidatorBuilder; import org.mifosng.platform.api.commands.RoleCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; public class RoleCommandValidator { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/UserCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/UserCommandValidator.java index 75d1d797b..6519844e4 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/service/UserCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/service/UserCommandValidator.java @@ -3,9 +3,9 @@ package org.mifosng.platform.user.service; import java.util.ArrayList; import java.util.List; -import org.mifosng.data.ApiParameterError; import org.mifosng.platform.DataValidatorBuilder; import org.mifosng.platform.api.commands.UserCommand; +import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; public class UserCommandValidator {