This is an automated email from the ASF dual-hosted git repository. juhan pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-cheques.git
commit 95a948bd94f8a4cf6c60391ad3368a1368db7813 Author: Myrle Krantz <[email protected]> AuthorDate: Mon Apr 16 11:46:10 2018 +0200 Adjusting to package name changes in upstream repositories. --- .../mifos/cheque/api/v1/client/ChequeManager.java | 13 ++++----- .../cheque/api/v1/domain/ChequeTransaction.java | 3 +- .../java/io/mifos/cheque/api/v1/domain/MICR.java | 2 +- .../java/io/mifos/cheque/AbstractChequeTest.java | 12 ++++---- .../src/main/java/io/mifos/cheque/Fixture.java | 5 ++-- .../java/io/mifos/cheque/SuiteTestEnvironment.java | 6 ++-- .../src/main/java/io/mifos/cheque/TestCheques.java | 15 +++++----- .../src/main/java/io/mifos/cheque/TestMICR.java | 15 +++++----- .../mifos/cheque/listener/ChequeEventListener.java | 4 +-- .../listener/ManagementEventMigrationListener.java | 4 +-- .../mifos/cheque/service/ChequeConfiguration.java | 22 +++++++-------- .../internal/command/handler/ChequeAggregate.java | 33 +++++++++++----------- .../command/handler/ManagementAggregate.java | 13 ++++----- .../service/internal/mapper/ChequeMapper.java | 5 ++-- .../service/internal/repository/ChequeEntity.java | 7 ++--- .../internal/repository/IssuedChequeEntity.java | 5 ++-- .../service/internal/service/MICRService.java | 8 +++--- .../internal/service/helper/AccountingService.java | 31 ++++++++++---------- .../internal/service/helper/CustomerService.java | 9 +++--- .../internal/service/helper/DepositService.java | 19 ++++++------- .../service/helper/OrganizationService.java | 9 +++--- .../rest/ChequeManagementRestController.java | 6 ++-- .../cheque/service/rest/ChequeRestController.java | 15 +++++----- .../rest/ChequeTransactionRestController.java | 11 ++++---- .../cheque/service/rest/MIRCRestController.java | 4 +-- 25 files changed, 130 insertions(+), 146 deletions(-) diff --git a/api/src/main/java/io/mifos/cheque/api/v1/client/ChequeManager.java b/api/src/main/java/io/mifos/cheque/api/v1/client/ChequeManager.java index 0b8e33a..51a6875 100644 --- a/api/src/main/java/io/mifos/cheque/api/v1/client/ChequeManager.java +++ b/api/src/main/java/io/mifos/cheque/api/v1/client/ChequeManager.java @@ -23,10 +23,12 @@ import io.mifos.cheque.api.v1.domain.ChequeProcessingCommand; import io.mifos.cheque.api.v1.domain.ChequeTransaction; import io.mifos.cheque.api.v1.domain.IssuingCount; import io.mifos.cheque.api.v1.domain.MICRResolution; -import io.mifos.core.api.annotation.ThrowsException; -import io.mifos.core.api.annotation.ThrowsExceptions; -import io.mifos.core.api.util.CustomFeignClientsConfiguration; -import io.mifos.core.api.util.NotFoundException; +import java.util.List; +import javax.validation.Valid; +import org.apache.fineract.cn.api.annotation.ThrowsException; +import org.apache.fineract.cn.api.annotation.ThrowsExceptions; +import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration; +import org.apache.fineract.cn.api.util.NotFoundException; import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -36,9 +38,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import javax.validation.Valid; -import java.util.List; - @SuppressWarnings("unused") @FeignClient(value = "cheques-v1", path = "/cheques/v1", configuration = CustomFeignClientsConfiguration.class) public interface ChequeManager { diff --git a/api/src/main/java/io/mifos/cheque/api/v1/domain/ChequeTransaction.java b/api/src/main/java/io/mifos/cheque/api/v1/domain/ChequeTransaction.java index ae396d9..9663dd4 100644 --- a/api/src/main/java/io/mifos/cheque/api/v1/domain/ChequeTransaction.java +++ b/api/src/main/java/io/mifos/cheque/api/v1/domain/ChequeTransaction.java @@ -18,10 +18,9 @@ */ package io.mifos.cheque.api.v1.domain; -import io.mifos.core.lang.validation.constraints.ValidIdentifier; - import javax.validation.Valid; import javax.validation.constraints.NotNull; +import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier; public class ChequeTransaction { diff --git a/api/src/main/java/io/mifos/cheque/api/v1/domain/MICR.java b/api/src/main/java/io/mifos/cheque/api/v1/domain/MICR.java index d46e95f..230e09c 100644 --- a/api/src/main/java/io/mifos/cheque/api/v1/domain/MICR.java +++ b/api/src/main/java/io/mifos/cheque/api/v1/domain/MICR.java @@ -18,7 +18,7 @@ */ package io.mifos.cheque.api.v1.domain; -import io.mifos.core.lang.validation.constraints.ValidIdentifier; +import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier; public class MICR { diff --git a/component-test/src/main/java/io/mifos/cheque/AbstractChequeTest.java b/component-test/src/main/java/io/mifos/cheque/AbstractChequeTest.java index 7370b72..3710d18 100644 --- a/component-test/src/main/java/io/mifos/cheque/AbstractChequeTest.java +++ b/component-test/src/main/java/io/mifos/cheque/AbstractChequeTest.java @@ -18,15 +18,15 @@ */ package io.mifos.cheque; -import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; import io.mifos.cheque.api.v1.EventConstants; import io.mifos.cheque.api.v1.client.ChequeManager; import io.mifos.cheque.service.ChequeConfiguration; -import io.mifos.core.api.context.AutoUserContext; -import io.mifos.core.lang.ApplicationName; -import io.mifos.core.test.fixture.TenantDataStoreContextTestRule; -import io.mifos.core.test.listener.EnableEventRecording; -import io.mifos.core.test.listener.EventRecorder; +import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; +import org.apache.fineract.cn.api.context.AutoUserContext; +import org.apache.fineract.cn.lang.ApplicationName; +import org.apache.fineract.cn.test.fixture.TenantDataStoreContextTestRule; +import org.apache.fineract.cn.test.listener.EnableEventRecording; +import org.apache.fineract.cn.test.listener.EventRecorder; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/component-test/src/main/java/io/mifos/cheque/Fixture.java b/component-test/src/main/java/io/mifos/cheque/Fixture.java index e8b411a..a1f519b 100644 --- a/component-test/src/main/java/io/mifos/cheque/Fixture.java +++ b/component-test/src/main/java/io/mifos/cheque/Fixture.java @@ -20,11 +20,10 @@ package io.mifos.cheque; import io.mifos.cheque.api.v1.domain.Cheque; import io.mifos.cheque.api.v1.domain.MICR; -import io.mifos.core.lang.DateConverter; -import org.apache.commons.lang3.RandomStringUtils; - import java.time.Clock; import java.time.LocalDate; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.fineract.cn.lang.DateConverter; public class Fixture { diff --git a/component-test/src/main/java/io/mifos/cheque/SuiteTestEnvironment.java b/component-test/src/main/java/io/mifos/cheque/SuiteTestEnvironment.java index 4a8fdab..a1b27c1 100644 --- a/component-test/src/main/java/io/mifos/cheque/SuiteTestEnvironment.java +++ b/component-test/src/main/java/io/mifos/cheque/SuiteTestEnvironment.java @@ -19,9 +19,9 @@ package io.mifos.cheque; -import io.mifos.core.test.env.TestEnvironment; -import io.mifos.core.test.fixture.cassandra.CassandraInitializer; -import io.mifos.core.test.fixture.mariadb.MariaDBInitializer; +import org.apache.fineract.cn.test.env.TestEnvironment; +import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; +import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.rules.RunExternalResourceOnce; diff --git a/component-test/src/main/java/io/mifos/cheque/TestCheques.java b/component-test/src/main/java/io/mifos/cheque/TestCheques.java index c557408..ed20d64 100644 --- a/component-test/src/main/java/io/mifos/cheque/TestCheques.java +++ b/component-test/src/main/java/io/mifos/cheque/TestCheques.java @@ -19,10 +19,6 @@ package io.mifos.cheque; import com.google.common.collect.Sets; -import io.mifos.accounting.api.v1.domain.Account; -import io.mifos.accounting.api.v1.domain.Creditor; -import io.mifos.accounting.api.v1.domain.Debtor; -import io.mifos.accounting.api.v1.domain.JournalEntry; import io.mifos.cheque.api.v1.EventConstants; import io.mifos.cheque.api.v1.domain.Action; import io.mifos.cheque.api.v1.domain.Cheque; @@ -34,7 +30,14 @@ import io.mifos.cheque.service.internal.format.MICRParser; import io.mifos.cheque.service.internal.service.helper.AccountingService; import io.mifos.cheque.service.internal.service.helper.DepositService; import io.mifos.cheque.service.internal.service.helper.OrganizationService; +import java.util.Collections; +import java.util.Optional; +import java.util.UUID; import org.apache.commons.lang3.RandomStringUtils; +import org.apache.fineract.cn.accounting.api.v1.domain.Account; +import org.apache.fineract.cn.accounting.api.v1.domain.Creditor; +import org.apache.fineract.cn.accounting.api.v1.domain.Debtor; +import org.apache.fineract.cn.accounting.api.v1.domain.JournalEntry; import org.junit.Assert; import org.junit.Test; import org.mockito.Matchers; @@ -44,10 +47,6 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.validation.Validator; -import java.util.Collections; -import java.util.Optional; -import java.util.UUID; - public class TestCheques extends AbstractChequeTest { @MockBean diff --git a/component-test/src/main/java/io/mifos/cheque/TestMICR.java b/component-test/src/main/java/io/mifos/cheque/TestMICR.java index 1066aa4..0545e60 100644 --- a/component-test/src/main/java/io/mifos/cheque/TestMICR.java +++ b/component-test/src/main/java/io/mifos/cheque/TestMICR.java @@ -18,7 +18,6 @@ */ package io.mifos.cheque; -import io.mifos.accounting.api.v1.domain.Account; import io.mifos.cheque.api.v1.EventConstants; import io.mifos.cheque.api.v1.client.DependingResourceNotValidException; import io.mifos.cheque.api.v1.client.InvalidChequeNumberException; @@ -32,20 +31,20 @@ import io.mifos.cheque.service.internal.service.helper.AccountingService; import io.mifos.cheque.service.internal.service.helper.CustomerService; import io.mifos.cheque.service.internal.service.helper.DepositService; import io.mifos.cheque.service.internal.service.helper.OrganizationService; -import io.mifos.core.api.util.NotFoundException; -import io.mifos.customer.api.v1.domain.Customer; -import io.mifos.deposit.api.v1.instance.domain.ProductInstance; -import io.mifos.office.api.v1.domain.Office; +import java.util.Collections; +import java.util.Optional; import org.apache.commons.lang3.RandomStringUtils; +import org.apache.fineract.cn.accounting.api.v1.domain.Account; +import org.apache.fineract.cn.api.util.NotFoundException; +import org.apache.fineract.cn.customer.api.v1.domain.Customer; +import org.apache.fineract.cn.deposit.api.v1.instance.domain.ProductInstance; +import org.apache.fineract.cn.office.api.v1.domain.Office; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; -import java.util.Collections; -import java.util.Optional; - public class TestMICR extends AbstractChequeTest { private static final String OFFICE_NAME = "Money Bin"; diff --git a/component-test/src/main/java/io/mifos/cheque/listener/ChequeEventListener.java b/component-test/src/main/java/io/mifos/cheque/listener/ChequeEventListener.java index 69cf012..c7cf2a0 100644 --- a/component-test/src/main/java/io/mifos/cheque/listener/ChequeEventListener.java +++ b/component-test/src/main/java/io/mifos/cheque/listener/ChequeEventListener.java @@ -20,8 +20,8 @@ package io.mifos.cheque.listener; import io.mifos.cheque.AbstractChequeTest; import io.mifos.cheque.api.v1.EventConstants; -import io.mifos.core.lang.config.TenantHeaderFilter; -import io.mifos.core.test.listener.EventRecorder; +import org.apache.fineract.cn.lang.config.TenantHeaderFilter; +import org.apache.fineract.cn.test.listener.EventRecorder; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.jms.annotation.JmsListener; diff --git a/component-test/src/main/java/io/mifos/cheque/listener/ManagementEventMigrationListener.java b/component-test/src/main/java/io/mifos/cheque/listener/ManagementEventMigrationListener.java index 7690c6d..d565c72 100644 --- a/component-test/src/main/java/io/mifos/cheque/listener/ManagementEventMigrationListener.java +++ b/component-test/src/main/java/io/mifos/cheque/listener/ManagementEventMigrationListener.java @@ -20,8 +20,8 @@ package io.mifos.cheque.listener; import io.mifos.cheque.AbstractChequeTest; import io.mifos.cheque.api.v1.EventConstants; -import io.mifos.core.lang.config.TenantHeaderFilter; -import io.mifos.core.test.listener.EventRecorder; +import org.apache.fineract.cn.lang.config.TenantHeaderFilter; +import org.apache.fineract.cn.test.listener.EventRecorder; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/service/src/main/java/io/mifos/cheque/service/ChequeConfiguration.java b/service/src/main/java/io/mifos/cheque/service/ChequeConfiguration.java index 45c1d92..6f6a52c 100644 --- a/service/src/main/java/io/mifos/cheque/service/ChequeConfiguration.java +++ b/service/src/main/java/io/mifos/cheque/service/ChequeConfiguration.java @@ -18,17 +18,17 @@ */ package io.mifos.cheque.service; -import io.mifos.accounting.api.v1.client.LedgerManager; -import io.mifos.anubis.config.EnableAnubis; -import io.mifos.core.async.config.EnableAsync; -import io.mifos.core.cassandra.config.EnableCassandra; -import io.mifos.core.command.config.EnableCommandProcessing; -import io.mifos.core.lang.config.EnableServiceException; -import io.mifos.core.lang.config.EnableTenantContext; -import io.mifos.core.mariadb.config.EnableMariaDB; -import io.mifos.customer.api.v1.client.CustomerManager; -import io.mifos.deposit.api.v1.client.DepositAccountManager; -import io.mifos.office.api.v1.client.OrganizationManager; +import org.apache.fineract.cn.accounting.api.v1.client.LedgerManager; +import org.apache.fineract.cn.anubis.config.EnableAnubis; +import org.apache.fineract.cn.async.config.EnableAsync; +import org.apache.fineract.cn.cassandra.config.EnableCassandra; +import org.apache.fineract.cn.command.config.EnableCommandProcessing; +import org.apache.fineract.cn.customer.api.v1.client.CustomerManager; +import org.apache.fineract.cn.deposit.api.v1.client.DepositAccountManager; +import org.apache.fineract.cn.lang.config.EnableServiceException; +import org.apache.fineract.cn.lang.config.EnableTenantContext; +import org.apache.fineract.cn.mariadb.config.EnableMariaDB; +import org.apache.fineract.cn.office.api.v1.client.OrganizationManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/service/src/main/java/io/mifos/cheque/service/internal/command/handler/ChequeAggregate.java b/service/src/main/java/io/mifos/cheque/service/internal/command/handler/ChequeAggregate.java index fc5d327..8b6a500 100644 --- a/service/src/main/java/io/mifos/cheque/service/internal/command/handler/ChequeAggregate.java +++ b/service/src/main/java/io/mifos/cheque/service/internal/command/handler/ChequeAggregate.java @@ -19,10 +19,6 @@ package io.mifos.cheque.service.internal.command.handler; import com.google.common.collect.Sets; -import io.mifos.accounting.api.v1.client.AccountNotFoundException; -import io.mifos.accounting.api.v1.domain.Creditor; -import io.mifos.accounting.api.v1.domain.Debtor; -import io.mifos.accounting.api.v1.domain.JournalEntry; import io.mifos.cheque.api.v1.EventConstants; import io.mifos.cheque.api.v1.domain.MICR; import io.mifos.cheque.api.v1.domain.State; @@ -40,25 +36,28 @@ import io.mifos.cheque.service.internal.repository.IssuedChequeRepository; import io.mifos.cheque.service.internal.service.helper.AccountingService; import io.mifos.cheque.service.internal.service.helper.DepositService; import io.mifos.cheque.service.internal.service.helper.OrganizationService; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.command.annotation.Aggregate; -import io.mifos.core.command.annotation.CommandHandler; -import io.mifos.core.command.annotation.EventEmitter; -import io.mifos.core.lang.DateConverter; -import io.mifos.core.lang.ServiceException; -import io.mifos.deposit.api.v1.definition.domain.Charge; -import io.mifos.deposit.api.v1.instance.ProductInstanceNotFoundException; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; - -import javax.transaction.Transactional; import java.time.Clock; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; import java.util.UUID; import java.util.stream.Collectors; +import javax.transaction.Transactional; +import org.apache.fineract.cn.accounting.api.v1.client.AccountNotFoundException; +import org.apache.fineract.cn.accounting.api.v1.domain.Creditor; +import org.apache.fineract.cn.accounting.api.v1.domain.Debtor; +import org.apache.fineract.cn.accounting.api.v1.domain.JournalEntry; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.command.annotation.Aggregate; +import org.apache.fineract.cn.command.annotation.CommandHandler; +import org.apache.fineract.cn.command.annotation.EventEmitter; +import org.apache.fineract.cn.deposit.api.v1.definition.domain.Charge; +import org.apache.fineract.cn.deposit.api.v1.instance.ProductInstanceNotFoundException; +import org.apache.fineract.cn.lang.DateConverter; +import org.apache.fineract.cn.lang.ServiceException; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; @Aggregate public class ChequeAggregate { diff --git a/service/src/main/java/io/mifos/cheque/service/internal/command/handler/ManagementAggregate.java b/service/src/main/java/io/mifos/cheque/service/internal/command/handler/ManagementAggregate.java index e20fb8d..d310658 100644 --- a/service/src/main/java/io/mifos/cheque/service/internal/command/handler/ManagementAggregate.java +++ b/service/src/main/java/io/mifos/cheque/service/internal/command/handler/ManagementAggregate.java @@ -21,18 +21,17 @@ package io.mifos.cheque.service.internal.command.handler; import io.mifos.cheque.api.v1.EventConstants; import io.mifos.cheque.service.ServiceConstants; import io.mifos.cheque.service.internal.command.MigrationCommand; -import io.mifos.core.command.annotation.Aggregate; -import io.mifos.core.command.annotation.CommandHandler; -import io.mifos.core.command.annotation.EventEmitter; -import io.mifos.core.lang.ApplicationName; -import io.mifos.core.mariadb.domain.FlywayFactoryBean; +import javax.sql.DataSource; +import org.apache.fineract.cn.command.annotation.Aggregate; +import org.apache.fineract.cn.command.annotation.CommandHandler; +import org.apache.fineract.cn.command.annotation.EventEmitter; +import org.apache.fineract.cn.lang.ApplicationName; +import org.apache.fineract.cn.mariadb.domain.FlywayFactoryBean; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.transaction.annotation.Transactional; -import javax.sql.DataSource; - @Aggregate public class ManagementAggregate { diff --git a/service/src/main/java/io/mifos/cheque/service/internal/mapper/ChequeMapper.java b/service/src/main/java/io/mifos/cheque/service/internal/mapper/ChequeMapper.java index 88ddfb6..28547a4 100644 --- a/service/src/main/java/io/mifos/cheque/service/internal/mapper/ChequeMapper.java +++ b/service/src/main/java/io/mifos/cheque/service/internal/mapper/ChequeMapper.java @@ -21,12 +21,11 @@ package io.mifos.cheque.service.internal.mapper; import io.mifos.cheque.api.v1.domain.Cheque; import io.mifos.cheque.api.v1.domain.MICR; import io.mifos.cheque.service.internal.repository.ChequeEntity; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; - import java.sql.Date; import java.time.Clock; import java.time.LocalDateTime; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.lang.DateConverter; public class ChequeMapper { diff --git a/service/src/main/java/io/mifos/cheque/service/internal/repository/ChequeEntity.java b/service/src/main/java/io/mifos/cheque/service/internal/repository/ChequeEntity.java index 8169c9d..14fced8 100644 --- a/service/src/main/java/io/mifos/cheque/service/internal/repository/ChequeEntity.java +++ b/service/src/main/java/io/mifos/cheque/service/internal/repository/ChequeEntity.java @@ -18,8 +18,8 @@ */ package io.mifos.cheque.service.internal.repository; -import io.mifos.core.mariadb.util.LocalDateTimeConverter; - +import java.sql.Date; +import java.time.LocalDateTime; import javax.persistence.Column; import javax.persistence.Convert; import javax.persistence.Entity; @@ -27,8 +27,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import java.sql.Date; -import java.time.LocalDateTime; +import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter; @Entity @Table(name = "sopdet_cheques") diff --git a/service/src/main/java/io/mifos/cheque/service/internal/repository/IssuedChequeEntity.java b/service/src/main/java/io/mifos/cheque/service/internal/repository/IssuedChequeEntity.java index 33deca3..fab2c9f 100644 --- a/service/src/main/java/io/mifos/cheque/service/internal/repository/IssuedChequeEntity.java +++ b/service/src/main/java/io/mifos/cheque/service/internal/repository/IssuedChequeEntity.java @@ -18,8 +18,7 @@ */ package io.mifos.cheque.service.internal.repository; -import io.mifos.core.mariadb.util.LocalDateTimeConverter; - +import java.time.LocalDateTime; import javax.persistence.Column; import javax.persistence.Convert; import javax.persistence.Entity; @@ -27,7 +26,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import java.time.LocalDateTime; +import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter; @Entity @Table(name = "sopdet_issued_cheques") diff --git a/service/src/main/java/io/mifos/cheque/service/internal/service/MICRService.java b/service/src/main/java/io/mifos/cheque/service/internal/service/MICRService.java index 968165b..865ab45 100644 --- a/service/src/main/java/io/mifos/cheque/service/internal/service/MICRService.java +++ b/service/src/main/java/io/mifos/cheque/service/internal/service/MICRService.java @@ -26,10 +26,10 @@ import io.mifos.cheque.service.internal.repository.IssuedChequeRepository; import io.mifos.cheque.service.internal.service.helper.CustomerService; import io.mifos.cheque.service.internal.service.helper.DepositService; import io.mifos.cheque.service.internal.service.helper.OrganizationService; -import io.mifos.core.lang.ServiceException; -import io.mifos.customer.api.v1.domain.Customer; -import io.mifos.deposit.api.v1.instance.domain.ProductInstance; -import io.mifos.office.api.v1.domain.Office; +import org.apache.fineract.cn.customer.api.v1.domain.Customer; +import org.apache.fineract.cn.deposit.api.v1.instance.domain.ProductInstance; +import org.apache.fineract.cn.lang.ServiceException; +import org.apache.fineract.cn.office.api.v1.domain.Office; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/service/src/main/java/io/mifos/cheque/service/internal/service/helper/AccountingService.java b/service/src/main/java/io/mifos/cheque/service/internal/service/helper/AccountingService.java index 5d2d630..0eb32cf 100644 --- a/service/src/main/java/io/mifos/cheque/service/internal/service/helper/AccountingService.java +++ b/service/src/main/java/io/mifos/cheque/service/internal/service/helper/AccountingService.java @@ -19,29 +19,28 @@ package io.mifos.cheque.service.internal.service.helper; import com.google.common.collect.Sets; -import io.mifos.accounting.api.v1.client.AccountNotFoundException; -import io.mifos.accounting.api.v1.client.LedgerManager; -import io.mifos.accounting.api.v1.domain.Account; -import io.mifos.accounting.api.v1.domain.AccountPage; -import io.mifos.accounting.api.v1.domain.Creditor; -import io.mifos.accounting.api.v1.domain.Debtor; -import io.mifos.accounting.api.v1.domain.JournalEntry; import io.mifos.cheque.service.ServiceConstants; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; -import io.mifos.core.lang.ServiceException; -import io.mifos.deposit.api.v1.definition.domain.Charge; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; - import java.time.Clock; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; import java.util.UUID; import java.util.stream.Collectors; +import org.apache.fineract.cn.accounting.api.v1.client.AccountNotFoundException; +import org.apache.fineract.cn.accounting.api.v1.client.LedgerManager; +import org.apache.fineract.cn.accounting.api.v1.domain.Account; +import org.apache.fineract.cn.accounting.api.v1.domain.AccountPage; +import org.apache.fineract.cn.accounting.api.v1.domain.Creditor; +import org.apache.fineract.cn.accounting.api.v1.domain.Debtor; +import org.apache.fineract.cn.accounting.api.v1.domain.JournalEntry; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.deposit.api.v1.definition.domain.Charge; +import org.apache.fineract.cn.lang.DateConverter; +import org.apache.fineract.cn.lang.ServiceException; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; @Service public class AccountingService { diff --git a/service/src/main/java/io/mifos/cheque/service/internal/service/helper/CustomerService.java b/service/src/main/java/io/mifos/cheque/service/internal/service/helper/CustomerService.java index b90e3a4..fb82213 100644 --- a/service/src/main/java/io/mifos/cheque/service/internal/service/helper/CustomerService.java +++ b/service/src/main/java/io/mifos/cheque/service/internal/service/helper/CustomerService.java @@ -19,16 +19,15 @@ package io.mifos.cheque.service.internal.service.helper; import io.mifos.cheque.service.ServiceConstants; -import io.mifos.customer.api.v1.client.CustomerManager; -import io.mifos.customer.api.v1.client.CustomerNotFoundException; -import io.mifos.customer.api.v1.domain.Customer; +import java.util.Optional; +import org.apache.fineract.cn.customer.api.v1.client.CustomerManager; +import org.apache.fineract.cn.customer.api.v1.client.CustomerNotFoundException; +import org.apache.fineract.cn.customer.api.v1.domain.Customer; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import java.util.Optional; - @Service public class CustomerService { diff --git a/service/src/main/java/io/mifos/cheque/service/internal/service/helper/DepositService.java b/service/src/main/java/io/mifos/cheque/service/internal/service/helper/DepositService.java index 98bcabc..92e128f 100644 --- a/service/src/main/java/io/mifos/cheque/service/internal/service/helper/DepositService.java +++ b/service/src/main/java/io/mifos/cheque/service/internal/service/helper/DepositService.java @@ -19,21 +19,20 @@ package io.mifos.cheque.service.internal.service.helper; import io.mifos.cheque.service.ServiceConstants; -import io.mifos.deposit.api.v1.client.DepositAccountManager; -import io.mifos.deposit.api.v1.definition.domain.Action; -import io.mifos.deposit.api.v1.definition.domain.Charge; -import io.mifos.deposit.api.v1.definition.domain.ProductDefinition; -import io.mifos.deposit.api.v1.instance.ProductInstanceNotFoundException; -import io.mifos.deposit.api.v1.instance.domain.ProductInstance; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; +import org.apache.fineract.cn.deposit.api.v1.client.DepositAccountManager; +import org.apache.fineract.cn.deposit.api.v1.definition.domain.Action; +import org.apache.fineract.cn.deposit.api.v1.definition.domain.Charge; +import org.apache.fineract.cn.deposit.api.v1.definition.domain.ProductDefinition; +import org.apache.fineract.cn.deposit.api.v1.instance.ProductInstanceNotFoundException; +import org.apache.fineract.cn.deposit.api.v1.instance.domain.ProductInstance; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - @Service public class DepositService { diff --git a/service/src/main/java/io/mifos/cheque/service/internal/service/helper/OrganizationService.java b/service/src/main/java/io/mifos/cheque/service/internal/service/helper/OrganizationService.java index 26177cd..3af98fd 100644 --- a/service/src/main/java/io/mifos/cheque/service/internal/service/helper/OrganizationService.java +++ b/service/src/main/java/io/mifos/cheque/service/internal/service/helper/OrganizationService.java @@ -19,16 +19,15 @@ package io.mifos.cheque.service.internal.service.helper; import io.mifos.cheque.service.ServiceConstants; -import io.mifos.office.api.v1.client.NotFoundException; -import io.mifos.office.api.v1.client.OrganizationManager; -import io.mifos.office.api.v1.domain.Office; +import java.util.Optional; +import org.apache.fineract.cn.office.api.v1.client.NotFoundException; +import org.apache.fineract.cn.office.api.v1.client.OrganizationManager; +import org.apache.fineract.cn.office.api.v1.domain.Office; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import java.util.Optional; - @Service public class OrganizationService { diff --git a/service/src/main/java/io/mifos/cheque/service/rest/ChequeManagementRestController.java b/service/src/main/java/io/mifos/cheque/service/rest/ChequeManagementRestController.java index facfee4..47299b9 100644 --- a/service/src/main/java/io/mifos/cheque/service/rest/ChequeManagementRestController.java +++ b/service/src/main/java/io/mifos/cheque/service/rest/ChequeManagementRestController.java @@ -18,11 +18,11 @@ */ package io.mifos.cheque.service.rest; -import io.mifos.anubis.annotation.AcceptedTokenType; -import io.mifos.anubis.annotation.Permittable; import io.mifos.cheque.service.ServiceConstants; import io.mifos.cheque.service.internal.command.MigrationCommand; -import io.mifos.core.command.gateway.CommandGateway; +import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; +import org.apache.fineract.cn.anubis.annotation.Permittable; +import org.apache.fineract.cn.command.gateway.CommandGateway; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/service/src/main/java/io/mifos/cheque/service/rest/ChequeRestController.java b/service/src/main/java/io/mifos/cheque/service/rest/ChequeRestController.java index 946c8c0..fb990be 100644 --- a/service/src/main/java/io/mifos/cheque/service/rest/ChequeRestController.java +++ b/service/src/main/java/io/mifos/cheque/service/rest/ChequeRestController.java @@ -18,8 +18,6 @@ */ package io.mifos.cheque.service.rest; -import io.mifos.anubis.annotation.AcceptedTokenType; -import io.mifos.anubis.annotation.Permittable; import io.mifos.cheque.api.v1.PermittableGroupIds; import io.mifos.cheque.api.v1.domain.Action; import io.mifos.cheque.api.v1.domain.Cheque; @@ -31,9 +29,13 @@ import io.mifos.cheque.service.internal.command.CancelChequeTransactionCommand; import io.mifos.cheque.service.internal.command.IssueChequesCommand; import io.mifos.cheque.service.internal.format.MICRParser; import io.mifos.cheque.service.internal.service.ChequeService; -import io.mifos.core.command.domain.CommandCallback; -import io.mifos.core.command.gateway.CommandGateway; -import io.mifos.core.lang.ServiceException; +import java.util.List; +import javax.validation.Valid; +import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; +import org.apache.fineract.cn.anubis.annotation.Permittable; +import org.apache.fineract.cn.command.domain.CommandCallback; +import org.apache.fineract.cn.command.gateway.CommandGateway; +import org.apache.fineract.cn.lang.ServiceException; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -47,9 +49,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; -import java.util.List; - @RestController @RequestMapping("/cheques") public class ChequeRestController { diff --git a/service/src/main/java/io/mifos/cheque/service/rest/ChequeTransactionRestController.java b/service/src/main/java/io/mifos/cheque/service/rest/ChequeTransactionRestController.java index 9d83275..d499ef0 100644 --- a/service/src/main/java/io/mifos/cheque/service/rest/ChequeTransactionRestController.java +++ b/service/src/main/java/io/mifos/cheque/service/rest/ChequeTransactionRestController.java @@ -18,8 +18,6 @@ */ package io.mifos.cheque.service.rest; -import io.mifos.anubis.annotation.AcceptedTokenType; -import io.mifos.anubis.annotation.Permittable; import io.mifos.cheque.api.v1.PermittableGroupIds; import io.mifos.cheque.api.v1.domain.Cheque; import io.mifos.cheque.api.v1.domain.ChequeTransaction; @@ -27,8 +25,11 @@ import io.mifos.cheque.service.ServiceConstants; import io.mifos.cheque.service.internal.command.ChequeTransactionCommand; import io.mifos.cheque.service.internal.format.MICRParser; import io.mifos.cheque.service.internal.service.ChequeService; -import io.mifos.core.command.gateway.CommandGateway; -import io.mifos.core.lang.ServiceException; +import javax.validation.Valid; +import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; +import org.apache.fineract.cn.anubis.annotation.Permittable; +import org.apache.fineract.cn.command.gateway.CommandGateway; +import org.apache.fineract.cn.lang.ServiceException; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -40,8 +41,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; - @RestController @RequestMapping("/transactions") public class ChequeTransactionRestController { diff --git a/service/src/main/java/io/mifos/cheque/service/rest/MIRCRestController.java b/service/src/main/java/io/mifos/cheque/service/rest/MIRCRestController.java index c28eddb..b9d0252 100644 --- a/service/src/main/java/io/mifos/cheque/service/rest/MIRCRestController.java +++ b/service/src/main/java/io/mifos/cheque/service/rest/MIRCRestController.java @@ -18,13 +18,13 @@ */ package io.mifos.cheque.service.rest; -import io.mifos.anubis.annotation.AcceptedTokenType; -import io.mifos.anubis.annotation.Permittable; import io.mifos.cheque.api.v1.PermittableGroupIds; import io.mifos.cheque.api.v1.domain.MICRResolution; import io.mifos.cheque.service.ServiceConstants; import io.mifos.cheque.service.internal.format.MICRParser; import io.mifos.cheque.service.internal.service.MICRService; +import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; +import org.apache.fineract.cn.anubis.annotation.Permittable; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier;
