diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java index 6b5ce4975..d725fa0b5 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java @@ -17,23 +17,14 @@ import java.util.Map; import java.util.Set; import javax.sql.DataSource; -import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.Response.Status; import org.apache.commons.lang.StringUtils; -import org.codehaus.jettison.json.JSONArray; -import org.codehaus.jettison.json.JSONException; -import org.codehaus.jettison.json.JSONObject; -import org.joda.time.DateTime; -import org.joda.time.LocalDate; import org.mifosng.platform.api.data.AdditionalFieldsSetData; import org.mifosng.platform.api.data.GenericResultsetData; import org.mifosng.platform.api.data.ResultsetColumnHeader; import org.mifosng.platform.api.data.ResultsetDataRow; -import org.mifosng.platform.api.infrastructure.JodaDateTimeAdapter; -import org.mifosng.platform.api.infrastructure.JodaLocalDateAdapter; import org.mifosng.platform.exceptions.AdditionalFieldsNotFoundException; import org.mifosng.platform.exceptions.PlatformDataIntegrityException; import org.mifosng.platform.exceptions.ReportNotFoundException; @@ -56,9 +47,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - @Service public class ReadExtraDataAndReportingServiceImpl implements ReadExtraDataAndReportingService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/DepositAccountsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/DepositAccountsApiResource.java index 385253e79..79fdb4e0c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/DepositAccountsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/DepositAccountsApiResource.java @@ -27,10 +27,10 @@ import org.mifosng.platform.api.data.EnumOptionData; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; import org.mifosng.platform.api.infrastructure.ApiParameterHelper; import org.mifosng.platform.currency.service.CurrencyReadPlatformService; -import org.mifosng.platform.deposit.domain.SavingsDepositEnumerations; import org.mifosng.platform.loan.domain.PeriodFrequencyType; -import org.mifosng.platform.savingproduct.service.DepositAccountReadPlatformService; -import org.mifosng.platform.savingproduct.service.DepositAccountWritePlatformService; +import org.mifosng.platform.saving.service.DepositAccountReadPlatformService; +import org.mifosng.platform.saving.service.DepositAccountWritePlatformService; +import org.mifosng.platform.savingproduct.service.SavingsDepositEnumerations; 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/api/DepositProductsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/DepositProductsApiResource.java index f9458bb0f..7b58a3cc2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/DepositProductsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/DepositProductsApiResource.java @@ -27,10 +27,10 @@ import org.mifosng.platform.api.data.EnumOptionData; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; import org.mifosng.platform.api.infrastructure.ApiParameterHelper; import org.mifosng.platform.currency.service.CurrencyReadPlatformService; -import org.mifosng.platform.deposit.domain.SavingsDepositEnumerations; -import org.mifosng.platform.depositproduct.service.DepositProductReadPlatformService; -import org.mifosng.platform.depositproduct.service.DepositProductWritePlatformService; import org.mifosng.platform.loan.domain.PeriodFrequencyType; +import org.mifosng.platform.savingproduct.service.DepositProductReadPlatformService; +import org.mifosng.platform.savingproduct.service.DepositProductWritePlatformService; +import org.mifosng.platform.savingproduct.service.SavingsDepositEnumerations; 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/saving/domain/DepositAccount.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java index 2e18f5e69..0e94f0677 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 @@ -20,9 +20,9 @@ import org.mifosng.platform.api.commands.DepositAccountCommand; import org.mifosng.platform.client.domain.Client; import org.mifosng.platform.currency.domain.MonetaryCurrency; import org.mifosng.platform.currency.domain.Money; -import org.mifosng.platform.deposit.domain.DepositProduct; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.loan.domain.PeriodFrequencyType; +import org.mifosng.platform.savingproduct.domain.DepositProduct; import org.mifosng.platform.user.domain.AppUser; @Entity diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountAssembler.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountAssembler.java similarity index 93% rename from mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountAssembler.java rename to mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountAssembler.java index 215393743..8af7977ec 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountAssembler.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountAssembler.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.savingproduct.service; +package org.mifosng.platform.saving.service; import java.math.BigDecimal; @@ -6,12 +6,12 @@ import org.mifosng.platform.api.commands.DepositAccountCommand; import org.mifosng.platform.client.domain.Client; import org.mifosng.platform.client.domain.ClientRepository; import org.mifosng.platform.currency.domain.Money; -import org.mifosng.platform.deposit.domain.DepositProduct; -import org.mifosng.platform.deposit.domain.DepositProductRepository; import org.mifosng.platform.exceptions.ClientNotFoundException; import org.mifosng.platform.exceptions.DepositProductNotFoundException; import org.mifosng.platform.loan.domain.PeriodFrequencyType; import org.mifosng.platform.saving.domain.DepositAccount; +import org.mifosng.platform.savingproduct.domain.DepositProduct; +import org.mifosng.platform.savingproduct.domain.DepositProductRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -76,6 +76,8 @@ public class DepositAccountAssembler { } // end of details allowed to be overriden from product + // fixed-term interest calculator + DepositAccount account = DepositAccount.openNew(client, product, command.getExternalId(), deposit, maturityInterestRate, diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountCommandValidator.java similarity index 98% rename from mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountCommandValidator.java rename to mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountCommandValidator.java index f268e1ceb..8178f2859 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountCommandValidator.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.savingproduct.service; +package org.mifosng.platform.saving.service; import java.util.ArrayList; import java.util.List; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountReadPlatformService.java similarity index 86% rename from mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountReadPlatformService.java rename to mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountReadPlatformService.java index 79147ce94..eef634b6a 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountReadPlatformService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.savingproduct.service; +package org.mifosng.platform.saving.service; import java.util.Collection; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountReadPlatformServiceImpl.java similarity index 98% rename from mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountReadPlatformServiceImpl.java rename to mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountReadPlatformServiceImpl.java index 656a38432..658ef8324 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountReadPlatformServiceImpl.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.savingproduct.service; +package org.mifosng.platform.saving.service; import java.math.BigDecimal; import java.sql.ResultSet; @@ -10,10 +10,10 @@ import org.joda.time.LocalDate; import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.DepositAccountData; import org.mifosng.platform.api.data.EnumOptionData; -import org.mifosng.platform.deposit.domain.SavingsDepositEnumerations; import org.mifosng.platform.exceptions.LoanProductNotFoundException; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource; +import org.mifosng.platform.savingproduct.service.SavingsDepositEnumerations; import org.mifosng.platform.security.PlatformSecurityContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountWritePlatformService.java similarity index 92% rename from mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountWritePlatformService.java rename to mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountWritePlatformService.java index 417ebeee3..42de76df6 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountWritePlatformService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.savingproduct.service; +package org.mifosng.platform.saving.service; import org.mifosng.platform.api.commands.DepositAccountCommand; import org.mifosng.platform.api.data.EntityIdentifier; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountWritePlatformServiceJpaRepositoryImpl.java similarity index 98% rename from mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountWritePlatformServiceJpaRepositoryImpl.java rename to mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountWritePlatformServiceJpaRepositoryImpl.java index 073df599a..37d503d98 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositAccountWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountWritePlatformServiceJpaRepositoryImpl.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.savingproduct.service; +package org.mifosng.platform.saving.service; import org.mifosng.platform.api.commands.DepositAccountCommand; import org.mifosng.platform.api.data.EntityIdentifier; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/deposit/domain/DepositProduct.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProduct.java similarity index 99% rename from mifosng-provider/src/main/java/org/mifosng/platform/deposit/domain/DepositProduct.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProduct.java index dac083ce5..371b2e759 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/deposit/domain/DepositProduct.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProduct.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.deposit.domain; +package org.mifosng.platform.savingproduct.domain; import java.math.BigDecimal; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/deposit/domain/DepositProductRepository.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProductRepository.java similarity index 84% rename from mifosng-provider/src/main/java/org/mifosng/platform/deposit/domain/DepositProductRepository.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProductRepository.java index e328b739d..bea467736 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/deposit/domain/DepositProductRepository.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProductRepository.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.deposit.domain; +package org.mifosng.platform.savingproduct.domain; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProduct.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProduct.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProduct.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProduct.java index d3ef3e48c..6333273ee 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProduct.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProduct.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.saving.domain; +package org.mifosng.platform.savingproduct.domain; import java.math.BigDecimal; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProductRelatedDetail.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProductRelatedDetail.java similarity index 98% rename from mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProductRelatedDetail.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProductRelatedDetail.java index afb48c343..d4c67be57 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProductRelatedDetail.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProductRelatedDetail.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.saving.domain; +package org.mifosng.platform.savingproduct.domain; import java.math.BigDecimal; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProductRepository.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProductRepository.java similarity index 84% rename from mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProductRepository.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProductRepository.java index e2b01a4d7..062b422df 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/SavingProductRepository.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProductRepository.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.saving.domain; +package org.mifosng.platform.savingproduct.domain; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductCommandValidator.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductCommandValidator.java similarity index 99% rename from mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductCommandValidator.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductCommandValidator.java index 707a257c6..9524266ca 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductCommandValidator.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.depositproduct.service; +package org.mifosng.platform.savingproduct.service; import java.util.ArrayList; import java.util.List; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductReadPlatformService.java similarity index 89% rename from mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductReadPlatformService.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductReadPlatformService.java index d2139624f..4c06933d5 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductReadPlatformService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.depositproduct.service; +package org.mifosng.platform.savingproduct.service; import java.util.Collection; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductReadPlatformServiceImpl.java similarity index 98% rename from mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductReadPlatformServiceImpl.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductReadPlatformServiceImpl.java index 683d96b19..7b5c76c3e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductReadPlatformServiceImpl.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.depositproduct.service; +package org.mifosng.platform.savingproduct.service; import java.math.BigDecimal; import java.sql.ResultSet; @@ -11,7 +11,6 @@ import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.DepositProductData; import org.mifosng.platform.api.data.DepositProductLookup; import org.mifosng.platform.api.data.EnumOptionData; -import org.mifosng.platform.deposit.domain.SavingsDepositEnumerations; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource; import org.mifosng.platform.loan.domain.PeriodFrequencyType; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductWritePlatformService.java similarity index 92% rename from mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductWritePlatformService.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductWritePlatformService.java index b903886b3..c8a42b78c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductWritePlatformService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.depositproduct.service; +package org.mifosng.platform.savingproduct.service; import org.mifosng.platform.api.commands.DepositProductCommand; import org.mifosng.platform.api.data.EntityIdentifier; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductWritePlatformServiceJpaRepositoryImpl.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductWritePlatformServiceJpaRepositoryImpl.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductWritePlatformServiceJpaRepositoryImpl.java index bd4d28172..e114ed1e2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductWritePlatformServiceJpaRepositoryImpl.java @@ -1,13 +1,13 @@ -package org.mifosng.platform.depositproduct.service; +package org.mifosng.platform.savingproduct.service; import org.mifosng.platform.api.commands.DepositProductCommand; import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.currency.domain.MonetaryCurrency; -import org.mifosng.platform.deposit.domain.DepositProduct; -import org.mifosng.platform.deposit.domain.DepositProductRepository; import org.mifosng.platform.exceptions.DepositProductNotFoundException; import org.mifosng.platform.exceptions.PlatformDataIntegrityException; import org.mifosng.platform.loan.domain.PeriodFrequencyType; +import org.mifosng.platform.savingproduct.domain.DepositProduct; +import org.mifosng.platform.savingproduct.domain.DepositProductRepository; import org.mifosng.platform.security.PlatformSecurityContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductWritePlatformServiceJpaRepositoryImpl.java index 5505fe0e0..b48a05751 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductWritePlatformServiceJpaRepositoryImpl.java @@ -5,8 +5,8 @@ import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.currency.domain.MonetaryCurrency; import org.mifosng.platform.exceptions.ProductNotFoundException; import org.mifosng.platform.exceptions.SavingProductNotFoundException; -import org.mifosng.platform.saving.domain.SavingProduct; -import org.mifosng.platform.saving.domain.SavingProductRepository; +import org.mifosng.platform.savingproduct.domain.SavingProduct; +import org.mifosng.platform.savingproduct.domain.SavingProductRepository; import org.mifosng.platform.security.PlatformSecurityContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/deposit/domain/SavingsDepositEnumerations.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingsDepositEnumerations.java similarity index 95% rename from mifosng-provider/src/main/java/org/mifosng/platform/deposit/domain/SavingsDepositEnumerations.java rename to mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingsDepositEnumerations.java index de4c67ca7..3f58c749a 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/deposit/domain/SavingsDepositEnumerations.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingsDepositEnumerations.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.deposit.domain; +package org.mifosng.platform.savingproduct.service; import org.mifosng.platform.api.data.EnumOptionData; import org.mifosng.platform.loan.domain.PeriodFrequencyType;