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-template.git
commit c6b23d9f89d5e3412ac7e94721fdc01e5ee2eeb6 Author: Myrle Krantz <[email protected]> AuthorDate: Fri Apr 13 16:53:27 2018 +0200 Adjusting to package name changes in upstream repositories. --- .../template/api/v1/client/TemplateManager.java | 7 +++---- .../io/mifos/template/api/v1/domain/Sample.java | 5 ++--- .../mifos/template/api/v1/domain/SampleTest.java | 9 ++++----- .../io/mifos/template/SuiteTestEnvironment.java | 6 +++--- .../main/java/io/mifos/template/TestSample.java | 22 +++++++++++++--------- .../template/listener/MigrationEventListener.java | 4 ++-- .../template/listener/SampleEventListener.java | 4 ++-- .../template/service/TemplateConfiguration.java | 14 +++++++------- .../command/handler/MigrationAggregate.java | 15 +++++++-------- .../internal/command/handler/SampleAggregate.java | 8 ++++---- .../repository/SampleJpaEntityRepository.java | 3 +-- .../service/rest/SampleRestController.java | 20 ++++++++++++-------- 12 files changed, 60 insertions(+), 57 deletions(-) diff --git a/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java b/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java index 96cfc98..f4d7037 100644 --- a/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java +++ b/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java @@ -18,9 +18,10 @@ */ package io.mifos.template.api.v1.client; -import io.mifos.core.api.annotation.ThrowsException; -import io.mifos.core.api.util.CustomFeignClientsConfiguration; import io.mifos.template.api.v1.domain.Sample; +import java.util.List; +import org.apache.fineract.cn.api.annotation.ThrowsException; +import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration; import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -28,8 +29,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import java.util.List; - @SuppressWarnings("unused") @FeignClient(value="template-v1", path="/template/v1", configuration = CustomFeignClientsConfiguration.class) public interface TemplateManager { diff --git a/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java b/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java index 12549e9..12bf046 100644 --- a/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java +++ b/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java @@ -18,10 +18,9 @@ */ package io.mifos.template.api.v1.domain; -import io.mifos.core.lang.validation.constraints.ValidIdentifier; -import org.hibernate.validator.constraints.Length; - import java.util.Objects; +import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier; +import org.hibernate.validator.constraints.Length; @SuppressWarnings({"WeakerAccess", "unused"}) public class Sample { diff --git a/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java b/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java index eab7ef9..eb6dd03 100644 --- a/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java +++ b/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java @@ -18,13 +18,12 @@ */ package io.mifos.template.api.v1.domain; -import io.mifos.core.test.domain.ValidationTest; -import io.mifos.core.test.domain.ValidationTestCase; -import org.apache.commons.lang.RandomStringUtils; -import org.junit.runners.Parameterized; - import java.util.ArrayList; import java.util.Collection; +import org.apache.commons.lang.RandomStringUtils; +import org.apache.fineract.cn.test.domain.ValidationTest; +import org.apache.fineract.cn.test.domain.ValidationTestCase; +import org.junit.runners.Parameterized; public class SampleTest extends ValidationTest<Sample> { diff --git a/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java b/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java index a5eaa0d..3ec0a44 100644 --- a/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java +++ b/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java @@ -18,9 +18,9 @@ */ package io.mifos.template; -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/template/TestSample.java b/component-test/src/main/java/io/mifos/template/TestSample.java index 365009c..527e978 100644 --- a/component-test/src/main/java/io/mifos/template/TestSample.java +++ b/component-test/src/main/java/io/mifos/template/TestSample.java @@ -18,17 +18,23 @@ */ package io.mifos.template; -import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; -import io.mifos.core.api.context.AutoUserContext; -import io.mifos.core.test.fixture.TenantDataStoreContextTestRule; -import io.mifos.core.test.listener.EnableEventRecording; -import io.mifos.core.test.listener.EventRecorder; -import io.mifos.template.api.v1.events.EventConstants; import io.mifos.template.api.v1.client.TemplateManager; import io.mifos.template.api.v1.domain.Sample; +import io.mifos.template.api.v1.events.EventConstants; import io.mifos.template.service.TemplateConfiguration; +import java.util.List; import org.apache.commons.lang3.RandomStringUtils; -import org.junit.*; +import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; +import org.apache.fineract.cn.api.context.AutoUserContext; +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.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,8 +49,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringRunner; -import java.util.List; - @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) public class TestSample extends SuiteTestEnvironment { diff --git a/component-test/src/main/java/io/mifos/template/listener/MigrationEventListener.java b/component-test/src/main/java/io/mifos/template/listener/MigrationEventListener.java index 3fb8213..b54f66f 100644 --- a/component-test/src/main/java/io/mifos/template/listener/MigrationEventListener.java +++ b/component-test/src/main/java/io/mifos/template/listener/MigrationEventListener.java @@ -18,9 +18,9 @@ */ package io.mifos.template.listener; -import io.mifos.core.lang.config.TenantHeaderFilter; -import io.mifos.core.test.listener.EventRecorder; import io.mifos.template.api.v1.events.EventConstants; +import org.apache.fineract.cn.lang.config.TenantHeaderFilter; +import org.apache.fineract.cn.test.listener.EventRecorder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jms.annotation.JmsListener; import org.springframework.messaging.handler.annotation.Header; diff --git a/component-test/src/main/java/io/mifos/template/listener/SampleEventListener.java b/component-test/src/main/java/io/mifos/template/listener/SampleEventListener.java index 0ff3df7..cf6b8c4 100644 --- a/component-test/src/main/java/io/mifos/template/listener/SampleEventListener.java +++ b/component-test/src/main/java/io/mifos/template/listener/SampleEventListener.java @@ -18,9 +18,9 @@ */ package io.mifos.template.listener; -import io.mifos.core.lang.config.TenantHeaderFilter; -import io.mifos.core.test.listener.EventRecorder; import io.mifos.template.api.v1.events.EventConstants; +import org.apache.fineract.cn.lang.config.TenantHeaderFilter; +import org.apache.fineract.cn.test.listener.EventRecorder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jms.annotation.JmsListener; import org.springframework.messaging.handler.annotation.Header; diff --git a/service/src/main/java/io/mifos/template/service/TemplateConfiguration.java b/service/src/main/java/io/mifos/template/service/TemplateConfiguration.java index 5e62592..b75c1ad 100644 --- a/service/src/main/java/io/mifos/template/service/TemplateConfiguration.java +++ b/service/src/main/java/io/mifos/template/service/TemplateConfiguration.java @@ -18,13 +18,13 @@ */ package io.mifos.template.service; -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 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.lang.config.EnableServiceException; +import org.apache.fineract.cn.lang.config.EnableTenantContext; +import org.apache.fineract.cn.mariadb.config.EnableMariaDB; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java index f0034aa..eeecf99 100644 --- a/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java +++ b/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java @@ -18,22 +18,21 @@ */ package io.mifos.template.service.internal.command.handler; -import io.mifos.core.command.annotation.Aggregate; -import io.mifos.core.command.annotation.CommandHandler; -import io.mifos.core.command.annotation.CommandLogLevel; -import io.mifos.core.command.annotation.EventEmitter; -import io.mifos.core.lang.ApplicationName; -import io.mifos.core.mariadb.domain.FlywayFactoryBean; import io.mifos.template.api.v1.events.EventConstants; import io.mifos.template.service.ServiceConstants; import io.mifos.template.service.internal.command.InitializeServiceCommand; +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.CommandLogLevel; +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; - @SuppressWarnings({ "unused" }) diff --git a/service/src/main/java/io/mifos/template/service/internal/command/handler/SampleAggregate.java b/service/src/main/java/io/mifos/template/service/internal/command/handler/SampleAggregate.java index 3640a05..c82db9f 100644 --- a/service/src/main/java/io/mifos/template/service/internal/command/handler/SampleAggregate.java +++ b/service/src/main/java/io/mifos/template/service/internal/command/handler/SampleAggregate.java @@ -18,14 +18,14 @@ */ package io.mifos.template.service.internal.command.handler; -import io.mifos.core.command.annotation.Aggregate; -import io.mifos.core.command.annotation.CommandHandler; -import io.mifos.core.command.annotation.CommandLogLevel; -import io.mifos.core.command.annotation.EventEmitter; import io.mifos.template.api.v1.events.EventConstants; import io.mifos.template.service.internal.command.SampleCommand; import io.mifos.template.service.internal.repository.SampleJpaEntity; import io.mifos.template.service.internal.repository.SampleJpaEntityRepository; +import org.apache.fineract.cn.command.annotation.Aggregate; +import org.apache.fineract.cn.command.annotation.CommandHandler; +import org.apache.fineract.cn.command.annotation.CommandLogLevel; +import org.apache.fineract.cn.command.annotation.EventEmitter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; diff --git a/service/src/main/java/io/mifos/template/service/internal/repository/SampleJpaEntityRepository.java b/service/src/main/java/io/mifos/template/service/internal/repository/SampleJpaEntityRepository.java index 6b9df88..531c333 100644 --- a/service/src/main/java/io/mifos/template/service/internal/repository/SampleJpaEntityRepository.java +++ b/service/src/main/java/io/mifos/template/service/internal/repository/SampleJpaEntityRepository.java @@ -18,11 +18,10 @@ */ package io.mifos.template.service.internal.repository; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import java.util.Optional; - @Repository public interface SampleJpaEntityRepository extends JpaRepository<SampleJpaEntity, Long> { Optional<SampleJpaEntity> findByIdentifier(String identifier); diff --git a/service/src/main/java/io/mifos/template/service/rest/SampleRestController.java b/service/src/main/java/io/mifos/template/service/rest/SampleRestController.java index b6ced2b..86bfa6e 100644 --- a/service/src/main/java/io/mifos/template/service/rest/SampleRestController.java +++ b/service/src/main/java/io/mifos/template/service/rest/SampleRestController.java @@ -18,25 +18,29 @@ */ package io.mifos.template.service.rest; -import io.mifos.anubis.annotation.AcceptedTokenType; -import io.mifos.anubis.annotation.Permittable; -import io.mifos.core.command.gateway.CommandGateway; -import io.mifos.core.lang.ServiceException; import io.mifos.template.api.v1.PermittableGroupIds; import io.mifos.template.api.v1.domain.Sample; import io.mifos.template.service.ServiceConstants; import io.mifos.template.service.internal.command.InitializeServiceCommand; import io.mifos.template.service.internal.command.SampleCommand; import io.mifos.template.service.internal.service.SampleService; +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.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; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; @SuppressWarnings("unused") @RestController
