From 655466785ca6861fea07aa871c888dccff473bc8 Mon Sep 17 00:00:00 2001 From: Marta Jankovics Date: Sat, 8 Jun 2024 01:57:33 +0200 Subject: [PATCH] FINERACT-1932: Fineract modularization - custom modules --- .../journalentry/JournalEntryMapper.java | 2 +- ...ctToGLAccountMappingNotFoundException.java | 2 +- .../ProductToGLAccountMappingHelper.java | 2 +- ...AccountMappingReadPlatformServiceImpl.java | 2 +- ...avingsProductToGLAccountMappingHelper.java | 2 +- .../ShareProductToGLAccountMappingHelper.java | 2 +- .../common/AccountingEnumerations.java | 2 +- .../infrastructure/codes/data/CodeData.java | 0 .../service/CodeReadPlatformService.java | 0 .../exception/ResourceNotFoundException.java | 3 +- ...tatableCommandFromApiJsonDeserializer.java | 0 .../DatatableEntryRequiredException.java | 0 .../exception/DatatableNotFoundException.java | 0 .../DatatableSystemErrorException.java | 0 .../service/DatatableKeywordGenerator.java | 0 .../service/SqlInjectionPreventerService.java | 0 .../domain/InteropIdentifierType.java | 68 +++++++++++ .../organisation/monetary/data/MoneyData.java | 0 .../monetary/domain/ApplicationCurrency.java | 1 - .../domain/ApplicationCurrencyRepository.java | 15 +++ .../ApplicationCurrencyRepositoryWrapper.java | 0 .../domain/OrganisationCurrency.java | 3 +- .../OrganisationCurrencyRepository.java | 13 ++- ...OrganisationCurrencyRepositoryWrapper.java | 2 +- .../exception/CurrencyInUseException.java | 0 .../exception/CurrencyNotFoundException.java | 0 ...ganizationalCurrencyNotFoundException.java | 0 ...urrencyCommandFromApiJsonDeserializer.java | 0 .../CurrencyReadPlatformServiceImpl.java | 0 ...sationCurrencyReadPlatformServiceImpl.java | 0 .../PortfolioProductType.java | 2 +- .../client/domain/ClientRepository.java | 0 .../client/domain/search/SearchedClient.java | 0 .../search/SearchingClientRepository.java | 0 .../search/SearchingClientRepositoryImpl.java | 0 .../exception/ClientNotActiveException.java | 0 .../exception/ClientNotFoundException.java | 0 .../portfolio/note/domain/NoteType.java | 81 +++++++++++++ .../note/service/NoteReadPlatformService.java | 0 .../service/NoteWritePlatformService.java | 0 .../domain/PaymentDetailAssembler.java | 0 .../domain/PaymentDetailRepository.java | 5 +- .../PaymentDetailWritePlatformService.java | 0 ...WritePlatformServiceJpaRepositoryImpl.java | 0 .../starter/PaymentDetailConfiguration.java | 0 .../api/PaymentTypeApiResource.java | 0 .../api/PaymentTypeApiResourceSwagger.java | 0 .../data/PaymentTypeDataValidator.java | 0 .../CreatePaymentTypeCommandHandler.java | 0 .../DeletePaymentTypeCommandHandler.java | 0 .../UpdatePaymentTypeCommandHandler.java | 0 .../paymenttype/mapper/PaymentTypeMapper.java | 0 .../PaymentTypeReadPlatformService.java | 0 .../PaymentTypeReadPlatformServiceImpl.java | 0 .../service/PaymentTypeWriteService.java | 0 .../service/PaymentTypeWriteServiceImpl.java | 0 .../starter/PaymentTypeConfiguration.java | 0 .../docs/en/chapters/custom/service-note.adoc | 4 +- .../service/InvestorAccountingHelper.java | 2 +- .../resources/jpa/investor/persistence.xml | 2 +- .../LoanProductToGLAccountMappingHelper.java | 2 +- .../main/resources/jpa/loan/persistence.xml | 2 +- .../api/JournalEntriesApiResource.java | 2 +- .../service/AccountingProcessorHelper.java | 2 +- ...WritePlatformServiceJpaRepositoryImpl.java | 4 +- .../AccountingJournalEntryConfiguration.java | 2 +- ...WritePlatformServiceJpaRepositoryImpl.java | 2 +- .../service/InteropServiceImpl.java | 2 +- .../starter/InteroperationConfiguration.java | 2 +- ...WritePlatformServiceJpaRepositoryImpl.java | 4 +- .../OrganisationMonetaryConfiguration.java | 2 +- .../service}/AccountNumberGenerator.java | 4 +- ...ountTransfersWritePlatformServiceImpl.java | 2 +- .../account/starter/AccountConfiguration.java | 2 +- .../accounts/api/AccountsApiResource.java | 2 +- .../portfolio/client/domain/ClientCharge.java | 2 +- .../domain/ClientChargeRepositoryWrapper.java | 2 +- .../client/domain/ClientTransaction.java | 2 +- .../ClientTransactionRepositoryWrapper.java | 2 +- ...WritePlatformServiceJpaRepositoryImpl.java | 2 +- ...WritePlatformServiceJpaRepositoryImpl.java | 2 +- ...WritePlatformServiceJpaRepositoryImpl.java | 2 +- .../group/starter/GroupConfiguration.java | 2 +- .../loanaccount/service/LoanAssembler.java | 2 +- .../starter/LoanAccountConfiguration.java | 2 +- .../portfolio/note/domain/NoteType.java | 108 ------------------ .../products/api/ProductsApiResource.java | 2 +- .../DepositAccountDomainServiceJpa.java | 3 +- .../SavingsAccountDomainServiceJpa.java | 1 + ...WritePlatformServiceJpaRepositoryImpl.java | 2 +- ...WritePlatformServiceJpaRepositoryImpl.java | 1 - ...WritePlatformServiceJpaRepositoryImpl.java | 3 +- .../savings/starter/SavingsConfiguration.java | 4 +- .../ShareAccountSchedularServiceImpl.java | 2 +- ...WritePlatformServiceJpaRepositoryImpl.java | 2 +- .../start/ShareAccountsConfiguration.java | 4 +- .../src/main/resources/jpa/persistence.xml | 2 +- .../domain/InteropIdentifierType.java | 24 ---- .../domain/SavingsAccountRepository.java | 0 .../SavingsAccountRepositoryWrapper.java | 0 .../SavingsAccountDomainService.java | 4 +- 101 files changed, 239 insertions(+), 194 deletions(-) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/infrastructure/codes/data/CodeData.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeReadPlatformService.java (100%) rename {fineract-provider/src/main/java/org/apache/fineract/portfolio/products => fineract-core/src/main/java/org/apache/fineract/infrastructure/core}/exception/ResourceNotFoundException.java (89%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/infrastructure/core/serialization/DatatableCommandFromApiJsonDeserializer.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableEntryRequiredException.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableNotFoundException.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableSystemErrorException.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/DatatableKeywordGenerator.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/infrastructure/security/service/SqlInjectionPreventerService.java (100%) create mode 100644 fineract-core/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifierType.java rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/organisation/monetary/data/MoneyData.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepository.java (61%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepositoryWrapper.java (100%) rename fineract-core/src/main/java/org/apache/fineract/organisation/{office => monetary}/domain/OrganisationCurrency.java (95%) rename {fineract-provider/src/main/java/org/apache/fineract/organisation/office => fineract-core/src/main/java/org/apache/fineract/organisation/monetary}/domain/OrganisationCurrencyRepository.java (65%) rename {fineract-provider/src/main/java/org/apache/fineract/organisation/office => fineract-core/src/main/java/org/apache/fineract/organisation/monetary}/domain/OrganisationCurrencyRepositoryWrapper.java (97%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyInUseException.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyNotFoundException.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/organisation/monetary/exception/OrganizationalCurrencyNotFoundException.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/organisation/monetary/serialization/CurrencyCommandFromApiJsonDeserializer.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyReadPlatformServiceImpl.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/organisation/monetary/service/OrganisationCurrencyReadPlatformServiceImpl.java (100%) rename fineract-core/src/main/java/org/apache/fineract/{accounting/producttoaccountmapping/domain => portfolio}/PortfolioProductType.java (96%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchedClient.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepository.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepositoryImpl.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotActiveException.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotFoundException.java (100%) create mode 100644 fineract-core/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/note/service/NoteWritePlatformService.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailAssembler.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailRepository.java (89%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformService.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformServiceJpaRepositoryImpl.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymentdetail/starter/PaymentDetailConfiguration.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceSwagger.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/data/PaymentTypeDataValidator.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/CreatePaymentTypeCommandHandler.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/DeletePaymentTypeCommandHandler.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/UpdatePaymentTypeCommandHandler.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/mapper/PaymentTypeMapper.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformService.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformServiceImpl.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteService.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteServiceImpl.java (100%) rename {fineract-provider => fineract-core}/src/main/java/org/apache/fineract/portfolio/paymenttype/starter/PaymentTypeConfiguration.java (100%) rename fineract-provider/src/main/java/org/apache/fineract/portfolio/{client/domain => account/service}/AccountNumberGenerator.java (98%) delete mode 100644 fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java delete mode 100644 fineract-savings/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifierType.java rename {fineract-provider => fineract-savings}/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepository.java (100%) rename {fineract-provider => fineract-savings}/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepositoryWrapper.java (100%) rename fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/{domain => service}/SavingsAccountDomainService.java (92%) diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/journalentry/JournalEntryMapper.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/journalentry/JournalEntryMapper.java index 9ef238e01..30f6ac22b 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/journalentry/JournalEntryMapper.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/journalentry/JournalEntryMapper.java @@ -22,10 +22,10 @@ import org.apache.fineract.accounting.glaccount.domain.GLAccountType; import org.apache.fineract.accounting.journalentry.data.JournalEntryData; import org.apache.fineract.accounting.journalentry.domain.JournalEntry; import org.apache.fineract.accounting.journalentry.domain.JournalEntryType; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.organisation.monetary.data.CurrencyData; +import org.apache.fineract.portfolio.PortfolioProductType; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingNotFoundException.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingNotFoundException.java index 7ea65125e..d1f8f98bc 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingNotFoundException.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingNotFoundException.java @@ -18,8 +18,8 @@ */ package org.apache.fineract.accounting.producttoaccountmapping.exception; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException; +import org.apache.fineract.portfolio.PortfolioProductType; /** * A {@link RuntimeException} thrown when product to GL account mapping are not found. diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java index 0e895bb9d..f51ad5c57 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java @@ -35,13 +35,13 @@ import org.apache.fineract.accounting.glaccount.domain.GLAccount; import org.apache.fineract.accounting.glaccount.domain.GLAccountRepository; import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper; import org.apache.fineract.accounting.glaccount.domain.GLAccountType; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping; import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMappingRepository; import org.apache.fineract.accounting.producttoaccountmapping.exception.ProductToGLAccountMappingInvalidException; import org.apache.fineract.accounting.producttoaccountmapping.exception.ProductToGLAccountMappingNotFoundException; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; +import org.apache.fineract.portfolio.PortfolioProductType; import org.apache.fineract.portfolio.charge.domain.Charge; import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper; import org.apache.fineract.portfolio.paymenttype.domain.PaymentType; diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java index b9edf476d..075bdd2b0 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java @@ -39,8 +39,8 @@ import org.apache.fineract.accounting.common.AccountingValidations; import org.apache.fineract.accounting.glaccount.data.GLAccountData; import org.apache.fineract.accounting.producttoaccountmapping.data.ChargeToGLAccountMapper; import org.apache.fineract.accounting.producttoaccountmapping.data.PaymentTypeToGLAccountMapper; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; +import org.apache.fineract.portfolio.PortfolioProductType; import org.apache.fineract.portfolio.charge.data.ChargeData; import org.apache.fineract.portfolio.paymenttype.data.PaymentTypeData; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java index 4b3e75b51..18b7da24e 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java @@ -28,10 +28,10 @@ import org.apache.fineract.accounting.common.AccountingRuleType; import org.apache.fineract.accounting.glaccount.domain.GLAccountRepository; import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper; import org.apache.fineract.accounting.glaccount.domain.GLAccountType; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMappingRepository; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; +import org.apache.fineract.portfolio.PortfolioProductType; import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper; import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepositoryWrapper; import org.springframework.stereotype.Component; diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ShareProductToGLAccountMappingHelper.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ShareProductToGLAccountMappingHelper.java index add700b73..b026b428b 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ShareProductToGLAccountMappingHelper.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ShareProductToGLAccountMappingHelper.java @@ -27,10 +27,10 @@ import org.apache.fineract.accounting.common.AccountingRuleType; import org.apache.fineract.accounting.glaccount.domain.GLAccountRepository; import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper; import org.apache.fineract.accounting.glaccount.domain.GLAccountType; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMappingRepository; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; +import org.apache.fineract.portfolio.PortfolioProductType; import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper; import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepositoryWrapper; import org.springframework.stereotype.Component; diff --git a/fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java b/fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java index ac327eb19..a8d651ccd 100755 --- a/fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java +++ b/fineract-core/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java @@ -23,8 +23,8 @@ import java.util.List; import org.apache.fineract.accounting.glaccount.domain.GLAccountType; import org.apache.fineract.accounting.glaccount.domain.GLAccountUsage; import org.apache.fineract.accounting.journalentry.domain.JournalEntryType; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.infrastructure.core.data.EnumOptionData; +import org.apache.fineract.portfolio.PortfolioProductType; public final class AccountingEnumerations { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/data/CodeData.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/codes/data/CodeData.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/data/CodeData.java rename to fineract-core/src/main/java/org/apache/fineract/infrastructure/codes/data/CodeData.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeReadPlatformService.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeReadPlatformService.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeReadPlatformService.java rename to fineract-core/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeReadPlatformService.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/exception/ResourceNotFoundException.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/exception/ResourceNotFoundException.java similarity index 89% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/products/exception/ResourceNotFoundException.java rename to fineract-core/src/main/java/org/apache/fineract/infrastructure/core/exception/ResourceNotFoundException.java index 1c7577229..11631c613 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/exception/ResourceNotFoundException.java +++ b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/exception/ResourceNotFoundException.java @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.products.exception; +package org.apache.fineract.infrastructure.core.exception; -import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException; import org.springframework.beans.BeansException; public class ResourceNotFoundException extends AbstractPlatformResourceNotFoundException { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/DatatableCommandFromApiJsonDeserializer.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/serialization/DatatableCommandFromApiJsonDeserializer.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/DatatableCommandFromApiJsonDeserializer.java rename to fineract-core/src/main/java/org/apache/fineract/infrastructure/core/serialization/DatatableCommandFromApiJsonDeserializer.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableEntryRequiredException.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableEntryRequiredException.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableEntryRequiredException.java rename to fineract-core/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableEntryRequiredException.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableNotFoundException.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableNotFoundException.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableNotFoundException.java rename to fineract-core/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableNotFoundException.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableSystemErrorException.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableSystemErrorException.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableSystemErrorException.java rename to fineract-core/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableSystemErrorException.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/DatatableKeywordGenerator.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/DatatableKeywordGenerator.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/DatatableKeywordGenerator.java rename to fineract-core/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/DatatableKeywordGenerator.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SqlInjectionPreventerService.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/security/service/SqlInjectionPreventerService.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SqlInjectionPreventerService.java rename to fineract-core/src/main/java/org/apache/fineract/infrastructure/security/service/SqlInjectionPreventerService.java diff --git a/fineract-core/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifierType.java b/fineract-core/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifierType.java new file mode 100644 index 000000000..6cba22dc2 --- /dev/null +++ b/fineract-core/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifierType.java @@ -0,0 +1,68 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.interoperation.domain; + +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; +import lombok.Getter; + +@Getter +public enum InteropIdentifierType { + + MSISDN("interopIdentifierType.msisdn"), // + EMAIL("interopIdentifierType.email"), // + PERSONAL_ID("interopIdentifierType.personalId", "PERSONALID", "PERSONALID"), // + BUSINESS("interopIdentifierType.business"), // + DEVICE("interopIdentifierType.device"), // + ACCOUNT_ID("interopIdentifierType.accountId", "ACCOUNTID", "ACCOUNTID"), // + IBAN("interopIdentifierType.iban"), // + ALIAS("interopIdentifierType.alias"), // + BBAN("interopIdentifierType.bban"), // + ; // + + public static final InteropIdentifierType[] VALUES = values(); + + private static final Map BY_ALIAS = Arrays.stream(VALUES) + .collect(Collectors.toMap(InteropIdentifierType::getAlias, v -> v)); + private static final Map BY_NAME = Arrays.stream(VALUES) + .collect(Collectors.toMap(InteropIdentifierType::name, v -> v)); + + private final String code; + private final String description; + private final String alias; + + InteropIdentifierType(String code, String description, String alias) { + this.code = code; + this.description = description == null ? name() : description; + this.alias = alias == null ? name() : alias; + } + + InteropIdentifierType(String code) { + this(code, null, null); + } + + public static InteropIdentifierType resolveName(String name) { + if (name == null) { + return null; + } + InteropIdentifierType idType = BY_ALIAS.get(name); + return idType == null ? BY_NAME.get(name) : idType; + } +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/data/MoneyData.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/data/MoneyData.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/data/MoneyData.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/data/MoneyData.java diff --git a/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrency.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrency.java index 1c214d802..e8e0916a3 100644 --- a/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrency.java +++ b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrency.java @@ -23,7 +23,6 @@ import jakarta.persistence.Entity; import jakarta.persistence.Table; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; import org.apache.fineract.organisation.monetary.data.CurrencyData; -import org.apache.fineract.organisation.office.domain.OrganisationCurrency; @Entity @Table(name = "m_currency") diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepository.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepository.java similarity index 61% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepository.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepository.java index efba417c2..4c50c37d7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepository.java +++ b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepository.java @@ -18,11 +18,26 @@ */ package org.apache.fineract.organisation.monetary.domain; +import java.util.List; +import org.apache.fineract.organisation.monetary.data.CurrencyData; +import org.springframework.data.domain.Sort; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +@Repository public interface ApplicationCurrencyRepository extends JpaRepository, JpaSpecificationExecutor { + String FIND_CURRENCY_DETAILS = "SELECT new org.apache.fineract.organisation.monetary.data.CurrencyData(ac.code, ac.name, ac.decimalPlaces, ac.inMultiplesOf, ac.displaySymbol, ac.nameCode) FROM ApplicationCurrency ac "; + ApplicationCurrency findOneByCode(String currencyCode); + + @Query(FIND_CURRENCY_DETAILS + " WHERE ac.code = :code") + CurrencyData findCurrencyDataByCode(@Param("code") String currencyCode); + + @Query(FIND_CURRENCY_DETAILS) + List findAllSorted(Sort sort); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepositoryWrapper.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepositoryWrapper.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepositoryWrapper.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepositoryWrapper.java diff --git a/fineract-core/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrency.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/OrganisationCurrency.java similarity index 95% rename from fineract-core/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrency.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/OrganisationCurrency.java index ab9a79ace..e62e9c5b6 100644 --- a/fineract-core/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrency.java +++ b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/OrganisationCurrency.java @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.organisation.office.domain; +package org.apache.fineract.organisation.monetary.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Table; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; -import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; /** * Represents currencies allowed for this MFI/organisation. diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrencyRepository.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/OrganisationCurrencyRepository.java similarity index 65% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrencyRepository.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/OrganisationCurrencyRepository.java index 6657569b8..e2e53739f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrencyRepository.java +++ b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/OrganisationCurrencyRepository.java @@ -16,13 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.organisation.office.domain; +package org.apache.fineract.organisation.monetary.domain; +import java.util.List; +import org.apache.fineract.organisation.monetary.data.CurrencyData; +import org.springframework.data.domain.Sort; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; +@Repository public interface OrganisationCurrencyRepository extends JpaRepository, JpaSpecificationExecutor { + String FIND_CURRENCY_DETAILS = "SELECT new org.apache.fineract.organisation.monetary.data.CurrencyData(oc.code, oc.name, oc.decimalPlaces, oc.inMultiplesOf, oc.displaySymbol, oc.nameCode) FROM OrganisationCurrency oc "; + OrganisationCurrency findOneByCode(String currencyCode); + + @Query(FIND_CURRENCY_DETAILS) + List findAllSorted(Sort sort); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrencyRepositoryWrapper.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/OrganisationCurrencyRepositoryWrapper.java similarity index 97% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrencyRepositoryWrapper.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/OrganisationCurrencyRepositoryWrapper.java index 5e964fcfc..a67898d9c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrencyRepositoryWrapper.java +++ b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/OrganisationCurrencyRepositoryWrapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.organisation.office.domain; +package org.apache.fineract.organisation.monetary.domain; import org.apache.fineract.organisation.monetary.exception.OrganizationalCurrencyNotFoundException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyInUseException.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyInUseException.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyInUseException.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyInUseException.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyNotFoundException.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyNotFoundException.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyNotFoundException.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyNotFoundException.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/OrganizationalCurrencyNotFoundException.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/exception/OrganizationalCurrencyNotFoundException.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/OrganizationalCurrencyNotFoundException.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/exception/OrganizationalCurrencyNotFoundException.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/serialization/CurrencyCommandFromApiJsonDeserializer.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/serialization/CurrencyCommandFromApiJsonDeserializer.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/serialization/CurrencyCommandFromApiJsonDeserializer.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/serialization/CurrencyCommandFromApiJsonDeserializer.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyReadPlatformServiceImpl.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyReadPlatformServiceImpl.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyReadPlatformServiceImpl.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyReadPlatformServiceImpl.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/OrganisationCurrencyReadPlatformServiceImpl.java b/fineract-core/src/main/java/org/apache/fineract/organisation/monetary/service/OrganisationCurrencyReadPlatformServiceImpl.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/OrganisationCurrencyReadPlatformServiceImpl.java rename to fineract-core/src/main/java/org/apache/fineract/organisation/monetary/service/OrganisationCurrencyReadPlatformServiceImpl.java diff --git a/fineract-core/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/PortfolioProductType.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/PortfolioProductType.java similarity index 96% rename from fineract-core/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/PortfolioProductType.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/PortfolioProductType.java index 0826a4c04..efb616f4d 100644 --- a/fineract-core/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/PortfolioProductType.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/PortfolioProductType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.accounting.producttoaccountmapping.domain; +package org.apache.fineract.portfolio; public enum PortfolioProductType { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchedClient.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchedClient.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchedClient.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchedClient.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepository.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepository.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepository.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepository.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepositoryImpl.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepositoryImpl.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepositoryImpl.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepositoryImpl.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotActiveException.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotActiveException.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotActiveException.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotActiveException.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotFoundException.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotFoundException.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotFoundException.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotFoundException.java diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java new file mode 100644 index 000000000..a50c8e660 --- /dev/null +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java @@ -0,0 +1,81 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.portfolio.note.domain; + +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; +import org.apache.fineract.infrastructure.core.data.EnumOptionData; + +public enum NoteType { + + CLIENT(100, "noteType.client", "clients", "Client note"), // + LOAN(200, "noteType.loan", "loans", "Loan note"), // + LOAN_TRANSACTION(300, "noteType.loan.transaction", "loanTransactions", "Loan transaction note"), // + SAVING_ACCOUNT(500, "noteType.saving", "savings", " account note"), // + GROUP(600, "noteType.group", "groups", "Group note"), // + SHARE_ACCOUNT(700, "noteType.shares", "accounts/share", "Share account note"), // + SAVINGS_TRANSACTION(800, "noteType.savings.transaction", "savingsTransactions", "Savings transaction note"), // + ; + + public static final NoteType[] VALUES = values(); + + private static final Map BY_ID = Arrays.stream(VALUES).collect(Collectors.toMap(NoteType::getValue, v -> v)); + private static final Map BY_API = Arrays.stream(VALUES).collect(Collectors.toMap(NoteType::getApiUrl, v -> v)); + + private final Integer value; + private final String code; + private final String apiUrl; + private final String description; + + NoteType(final Integer value, final String code, final String apiUrl, String description) { + this.value = value; + this.code = code; + this.apiUrl = apiUrl; + this.description = description; + } + + public Integer getValue() { + return this.value; + } + + public String getCode() { + return this.code; + } + + public String getApiUrl() { + return this.apiUrl; + } + + public String getDescription() { + return description; + } + + public static NoteType fromInt(int i) { + return BY_ID.get(i); + } + + public static NoteType fromApiUrl(final String url) { + return BY_API.get(url); + } + + public EnumOptionData toEnumOptionData() { + return new EnumOptionData(getValue().longValue(), getCode(), getDescription()); + } +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteWritePlatformService.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/note/service/NoteWritePlatformService.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteWritePlatformService.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/note/service/NoteWritePlatformService.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailAssembler.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailAssembler.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailAssembler.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailAssembler.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailRepository.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailRepository.java similarity index 89% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailRepository.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailRepository.java index c34c9fe3a..1f0126b03 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailRepository.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/domain/PaymentDetailRepository.java @@ -18,10 +18,11 @@ */ package org.apache.fineract.portfolio.paymentdetail.domain; -import org.apache.fineract.portfolio.loanaccount.domain.Loan; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.stereotype.Repository; -public interface PaymentDetailRepository extends JpaRepository, JpaSpecificationExecutor { +@Repository +public interface PaymentDetailRepository extends JpaRepository, JpaSpecificationExecutor { // no added behaviour } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformService.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformService.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformService.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformService.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformServiceJpaRepositoryImpl.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformServiceJpaRepositoryImpl.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformServiceJpaRepositoryImpl.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/service/PaymentDetailWritePlatformServiceJpaRepositoryImpl.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/starter/PaymentDetailConfiguration.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/starter/PaymentDetailConfiguration.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/starter/PaymentDetailConfiguration.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymentdetail/starter/PaymentDetailConfiguration.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceSwagger.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceSwagger.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceSwagger.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceSwagger.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/data/PaymentTypeDataValidator.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/data/PaymentTypeDataValidator.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/data/PaymentTypeDataValidator.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/data/PaymentTypeDataValidator.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/CreatePaymentTypeCommandHandler.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/CreatePaymentTypeCommandHandler.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/CreatePaymentTypeCommandHandler.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/CreatePaymentTypeCommandHandler.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/DeletePaymentTypeCommandHandler.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/DeletePaymentTypeCommandHandler.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/DeletePaymentTypeCommandHandler.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/DeletePaymentTypeCommandHandler.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/UpdatePaymentTypeCommandHandler.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/UpdatePaymentTypeCommandHandler.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/UpdatePaymentTypeCommandHandler.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/handler/UpdatePaymentTypeCommandHandler.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/mapper/PaymentTypeMapper.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/mapper/PaymentTypeMapper.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/mapper/PaymentTypeMapper.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/mapper/PaymentTypeMapper.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformService.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformService.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformService.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformService.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformServiceImpl.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformServiceImpl.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformServiceImpl.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformServiceImpl.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteService.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteService.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteService.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteService.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteServiceImpl.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteServiceImpl.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteServiceImpl.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeWriteServiceImpl.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/starter/PaymentTypeConfiguration.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/starter/PaymentTypeConfiguration.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/starter/PaymentTypeConfiguration.java rename to fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/starter/PaymentTypeConfiguration.java diff --git a/fineract-doc/src/docs/en/chapters/custom/service-note.adoc b/fineract-doc/src/docs/en/chapters/custom/service-note.adoc index c88fadd6c..d3beb4e6b 100644 --- a/fineract-doc/src/docs/en/chapters/custom/service-note.adoc +++ b/fineract-doc/src/docs/en/chapters/custom/service-note.adoc @@ -9,13 +9,13 @@ NOTE: We chose the note service because it's interface is very simple and has no .Note Read Service Interface [source,java] ---- -include::{rootdir}/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java[lines=19..] +include::{rootdir}/fineract-core/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java[lines=19..] ---- .Note Write Service Interface [source,java] ---- -include::{rootdir}/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java[lines=19..] +include::{rootdir}/fineract-core/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformService.java[lines=19..] ---- == Auto Start Configuration diff --git a/fineract-investor/src/main/java/org/apache/fineract/investor/accounting/journalentry/service/InvestorAccountingHelper.java b/fineract-investor/src/main/java/org/apache/fineract/investor/accounting/journalentry/service/InvestorAccountingHelper.java index 944e4744b..33f8c9a6d 100644 --- a/fineract-investor/src/main/java/org/apache/fineract/investor/accounting/journalentry/service/InvestorAccountingHelper.java +++ b/fineract-investor/src/main/java/org/apache/fineract/investor/accounting/journalentry/service/InvestorAccountingHelper.java @@ -33,12 +33,12 @@ import org.apache.fineract.accounting.journalentry.domain.JournalEntryRepository import org.apache.fineract.accounting.journalentry.domain.JournalEntryType; import org.apache.fineract.accounting.journalentry.exception.JournalEntryInvalidException; import org.apache.fineract.accounting.journalentry.exception.JournalEntryInvalidException.GlJournalEntryInvalidReason; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping; import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMappingRepository; import org.apache.fineract.accounting.producttoaccountmapping.exception.ProductToGLAccountMappingNotFoundException; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.organisation.office.domain.Office; +import org.apache.fineract.portfolio.PortfolioProductType; import org.springframework.stereotype.Service; @Service diff --git a/fineract-investor/src/main/resources/jpa/investor/persistence.xml b/fineract-investor/src/main/resources/jpa/investor/persistence.xml index 885d58faa..82439d7db 100644 --- a/fineract-investor/src/main/resources/jpa/investor/persistence.xml +++ b/fineract-investor/src/main/resources/jpa/investor/persistence.xml @@ -38,7 +38,7 @@ org.apache.fineract.infrastructure.documentmanagement.domain.Image org.apache.fineract.organisation.staff.domain.Staff org.apache.fineract.organisation.office.domain.Office - org.apache.fineract.organisation.office.domain.OrganisationCurrency + org.apache.fineract.organisation.monetary.domain.OrganisationCurrency org.apache.fineract.organisation.monetary.domain.ApplicationCurrency org.apache.fineract.organisation.holiday.domain.Holiday org.apache.fineract.organisation.workingdays.domain.WorkingDays diff --git a/fineract-loan/src/main/java/org/apache/fineract/accounting/productaccountmapping/service/LoanProductToGLAccountMappingHelper.java b/fineract-loan/src/main/java/org/apache/fineract/accounting/productaccountmapping/service/LoanProductToGLAccountMappingHelper.java index fe5de5aea..b40a343e0 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/accounting/productaccountmapping/service/LoanProductToGLAccountMappingHelper.java +++ b/fineract-loan/src/main/java/org/apache/fineract/accounting/productaccountmapping/service/LoanProductToGLAccountMappingHelper.java @@ -30,12 +30,12 @@ import org.apache.fineract.accounting.glaccount.domain.GLAccount; import org.apache.fineract.accounting.glaccount.domain.GLAccountRepository; import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper; import org.apache.fineract.accounting.glaccount.domain.GLAccountType; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMappingRepository; import org.apache.fineract.accounting.producttoaccountmapping.exception.ProductToGLAccountMappingInvalidException; import org.apache.fineract.accounting.producttoaccountmapping.service.ProductToGLAccountMappingHelper; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; +import org.apache.fineract.portfolio.PortfolioProductType; import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper; import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepositoryWrapper; import org.springframework.stereotype.Component; diff --git a/fineract-loan/src/main/resources/jpa/loan/persistence.xml b/fineract-loan/src/main/resources/jpa/loan/persistence.xml index b76d09e1a..a9028061c 100644 --- a/fineract-loan/src/main/resources/jpa/loan/persistence.xml +++ b/fineract-loan/src/main/resources/jpa/loan/persistence.xml @@ -39,7 +39,7 @@ org.apache.fineract.infrastructure.documentmanagement.domain.Image org.apache.fineract.organisation.staff.domain.Staff org.apache.fineract.organisation.office.domain.Office - org.apache.fineract.organisation.office.domain.OrganisationCurrency + org.apache.fineract.organisation.monetary.domain.OrganisationCurrency org.apache.fineract.organisation.monetary.domain.ApplicationCurrency org.apache.fineract.organisation.holiday.domain.Holiday org.apache.fineract.organisation.workingdays.domain.WorkingDays diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java index 66018dd49..84737f1a1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java @@ -49,7 +49,6 @@ import org.apache.fineract.accounting.journalentry.data.JournalEntryAssociationP import org.apache.fineract.accounting.journalentry.data.JournalEntryData; import org.apache.fineract.accounting.journalentry.data.OfficeOpeningBalancesData; import org.apache.fineract.accounting.journalentry.service.JournalEntryReadPlatformService; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.commands.domain.CommandWrapper; import org.apache.fineract.commands.service.CommandWrapperBuilder; import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService; @@ -68,6 +67,7 @@ import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.infrastructure.security.service.SqlValidator; +import org.apache.fineract.portfolio.PortfolioProductType; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataParam; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java index d3ca6da09..62bd6564e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java @@ -54,7 +54,6 @@ import org.apache.fineract.accounting.journalentry.domain.JournalEntryRepository import org.apache.fineract.accounting.journalentry.domain.JournalEntryType; import org.apache.fineract.accounting.journalentry.exception.JournalEntryInvalidException; import org.apache.fineract.accounting.journalentry.exception.JournalEntryInvalidException.GlJournalEntryInvalidReason; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping; import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMappingRepository; import org.apache.fineract.accounting.producttoaccountmapping.exception.ProductToGLAccountMappingNotFoundException; @@ -65,6 +64,7 @@ import org.apache.fineract.infrastructure.event.business.domain.journalentry.Loa import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService; import org.apache.fineract.organisation.office.domain.Office; import org.apache.fineract.organisation.office.domain.OfficeRepository; +import org.apache.fineract.portfolio.PortfolioProductType; import org.apache.fineract.portfolio.account.PortfolioAccountType; import org.apache.fineract.portfolio.account.service.AccountTransfersReadPlatformService; import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java index fa1d72737..460e89e45 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java @@ -55,7 +55,6 @@ import org.apache.fineract.accounting.journalentry.exception.JournalEntryInvalid import org.apache.fineract.accounting.journalentry.exception.JournalEntryInvalidException.GlJournalEntryInvalidReason; import org.apache.fineract.accounting.journalentry.exception.JournalEntryRuntimeException; import org.apache.fineract.accounting.journalentry.serialization.JournalEntryCommandFromApiJsonDeserializer; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.accounting.provisioning.domain.LoanProductProvisioningEntry; import org.apache.fineract.accounting.provisioning.domain.ProvisioningEntry; import org.apache.fineract.accounting.rule.domain.AccountingRule; @@ -72,9 +71,10 @@ import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidati import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; +import org.apache.fineract.organisation.monetary.domain.OrganisationCurrencyRepositoryWrapper; import org.apache.fineract.organisation.office.domain.Office; import org.apache.fineract.organisation.office.domain.OfficeRepositoryWrapper; -import org.apache.fineract.organisation.office.domain.OrganisationCurrencyRepositoryWrapper; +import org.apache.fineract.portfolio.PortfolioProductType; import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; import org.apache.fineract.portfolio.paymentdetail.service.PaymentDetailWritePlatformService; import org.apache.fineract.useradministration.domain.AppUser; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/starter/AccountingJournalEntryConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/starter/AccountingJournalEntryConfiguration.java index 73a08c064..aef8bbb8b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/starter/AccountingJournalEntryConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/starter/AccountingJournalEntryConfiguration.java @@ -40,9 +40,9 @@ import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecific import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; +import org.apache.fineract.organisation.monetary.domain.OrganisationCurrencyRepositoryWrapper; import org.apache.fineract.organisation.office.domain.OfficeRepository; import org.apache.fineract.organisation.office.domain.OfficeRepositoryWrapper; -import org.apache.fineract.organisation.office.domain.OrganisationCurrencyRepositoryWrapper; import org.apache.fineract.organisation.office.service.OfficeReadPlatformService; import org.apache.fineract.portfolio.account.service.AccountTransfersReadPlatformService; import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java index 3257da64b..5a683d1c3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java @@ -28,7 +28,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.fineract.accounting.glaccount.domain.GLAccount; import org.apache.fineract.accounting.glaccount.domain.GLAccountRepository; import org.apache.fineract.accounting.journalentry.service.JournalEntryWritePlatformService; -import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.accounting.provisioning.data.LoanProductProvisioningEntryData; import org.apache.fineract.accounting.provisioning.data.ProvisioningEntryData; import org.apache.fineract.accounting.provisioning.domain.LoanProductProvisioningEntry; @@ -54,6 +53,7 @@ import org.apache.fineract.organisation.provisioning.data.ProvisioningCriteriaDa import org.apache.fineract.organisation.provisioning.domain.ProvisioningCategory; import org.apache.fineract.organisation.provisioning.domain.ProvisioningCategoryRepository; import org.apache.fineract.organisation.provisioning.service.ProvisioningCriteriaReadPlatformService; +import org.apache.fineract.portfolio.PortfolioProductType; import org.apache.fineract.portfolio.loanproduct.domain.LoanProduct; import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRepository; import org.apache.fineract.useradministration.domain.AppUser; diff --git a/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java index 094716819..ce5a25e82 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java @@ -99,7 +99,6 @@ import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepository; import org.apache.fineract.portfolio.savings.SavingsAccountTransactionType; import org.apache.fineract.portfolio.savings.SavingsTransactionBooleanValues; import org.apache.fineract.portfolio.savings.domain.SavingsAccount; -import org.apache.fineract.portfolio.savings.domain.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.domain.SavingsAccountRepository; import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransaction; import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransactionRepository; @@ -107,6 +106,7 @@ import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransactionSum import org.apache.fineract.portfolio.savings.domain.SavingsHelper; import org.apache.fineract.portfolio.savings.exception.InsufficientAccountBalanceException; import org.apache.fineract.portfolio.savings.exception.SavingsAccountNotFoundException; +import org.apache.fineract.portfolio.savings.service.SavingsAccountDomainService; import org.apache.fineract.useradministration.domain.AppUser; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.EmptyResultDataAccessException; diff --git a/fineract-provider/src/main/java/org/apache/fineract/interoperation/starter/InteroperationConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/interoperation/starter/InteroperationConfiguration.java index 9f5ce202d..3f3da24ae 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/interoperation/starter/InteroperationConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/interoperation/starter/InteroperationConfiguration.java @@ -31,11 +31,11 @@ import org.apache.fineract.portfolio.loanaccount.data.LoanAccountData; import org.apache.fineract.portfolio.loanaccount.domain.LoanRepository; import org.apache.fineract.portfolio.note.domain.NoteRepository; import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepository; -import org.apache.fineract.portfolio.savings.domain.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.domain.SavingsAccountRepository; import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransactionRepository; import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransactionSummaryWrapper; import org.apache.fineract.portfolio.savings.domain.SavingsHelper; +import org.apache.fineract.portfolio.savings.service.SavingsAccountDomainService; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyWritePlatformServiceJpaRepositoryImpl.java index 8ae1e81b7..c42ea2e90 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyWritePlatformServiceJpaRepositoryImpl.java @@ -31,10 +31,10 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuild import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.domain.ApplicationCurrency; import org.apache.fineract.organisation.monetary.domain.ApplicationCurrencyRepositoryWrapper; +import org.apache.fineract.organisation.monetary.domain.OrganisationCurrency; +import org.apache.fineract.organisation.monetary.domain.OrganisationCurrencyRepository; import org.apache.fineract.organisation.monetary.exception.CurrencyInUseException; import org.apache.fineract.organisation.monetary.serialization.CurrencyCommandFromApiJsonDeserializer; -import org.apache.fineract.organisation.office.domain.OrganisationCurrency; -import org.apache.fineract.organisation.office.domain.OrganisationCurrencyRepository; import org.apache.fineract.portfolio.charge.service.ChargeReadPlatformService; import org.apache.fineract.portfolio.loanproduct.service.LoanProductReadPlatformService; import org.apache.fineract.portfolio.savings.service.SavingsProductReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/starter/OrganisationMonetaryConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/starter/OrganisationMonetaryConfiguration.java index cc5e62197..c35818e47 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/starter/OrganisationMonetaryConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/starter/OrganisationMonetaryConfiguration.java @@ -20,6 +20,7 @@ package org.apache.fineract.organisation.monetary.starter; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.domain.ApplicationCurrencyRepositoryWrapper; +import org.apache.fineract.organisation.monetary.domain.OrganisationCurrencyRepository; import org.apache.fineract.organisation.monetary.serialization.CurrencyCommandFromApiJsonDeserializer; import org.apache.fineract.organisation.monetary.service.CurrencyReadPlatformService; import org.apache.fineract.organisation.monetary.service.CurrencyReadPlatformServiceImpl; @@ -27,7 +28,6 @@ import org.apache.fineract.organisation.monetary.service.CurrencyWritePlatformSe import org.apache.fineract.organisation.monetary.service.CurrencyWritePlatformServiceJpaRepositoryImpl; import org.apache.fineract.organisation.monetary.service.OrganisationCurrencyReadPlatformService; import org.apache.fineract.organisation.monetary.service.OrganisationCurrencyReadPlatformServiceImpl; -import org.apache.fineract.organisation.office.domain.OrganisationCurrencyRepository; import org.apache.fineract.portfolio.charge.service.ChargeReadPlatformService; import org.apache.fineract.portfolio.loanproduct.service.LoanProductReadPlatformService; import org.apache.fineract.portfolio.savings.service.SavingsProductReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountNumberGenerator.java similarity index 98% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java rename to fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountNumberGenerator.java index 3ebe684ba..ea578eb2a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountNumberGenerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.client.domain; +package org.apache.fineract.portfolio.account.service; import java.math.BigInteger; import java.util.HashMap; @@ -29,6 +29,8 @@ import org.apache.fineract.infrastructure.accountnumberformat.domain.AccountNumb import org.apache.fineract.infrastructure.codes.domain.CodeValue; import org.apache.fineract.infrastructure.configuration.data.GlobalConfigurationPropertyData; import org.apache.fineract.infrastructure.configuration.service.ConfigurationReadPlatformService; +import org.apache.fineract.portfolio.client.domain.Client; +import org.apache.fineract.portfolio.client.domain.ClientRepository; import org.apache.fineract.portfolio.group.domain.Group; import org.apache.fineract.portfolio.loanaccount.domain.Loan; import org.apache.fineract.portfolio.loanaccount.domain.LoanRepository; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersWritePlatformServiceImpl.java index 58dfc01ba..88e6d1650 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersWritePlatformServiceImpl.java @@ -66,8 +66,8 @@ import org.apache.fineract.portfolio.savings.domain.GSIMRepositoy; import org.apache.fineract.portfolio.savings.domain.GroupSavingsIndividualMonitoring; import org.apache.fineract.portfolio.savings.domain.SavingsAccount; import org.apache.fineract.portfolio.savings.domain.SavingsAccountAssembler; -import org.apache.fineract.portfolio.savings.domain.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransaction; +import org.apache.fineract.portfolio.savings.service.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.service.SavingsAccountWritePlatformService; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/starter/AccountConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/starter/AccountConfiguration.java index 90a827854..f02d0326a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/starter/AccountConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/starter/AccountConfiguration.java @@ -53,7 +53,7 @@ import org.apache.fineract.portfolio.loanaccount.service.LoanAssembler; import org.apache.fineract.portfolio.loanaccount.service.LoanReadPlatformService; import org.apache.fineract.portfolio.savings.domain.GSIMRepositoy; import org.apache.fineract.portfolio.savings.domain.SavingsAccountAssembler; -import org.apache.fineract.portfolio.savings.domain.SavingsAccountDomainService; +import org.apache.fineract.portfolio.savings.service.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.service.SavingsAccountWritePlatformService; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResource.java index de94c8fe0..f2d831150 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResource.java @@ -49,6 +49,7 @@ import org.apache.fineract.infrastructure.bulkimport.service.BulkImportWorkbookS import org.apache.fineract.infrastructure.core.api.ApiRequestParameterHelper; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.data.UploadRequest; +import org.apache.fineract.infrastructure.core.exception.ResourceNotFoundException; import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.apache.fineract.infrastructure.core.service.Page; @@ -56,7 +57,6 @@ import org.apache.fineract.infrastructure.security.service.PlatformSecurityConte import org.apache.fineract.portfolio.accounts.constants.AccountsApiConstants; import org.apache.fineract.portfolio.accounts.data.AccountData; import org.apache.fineract.portfolio.accounts.service.AccountReadPlatformService; -import org.apache.fineract.portfolio.products.exception.ResourceNotFoundException; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataParam; import org.springframework.beans.BeansException; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientCharge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientCharge.java index 60426745b..0b774946f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientCharge.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientCharge.java @@ -30,7 +30,7 @@ import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; import org.apache.fineract.organisation.monetary.domain.Money; -import org.apache.fineract.organisation.office.domain.OrganisationCurrency; +import org.apache.fineract.organisation.monetary.domain.OrganisationCurrency; import org.apache.fineract.portfolio.charge.domain.Charge; import org.apache.fineract.portfolio.charge.domain.ChargeCalculationType; import org.apache.fineract.portfolio.charge.domain.ChargeTimeType; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientChargeRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientChargeRepositoryWrapper.java index 1ff775247..92e7a0486 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientChargeRepositoryWrapper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientChargeRepositoryWrapper.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.portfolio.client.domain; -import org.apache.fineract.organisation.office.domain.OrganisationCurrencyRepositoryWrapper; +import org.apache.fineract.organisation.monetary.domain.OrganisationCurrencyRepositoryWrapper; import org.apache.fineract.portfolio.charge.exception.ChargeNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransaction.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransaction.java index 858375861..b7b29906b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransaction.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransaction.java @@ -43,8 +43,8 @@ import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; import org.apache.fineract.organisation.monetary.domain.Money; +import org.apache.fineract.organisation.monetary.domain.OrganisationCurrency; import org.apache.fineract.organisation.office.domain.Office; -import org.apache.fineract.organisation.office.domain.OrganisationCurrency; import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; @Entity diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransactionRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransactionRepositoryWrapper.java index 2703bfead..01f831193 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransactionRepositoryWrapper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransactionRepositoryWrapper.java @@ -19,7 +19,7 @@ package org.apache.fineract.portfolio.client.domain; import lombok.RequiredArgsConstructor; -import org.apache.fineract.organisation.office.domain.OrganisationCurrencyRepositoryWrapper; +import org.apache.fineract.organisation.monetary.domain.OrganisationCurrencyRepositoryWrapper; import org.apache.fineract.portfolio.client.exception.ClientTransactionNotFoundException; import org.springframework.stereotype.Service; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionWritePlatformServiceJpaRepositoryImpl.java index f041a386d..97841807e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionWritePlatformServiceJpaRepositoryImpl.java @@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor; import org.apache.fineract.accounting.journalentry.service.JournalEntryWritePlatformService; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder; -import org.apache.fineract.organisation.office.domain.OrganisationCurrencyRepositoryWrapper; +import org.apache.fineract.organisation.monetary.domain.OrganisationCurrencyRepositoryWrapper; import org.apache.fineract.portfolio.client.domain.Client; import org.apache.fineract.portfolio.client.domain.ClientCharge; import org.apache.fineract.portfolio.client.domain.ClientChargePaidBy; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java index 9cb152acf..5f9897743 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java @@ -60,10 +60,10 @@ import org.apache.fineract.organisation.office.domain.Office; import org.apache.fineract.organisation.office.domain.OfficeRepositoryWrapper; import org.apache.fineract.organisation.staff.domain.Staff; import org.apache.fineract.organisation.staff.domain.StaffRepositoryWrapper; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.address.service.AddressWritePlatformService; import org.apache.fineract.portfolio.client.api.ClientApiConstants; import org.apache.fineract.portfolio.client.data.ClientDataValidator; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; import org.apache.fineract.portfolio.client.domain.Client; import org.apache.fineract.portfolio.client.domain.ClientEnumerations; import org.apache.fineract.portfolio.client.domain.ClientNonPerson; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java index 646108a98..cda35f7cc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java @@ -58,12 +58,12 @@ import org.apache.fineract.organisation.office.domain.OfficeRepositoryWrapper; import org.apache.fineract.organisation.office.exception.InvalidOfficeException; import org.apache.fineract.organisation.staff.domain.Staff; import org.apache.fineract.organisation.staff.domain.StaffRepositoryWrapper; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.calendar.domain.Calendar; import org.apache.fineract.portfolio.calendar.domain.CalendarEntityType; import org.apache.fineract.portfolio.calendar.domain.CalendarInstance; import org.apache.fineract.portfolio.calendar.domain.CalendarInstanceRepository; import org.apache.fineract.portfolio.calendar.domain.CalendarType; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; import org.apache.fineract.portfolio.client.domain.Client; import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper; import org.apache.fineract.portfolio.client.service.LoanStatusMapper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/starter/GroupConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/starter/GroupConfiguration.java index 18ee752cc..f48b83aa7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/starter/GroupConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/starter/GroupConfiguration.java @@ -35,8 +35,8 @@ import org.apache.fineract.organisation.office.domain.OfficeRepositoryWrapper; import org.apache.fineract.organisation.office.service.OfficeReadPlatformService; import org.apache.fineract.organisation.staff.domain.StaffRepositoryWrapper; import org.apache.fineract.organisation.staff.service.StaffReadPlatformService; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.calendar.domain.CalendarInstanceRepository; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper; import org.apache.fineract.portfolio.client.service.ClientReadPlatformService; import org.apache.fineract.portfolio.group.domain.GroupLevelRepository; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAssembler.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAssembler.java index 6bf8744dd..a62e25b8c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAssembler.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAssembler.java @@ -53,9 +53,9 @@ import org.apache.fineract.organisation.staff.exception.StaffNotFoundException; import org.apache.fineract.organisation.staff.exception.StaffRoleException; import org.apache.fineract.organisation.workingdays.domain.WorkingDays; import org.apache.fineract.organisation.workingdays.domain.WorkingDaysRepositoryWrapper; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.accountdetails.domain.AccountType; import org.apache.fineract.portfolio.charge.domain.Charge; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; import org.apache.fineract.portfolio.client.domain.Client; import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper; import org.apache.fineract.portfolio.collateralmanagement.service.LoanCollateralAssembler; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/starter/LoanAccountConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/starter/LoanAccountConfiguration.java index 33a32d0e2..38c8c24cb 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/starter/LoanAccountConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/starter/LoanAccountConfiguration.java @@ -44,6 +44,7 @@ import org.apache.fineract.organisation.workingdays.domain.WorkingDaysRepository import org.apache.fineract.portfolio.account.domain.AccountAssociationsRepository; import org.apache.fineract.portfolio.account.domain.AccountTransferDetailRepository; import org.apache.fineract.portfolio.account.service.AccountAssociationsReadPlatformService; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.account.service.AccountTransfersReadPlatformService; import org.apache.fineract.portfolio.account.service.AccountTransfersWritePlatformService; import org.apache.fineract.portfolio.accountdetails.service.AccountDetailsReadPlatformService; @@ -53,7 +54,6 @@ import org.apache.fineract.portfolio.calendar.service.CalendarReadPlatformServic import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper; import org.apache.fineract.portfolio.charge.service.ChargeDropdownReadPlatformService; import org.apache.fineract.portfolio.charge.service.ChargeReadPlatformService; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper; import org.apache.fineract.portfolio.client.service.ClientReadPlatformService; import org.apache.fineract.portfolio.collateralmanagement.service.LoanCollateralAssembler; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java deleted file mode 100644 index ecd8708cc..000000000 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java +++ /dev/null @@ -1,108 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.fineract.portfolio.note.domain; - -import java.util.HashMap; -import java.util.Map; - -public enum NoteType { - - CLIENT(100, "noteType.client", "clients"), // - LOAN(200, "noteType.loan", "loans"), // - LOAN_TRANSACTION(300, "noteType.loan.transaction", "loanTransactions"), // - SAVING_ACCOUNT(500, "noteType.saving", "savings"), // - GROUP(600, "noteType.group", "groups"), // - SHARE_ACCOUNT(700, "noteType.shares", "accounts/share"), // - SAVINGS_TRANSACTION(800, "noteType.savings.transaction", "savingsTransactions"); - - private final Integer value; - private final String code; - private final String apiUrl; - - NoteType(final Integer value, final String code, final String apiUrl) { - this.value = value; - this.code = code; - this.apiUrl = apiUrl; - } - - public Integer getValue() { - return this.value; - } - - public String getCode() { - return this.code; - } - - public String getApiUrl() { - return this.apiUrl; - } - - private static final Map intToEnumMap = new HashMap<>(); - private static int minValue; - private static int maxValue; - - static { - int i = 0; - for (final NoteType type : NoteType.values()) { - if (i == 0) { - minValue = type.value; - } - intToEnumMap.put(type.value, type); - if (minValue >= type.value) { - minValue = type.value; - } - if (maxValue < type.value) { - maxValue = type.value; - } - i = i + 1; - } - } - - public static NoteType fromInt(final int i) { - final NoteType type = intToEnumMap.get(Integer.valueOf(i)); - return type; - } - - public static int getMinValue() { - return minValue; - } - - public static int getMaxValue() { - return maxValue; - } - - @Override - public String toString() { - return name().toString(); - } - - private static final Map apiUrlToEnumMap = new HashMap<>(); - - static { - for (final NoteType type : NoteType.values()) { - apiUrlToEnumMap.put(type.apiUrl, type); - } - } - - public static NoteType fromApiUrl(final String url) { - final NoteType type = apiUrlToEnumMap.get(url); - return type; - } - -} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResource.java index 1708e0699..17708a967 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResource.java @@ -43,13 +43,13 @@ import org.apache.fineract.commands.service.CommandWrapperBuilder; import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService; import org.apache.fineract.infrastructure.core.api.ApiRequestParameterHelper; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; +import org.apache.fineract.infrastructure.core.exception.ResourceNotFoundException; import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.products.constants.ProductsApiConstants; import org.apache.fineract.portfolio.products.data.ProductData; -import org.apache.fineract.portfolio.products.exception.ResourceNotFoundException; import org.apache.fineract.portfolio.products.service.ShareProductReadPlatformService; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/DepositAccountDomainServiceJpa.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/DepositAccountDomainServiceJpa.java index 52290bc4c..7fe875bed 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/DepositAccountDomainServiceJpa.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/DepositAccountDomainServiceJpa.java @@ -43,6 +43,7 @@ import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.portfolio.account.PortfolioAccountType; import org.apache.fineract.portfolio.account.data.AccountTransferDTO; import org.apache.fineract.portfolio.account.domain.AccountTransferType; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.account.service.AccountTransfersWritePlatformService; import org.apache.fineract.portfolio.calendar.domain.Calendar; import org.apache.fineract.portfolio.calendar.domain.CalendarEntityType; @@ -51,7 +52,6 @@ import org.apache.fineract.portfolio.calendar.domain.CalendarInstance; import org.apache.fineract.portfolio.calendar.domain.CalendarInstanceRepository; import org.apache.fineract.portfolio.calendar.domain.CalendarType; import org.apache.fineract.portfolio.calendar.service.CalendarUtils; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; import org.apache.fineract.portfolio.common.domain.PeriodFrequencyType; import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; import org.apache.fineract.portfolio.savings.DepositAccountOnClosureType; @@ -59,6 +59,7 @@ import org.apache.fineract.portfolio.savings.DepositAccountType; import org.apache.fineract.portfolio.savings.DepositsApiConstants; import org.apache.fineract.portfolio.savings.SavingsApiConstants; import org.apache.fineract.portfolio.savings.SavingsTransactionBooleanValues; +import org.apache.fineract.portfolio.savings.service.SavingsAccountDomainService; import org.apache.fineract.useradministration.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainServiceJpa.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainServiceJpa.java index ad8a8c175..fb16621dc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainServiceJpa.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainServiceJpa.java @@ -43,6 +43,7 @@ import org.apache.fineract.portfolio.savings.SavingsAccountTransactionType; import org.apache.fineract.portfolio.savings.SavingsTransactionBooleanValues; import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionDTO; import org.apache.fineract.portfolio.savings.exception.DepositAccountTransactionNotAllowedException; +import org.apache.fineract.portfolio.savings.service.SavingsAccountDomainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java index a46c35b97..02bc5f340 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java @@ -58,6 +58,7 @@ import org.apache.fineract.organisation.staff.domain.StaffRepositoryWrapper; import org.apache.fineract.portfolio.account.domain.AccountAssociationType; import org.apache.fineract.portfolio.account.domain.AccountAssociations; import org.apache.fineract.portfolio.account.domain.AccountAssociationsRepository; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.calendar.domain.Calendar; import org.apache.fineract.portfolio.calendar.domain.CalendarEntityType; import org.apache.fineract.portfolio.calendar.domain.CalendarFrequencyType; @@ -65,7 +66,6 @@ import org.apache.fineract.portfolio.calendar.domain.CalendarInstance; import org.apache.fineract.portfolio.calendar.domain.CalendarInstanceRepository; import org.apache.fineract.portfolio.calendar.domain.CalendarType; import org.apache.fineract.portfolio.calendar.service.CalendarUtils; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; import org.apache.fineract.portfolio.client.domain.Client; import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper; import org.apache.fineract.portfolio.client.exception.ClientNotActiveException; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java index 350618311..bb7aaf80d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java @@ -113,7 +113,6 @@ import org.apache.fineract.portfolio.savings.domain.SavingsAccount; import org.apache.fineract.portfolio.savings.domain.SavingsAccountAssembler; import org.apache.fineract.portfolio.savings.domain.SavingsAccountCharge; import org.apache.fineract.portfolio.savings.domain.SavingsAccountChargeRepositoryWrapper; -import org.apache.fineract.portfolio.savings.domain.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.domain.SavingsAccountRepositoryWrapper; import org.apache.fineract.portfolio.savings.domain.SavingsAccountStatusType; import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransaction; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java index e9c4fa0c2..06881b005 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java @@ -58,7 +58,7 @@ import org.apache.fineract.infrastructure.security.service.PlatformSecurityConte import org.apache.fineract.organisation.monetary.domain.Money; import org.apache.fineract.organisation.staff.domain.Staff; import org.apache.fineract.organisation.staff.domain.StaffRepositoryWrapper; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.client.domain.Client; import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper; import org.apache.fineract.portfolio.client.exception.ClientNotActiveException; @@ -79,7 +79,6 @@ import org.apache.fineract.portfolio.savings.domain.SavingsAccount; import org.apache.fineract.portfolio.savings.domain.SavingsAccountAssembler; import org.apache.fineract.portfolio.savings.domain.SavingsAccountCharge; import org.apache.fineract.portfolio.savings.domain.SavingsAccountChargeAssembler; -import org.apache.fineract.portfolio.savings.domain.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.domain.SavingsAccountRepositoryWrapper; import org.apache.fineract.portfolio.savings.domain.SavingsAccountStatusType; import org.apache.fineract.portfolio.savings.domain.SavingsProduct; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/starter/SavingsConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/starter/SavingsConfiguration.java index 1d04addb6..c81ab4eef 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/starter/SavingsConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/starter/SavingsConfiguration.java @@ -46,6 +46,7 @@ import org.apache.fineract.organisation.workingdays.domain.WorkingDaysRepository import org.apache.fineract.portfolio.account.domain.AccountAssociationsRepository; import org.apache.fineract.portfolio.account.domain.StandingInstructionRepository; import org.apache.fineract.portfolio.account.service.AccountAssociationsReadPlatformService; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.account.service.AccountTransfersReadPlatformService; import org.apache.fineract.portfolio.account.service.AccountTransfersWritePlatformService; import org.apache.fineract.portfolio.calendar.domain.CalendarInstanceRepository; @@ -53,7 +54,6 @@ import org.apache.fineract.portfolio.calendar.service.CalendarReadPlatformServic import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper; import org.apache.fineract.portfolio.charge.service.ChargeDropdownReadPlatformService; import org.apache.fineract.portfolio.charge.service.ChargeReadPlatformService; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper; import org.apache.fineract.portfolio.client.service.ClientReadPlatformService; import org.apache.fineract.portfolio.common.service.DropdownReadPlatformService; @@ -87,7 +87,6 @@ import org.apache.fineract.portfolio.savings.domain.RecurringDepositProductRepos import org.apache.fineract.portfolio.savings.domain.SavingsAccountAssembler; import org.apache.fineract.portfolio.savings.domain.SavingsAccountChargeAssembler; import org.apache.fineract.portfolio.savings.domain.SavingsAccountChargeRepositoryWrapper; -import org.apache.fineract.portfolio.savings.domain.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.domain.SavingsAccountRepositoryWrapper; import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransactionRepository; import org.apache.fineract.portfolio.savings.domain.SavingsHelper; @@ -120,6 +119,7 @@ import org.apache.fineract.portfolio.savings.service.RecurringDepositProductWrit import org.apache.fineract.portfolio.savings.service.SavingsAccountApplicationTransitionApiJsonValidator; import org.apache.fineract.portfolio.savings.service.SavingsAccountChargeReadPlatformService; import org.apache.fineract.portfolio.savings.service.SavingsAccountChargeReadPlatformServiceImpl; +import org.apache.fineract.portfolio.savings.service.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.service.SavingsAccountInterestPostingService; import org.apache.fineract.portfolio.savings.service.SavingsAccountInterestPostingServiceImpl; import org.apache.fineract.portfolio.savings.service.SavingsAccountReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountSchedularServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountSchedularServiceImpl.java index 70d2c88e9..5cfbf2895 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountSchedularServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountSchedularServiceImpl.java @@ -22,8 +22,8 @@ import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.portfolio.savings.domain.SavingsAccount; import org.apache.fineract.portfolio.savings.domain.SavingsAccountAssembler; -import org.apache.fineract.portfolio.savings.domain.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransaction; +import org.apache.fineract.portfolio.savings.service.SavingsAccountDomainService; import org.apache.fineract.portfolio.shareaccounts.domain.ShareAccountDividendDetails; import org.apache.fineract.portfolio.shareaccounts.domain.ShareAccountDividendRepository; import org.apache.fineract.portfolio.shareaccounts.domain.ShareAccountDividendStatusType; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformServiceJpaRepositoryImpl.java index 34f8f713b..ca6d16543 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformServiceJpaRepositoryImpl.java @@ -42,8 +42,8 @@ import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.event.business.domain.share.ShareAccountApproveBusinessEvent; import org.apache.fineract.infrastructure.event.business.domain.share.ShareAccountCreateBusinessEvent; import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.accounts.constants.ShareAccountApiConstants; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; import org.apache.fineract.portfolio.note.domain.Note; import org.apache.fineract.portfolio.note.domain.NoteRepository; import org.apache.fineract.portfolio.shareaccounts.data.ShareAccountTransactionEnumData; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/start/ShareAccountsConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/start/ShareAccountsConfiguration.java index cc5d2b38a..6daf95834 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/start/ShareAccountsConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/start/ShareAccountsConfiguration.java @@ -25,14 +25,14 @@ import org.apache.fineract.infrastructure.core.service.PaginationHelper; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; +import org.apache.fineract.portfolio.account.service.AccountNumberGenerator; import org.apache.fineract.portfolio.accounts.constants.AccountsApiConstants; import org.apache.fineract.portfolio.accounts.service.AccountsCommandsService; import org.apache.fineract.portfolio.charge.service.ChargeReadPlatformService; -import org.apache.fineract.portfolio.client.domain.AccountNumberGenerator; import org.apache.fineract.portfolio.client.service.ClientReadPlatformService; import org.apache.fineract.portfolio.note.domain.NoteRepository; import org.apache.fineract.portfolio.savings.domain.SavingsAccountAssembler; -import org.apache.fineract.portfolio.savings.domain.SavingsAccountDomainService; +import org.apache.fineract.portfolio.savings.service.SavingsAccountDomainService; import org.apache.fineract.portfolio.savings.service.SavingsAccountReadPlatformService; import org.apache.fineract.portfolio.shareaccounts.domain.ShareAccountDividendRepository; import org.apache.fineract.portfolio.shareaccounts.domain.ShareAccountRepositoryWrapper; diff --git a/fineract-provider/src/main/resources/jpa/persistence.xml b/fineract-provider/src/main/resources/jpa/persistence.xml index 56ae3946c..b55db0369 100644 --- a/fineract-provider/src/main/resources/jpa/persistence.xml +++ b/fineract-provider/src/main/resources/jpa/persistence.xml @@ -39,7 +39,7 @@ org.apache.fineract.infrastructure.documentmanagement.domain.Image org.apache.fineract.organisation.staff.domain.Staff org.apache.fineract.organisation.office.domain.Office - org.apache.fineract.organisation.office.domain.OrganisationCurrency + org.apache.fineract.organisation.monetary.domain.OrganisationCurrency org.apache.fineract.organisation.monetary.domain.ApplicationCurrency org.apache.fineract.organisation.holiday.domain.Holiday org.apache.fineract.organisation.workingdays.domain.WorkingDays diff --git a/fineract-savings/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifierType.java b/fineract-savings/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifierType.java deleted file mode 100644 index ef1863749..000000000 --- a/fineract-savings/src/main/java/org/apache/fineract/interoperation/domain/InteropIdentifierType.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.fineract.interoperation.domain; - -public enum InteropIdentifierType { - - MSISDN, EMAIL, PERSONAL_ID, BUSINESS, DEVICE, ACCOUNT_ID, IBAN, ALIAS -} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepository.java b/fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepository.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepository.java rename to fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepository.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepositoryWrapper.java b/fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepositoryWrapper.java similarity index 100% rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepositoryWrapper.java rename to fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepositoryWrapper.java diff --git a/fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainService.java b/fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountDomainService.java similarity index 92% rename from fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainService.java rename to fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountDomainService.java index 81bece8b8..325c9dd8a 100644 --- a/fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainService.java +++ b/fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountDomainService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.savings.domain; +package org.apache.fineract.portfolio.savings.service; import java.math.BigDecimal; import java.time.LocalDate; @@ -25,6 +25,8 @@ import java.util.List; import java.util.Set; import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; import org.apache.fineract.portfolio.savings.SavingsTransactionBooleanValues; +import org.apache.fineract.portfolio.savings.domain.SavingsAccount; +import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransaction; public interface SavingsAccountDomainService {