This is an automated email from the ASF dual-hosted git repository. awasum pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-group.git
commit e377bd560aee73e3087f7e0a5e214fece340fec4 Author: Myrle Krantz <[email protected]> AuthorDate: Mon Apr 16 13:07:15 2018 +0200 Adjusting to package name changes in upstream repositories. --- .../io/mifos/group/api/v1/client/GroupManager.java | 13 ++++---- .../src/main/java/io/mifos/group/TestGroup.java | 36 ++++++++++++---------- .../java/io/mifos/group/TestGroupDefinition.java | 25 +++++++++------ .../listener/GroupDefinitionEventListener.java | 4 +-- .../mifos/group/listener/GroupEventListener.java | 4 +-- .../group/listener/MigrationEventListener.java | 4 +-- .../io/mifos/group/service/GroupConfiguration.java | 14 ++++----- .../internal/command/handler/GroupAggregate.java | 32 ++++++++++--------- .../command/handler/MigrationAggregate.java | 11 +++---- .../internal/mapper/GroupCommandMapper.java | 7 ++--- .../internal/mapper/GroupDefinitionMapper.java | 4 +-- .../group/service/internal/mapper/GroupMapper.java | 4 +-- .../service/internal/mapper/MeetingMapper.java | 2 +- .../internal/repository/GroupCommandEntity.java | 5 ++- .../internal/repository/GroupDefinitionEntity.java | 5 ++- .../service/internal/repository/GroupEntity.java | 5 ++- .../service/internal/repository/MeetingEntity.java | 9 +++--- .../internal/repository/MeetingRepository.java | 9 +++--- .../service/internal/service/GroupService.java | 17 +++++----- .../rest/GroupDefinitionRestController.java | 15 +++++---- .../group/service/rest/GroupRestController.java | 25 ++++++++------- .../service/rest/MigrationRestController.java | 6 ++-- 22 files changed, 129 insertions(+), 127 deletions(-) diff --git a/api/src/main/java/io/mifos/group/api/v1/client/GroupManager.java b/api/src/main/java/io/mifos/group/api/v1/client/GroupManager.java index 9b5877e..f393d58 100644 --- a/api/src/main/java/io/mifos/group/api/v1/client/GroupManager.java +++ b/api/src/main/java/io/mifos/group/api/v1/client/GroupManager.java @@ -18,16 +18,18 @@ */ package io.mifos.group.api.v1.client; -import io.mifos.core.api.annotation.ThrowsException; -import io.mifos.core.api.annotation.ThrowsExceptions; -import io.mifos.core.api.util.CustomFeignClientsConfiguration; import io.mifos.group.api.v1.domain.AssignedEmployeeHolder; -import io.mifos.group.api.v1.domain.SignOffMeeting; import io.mifos.group.api.v1.domain.Group; import io.mifos.group.api.v1.domain.GroupCommand; import io.mifos.group.api.v1.domain.GroupDefinition; import io.mifos.group.api.v1.domain.GroupPage; import io.mifos.group.api.v1.domain.Meeting; +import io.mifos.group.api.v1.domain.SignOffMeeting; +import java.util.List; +import java.util.Set; +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.springframework.cloud.netflix.feign.FeignClient; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -38,9 +40,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import java.util.List; -import java.util.Set; - @SuppressWarnings("unused") @FeignClient(name="group-v1", path="/group/v1", configuration=CustomFeignClientsConfiguration.class) public interface GroupManager { diff --git a/component-test/src/main/java/io/mifos/group/TestGroup.java b/component-test/src/main/java/io/mifos/group/TestGroup.java index 4e3edf6..d918728 100644 --- a/component-test/src/main/java/io/mifos/group/TestGroup.java +++ b/component-test/src/main/java/io/mifos/group/TestGroup.java @@ -18,14 +18,6 @@ */ package io.mifos.group; -import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; -import io.mifos.core.api.context.AutoUserContext; -import io.mifos.core.test.env.TestEnvironment; -import io.mifos.core.test.fixture.TenantDataStoreContextTestRule; -import io.mifos.core.test.fixture.cassandra.CassandraInitializer; -import io.mifos.core.test.fixture.mariadb.MariaDBInitializer; -import io.mifos.core.test.listener.EnableEventRecording; -import io.mifos.core.test.listener.EventRecorder; import io.mifos.group.api.v1.EventConstants; import io.mifos.group.api.v1.client.GroupManager; import io.mifos.group.api.v1.domain.AssignedEmployeeHolder; @@ -38,8 +30,27 @@ import io.mifos.group.api.v1.domain.SignOffMeeting; import io.mifos.group.service.GroupConfiguration; import io.mifos.group.util.GroupDefinitionGenerator; import io.mifos.group.util.GroupGenerator; +import java.time.Clock; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; 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.env.TestEnvironment; +import org.apache.fineract.cn.test.fixture.TenantDataStoreContextTestRule; +import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; +import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; +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.rules.RuleChain; import org.junit.rules.TestRule; import org.junit.runner.RunWith; @@ -55,13 +66,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringRunner; -import java.time.Clock; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) public class TestGroup { diff --git a/component-test/src/main/java/io/mifos/group/TestGroupDefinition.java b/component-test/src/main/java/io/mifos/group/TestGroupDefinition.java index d59a11f..f78eb44 100644 --- a/component-test/src/main/java/io/mifos/group/TestGroupDefinition.java +++ b/component-test/src/main/java/io/mifos/group/TestGroupDefinition.java @@ -18,21 +18,26 @@ */ package io.mifos.group; -import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; -import io.mifos.core.api.context.AutoUserContext; -import io.mifos.core.lang.TenantContextHolder; -import io.mifos.core.test.env.TestEnvironment; -import io.mifos.core.test.fixture.TenantDataStoreContextTestRule; -import io.mifos.core.test.fixture.cassandra.CassandraInitializer; -import io.mifos.core.test.fixture.mariadb.MariaDBInitializer; -import io.mifos.core.test.listener.EnableEventRecording; -import io.mifos.core.test.listener.EventRecorder; import io.mifos.group.api.v1.EventConstants; import io.mifos.group.api.v1.client.GroupManager; import io.mifos.group.api.v1.domain.GroupDefinition; import io.mifos.group.service.GroupConfiguration; import io.mifos.group.util.GroupDefinitionGenerator; -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.lang.TenantContextHolder; +import org.apache.fineract.cn.test.env.TestEnvironment; +import org.apache.fineract.cn.test.fixture.TenantDataStoreContextTestRule; +import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; +import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; +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.rules.RuleChain; import org.junit.rules.TestRule; import org.junit.runner.RunWith; diff --git a/component-test/src/main/java/io/mifos/group/listener/GroupDefinitionEventListener.java b/component-test/src/main/java/io/mifos/group/listener/GroupDefinitionEventListener.java index be21011..3932eb8 100644 --- a/component-test/src/main/java/io/mifos/group/listener/GroupDefinitionEventListener.java +++ b/component-test/src/main/java/io/mifos/group/listener/GroupDefinitionEventListener.java @@ -18,9 +18,9 @@ */ package io.mifos.group.listener; -import io.mifos.core.lang.config.TenantHeaderFilter; -import io.mifos.core.test.listener.EventRecorder; import io.mifos.group.api.v1.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/group/listener/GroupEventListener.java b/component-test/src/main/java/io/mifos/group/listener/GroupEventListener.java index 825947c..9020138 100644 --- a/component-test/src/main/java/io/mifos/group/listener/GroupEventListener.java +++ b/component-test/src/main/java/io/mifos/group/listener/GroupEventListener.java @@ -18,9 +18,9 @@ */ package io.mifos.group.listener; -import io.mifos.core.lang.config.TenantHeaderFilter; -import io.mifos.core.test.listener.EventRecorder; import io.mifos.group.api.v1.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/group/listener/MigrationEventListener.java b/component-test/src/main/java/io/mifos/group/listener/MigrationEventListener.java index 7b90c38..c150fef 100644 --- a/component-test/src/main/java/io/mifos/group/listener/MigrationEventListener.java +++ b/component-test/src/main/java/io/mifos/group/listener/MigrationEventListener.java @@ -18,9 +18,9 @@ */ package io.mifos.group.listener; -import io.mifos.core.lang.config.TenantHeaderFilter; -import io.mifos.core.test.listener.EventRecorder; import io.mifos.group.api.v1.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/group/service/GroupConfiguration.java b/service/src/main/java/io/mifos/group/service/GroupConfiguration.java index bb0d3c8..244716b 100644 --- a/service/src/main/java/io/mifos/group/service/GroupConfiguration.java +++ b/service/src/main/java/io/mifos/group/service/GroupConfiguration.java @@ -18,13 +18,13 @@ */ package io.mifos.group.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/group/service/internal/command/handler/GroupAggregate.java b/service/src/main/java/io/mifos/group/service/internal/command/handler/GroupAggregate.java index 4c3bbae..5616337 100644 --- a/service/src/main/java/io/mifos/group/service/internal/command/handler/GroupAggregate.java +++ b/service/src/main/java/io/mifos/group/service/internal/command/handler/GroupAggregate.java @@ -18,12 +18,13 @@ */ package io.mifos.group.service.internal.command.handler; -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.group.api.v1.EventConstants; +import io.mifos.group.api.v1.domain.Attendee; +import io.mifos.group.api.v1.domain.Cycle; +import io.mifos.group.api.v1.domain.Group; +import io.mifos.group.api.v1.domain.GroupCommand; +import io.mifos.group.api.v1.domain.GroupDefinition; +import io.mifos.group.api.v1.domain.SignOffMeeting; import io.mifos.group.service.internal.command.ActivateGroupCommand; import io.mifos.group.service.internal.command.CloseGroupCommand; import io.mifos.group.service.internal.command.CreateGroupCommand; @@ -33,6 +34,8 @@ import io.mifos.group.service.internal.command.SignOffMeetingCommand; import io.mifos.group.service.internal.command.UpdateAssignedEmployeeCommand; import io.mifos.group.service.internal.command.UpdateLeadersCommand; import io.mifos.group.service.internal.command.UpdateMembersCommand; +import io.mifos.group.service.internal.mapper.AddressMapper; +import io.mifos.group.service.internal.mapper.GroupCommandMapper; import io.mifos.group.service.internal.repository.AddressEntity; import io.mifos.group.service.internal.repository.AddressRepository; import io.mifos.group.service.internal.repository.AttendeeEntity; @@ -45,14 +48,6 @@ import io.mifos.group.service.internal.repository.GroupEntity; import io.mifos.group.service.internal.repository.GroupRepository; import io.mifos.group.service.internal.repository.MeetingEntity; import io.mifos.group.service.internal.repository.MeetingRepository; -import io.mifos.group.api.v1.EventConstants; -import io.mifos.group.api.v1.domain.*; -import io.mifos.group.service.internal.mapper.AddressMapper; -import io.mifos.group.service.internal.mapper.GroupCommandMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - import java.time.Clock; import java.time.LocalDate; import java.time.LocalDateTime; @@ -60,6 +55,15 @@ import java.time.temporal.ChronoField; import java.util.List; import java.util.Set; import java.util.stream.Collectors; +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.lang.DateConverter; +import org.apache.fineract.cn.lang.ServiceException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; @SuppressWarnings("unused") @Aggregate diff --git a/service/src/main/java/io/mifos/group/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/io/mifos/group/service/internal/command/handler/MigrationAggregate.java index eed82d2..64b546f 100644 --- a/service/src/main/java/io/mifos/group/service/internal/command/handler/MigrationAggregate.java +++ b/service/src/main/java/io/mifos/group/service/internal/command/handler/MigrationAggregate.java @@ -18,20 +18,19 @@ */ package io.mifos.group.service.internal.command.handler; -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.mariadb.domain.FlywayFactoryBean; import io.mifos.group.api.v1.EventConstants; import io.mifos.group.service.ServiceConstants; import io.mifos.group.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.EventEmitter; +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") @Aggregate public class MigrationAggregate { diff --git a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupCommandMapper.java b/service/src/main/java/io/mifos/group/service/internal/mapper/GroupCommandMapper.java index bbfbf3a..ec927c3 100644 --- a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupCommandMapper.java +++ b/service/src/main/java/io/mifos/group/service/internal/mapper/GroupCommandMapper.java @@ -18,13 +18,12 @@ */ package io.mifos.group.service.internal.mapper; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; -import io.mifos.group.service.internal.repository.GroupCommandEntity; import io.mifos.group.api.v1.domain.GroupCommand; - +import io.mifos.group.service.internal.repository.GroupCommandEntity; 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 GroupCommandMapper { diff --git a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupDefinitionMapper.java b/service/src/main/java/io/mifos/group/service/internal/mapper/GroupDefinitionMapper.java index 6de8f05..56126bc 100644 --- a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupDefinitionMapper.java +++ b/service/src/main/java/io/mifos/group/service/internal/mapper/GroupDefinitionMapper.java @@ -18,10 +18,10 @@ */ package io.mifos.group.service.internal.mapper; -import io.mifos.core.lang.DateConverter; -import io.mifos.group.service.internal.repository.GroupDefinitionEntity; import io.mifos.group.api.v1.domain.Cycle; import io.mifos.group.api.v1.domain.GroupDefinition; +import io.mifos.group.service.internal.repository.GroupDefinitionEntity; +import org.apache.fineract.cn.lang.DateConverter; public class GroupDefinitionMapper { diff --git a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupMapper.java b/service/src/main/java/io/mifos/group/service/internal/mapper/GroupMapper.java index 764a377..3e6512c 100644 --- a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupMapper.java +++ b/service/src/main/java/io/mifos/group/service/internal/mapper/GroupMapper.java @@ -18,9 +18,9 @@ */ package io.mifos.group.service.internal.mapper; -import io.mifos.core.lang.DateConverter; -import io.mifos.group.service.internal.repository.GroupEntity; import io.mifos.group.api.v1.domain.Group; +import io.mifos.group.service.internal.repository.GroupEntity; +import org.apache.fineract.cn.lang.DateConverter; import org.springframework.util.StringUtils; public class GroupMapper { diff --git a/service/src/main/java/io/mifos/group/service/internal/mapper/MeetingMapper.java b/service/src/main/java/io/mifos/group/service/internal/mapper/MeetingMapper.java index 6851cc3..122e882 100644 --- a/service/src/main/java/io/mifos/group/service/internal/mapper/MeetingMapper.java +++ b/service/src/main/java/io/mifos/group/service/internal/mapper/MeetingMapper.java @@ -18,9 +18,9 @@ */ package io.mifos.group.service.internal.mapper; -import io.mifos.core.lang.DateConverter; import io.mifos.group.api.v1.domain.Meeting; import io.mifos.group.service.internal.repository.MeetingEntity; +import org.apache.fineract.cn.lang.DateConverter; public class MeetingMapper { diff --git a/service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandEntity.java b/service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandEntity.java index e7ae69a..df46f02 100644 --- a/service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandEntity.java +++ b/service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandEntity.java @@ -18,8 +18,7 @@ */ package io.mifos.group.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; @@ -30,7 +29,7 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import java.time.LocalDateTime; +import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter; @Entity @Table(name = "ptah_group_commands") diff --git a/service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionEntity.java b/service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionEntity.java index 876973b..2fb1299 100644 --- a/service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionEntity.java +++ b/service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionEntity.java @@ -18,8 +18,7 @@ */ package io.mifos.group.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 = "ptah_group_definitions") diff --git a/service/src/main/java/io/mifos/group/service/internal/repository/GroupEntity.java b/service/src/main/java/io/mifos/group/service/internal/repository/GroupEntity.java index 6f8fbea..b99529a 100644 --- a/service/src/main/java/io/mifos/group/service/internal/repository/GroupEntity.java +++ b/service/src/main/java/io/mifos/group/service/internal/repository/GroupEntity.java @@ -18,8 +18,7 @@ */ package io.mifos.group.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; @@ -31,7 +30,7 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.OneToOne; import javax.persistence.Table; -import java.time.LocalDateTime; +import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter; @Entity @Table(name = "ptah_groups") diff --git a/service/src/main/java/io/mifos/group/service/internal/repository/MeetingEntity.java b/service/src/main/java/io/mifos/group/service/internal/repository/MeetingEntity.java index a6e4b6b..72c50b7 100644 --- a/service/src/main/java/io/mifos/group/service/internal/repository/MeetingEntity.java +++ b/service/src/main/java/io/mifos/group/service/internal/repository/MeetingEntity.java @@ -18,9 +18,8 @@ */ package io.mifos.group.service.internal.repository; -import io.mifos.core.mariadb.util.LocalDateConverter; -import io.mifos.core.mariadb.util.LocalDateTimeConverter; - +import java.time.LocalDate; +import java.time.LocalDateTime; import javax.persistence.Column; import javax.persistence.Convert; import javax.persistence.Entity; @@ -31,8 +30,8 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import java.time.LocalDate; -import java.time.LocalDateTime; +import org.apache.fineract.cn.mariadb.util.LocalDateConverter; +import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter; @Entity @Table(name = "ptah_meetings") diff --git a/service/src/main/java/io/mifos/group/service/internal/repository/MeetingRepository.java b/service/src/main/java/io/mifos/group/service/internal/repository/MeetingRepository.java index 16a2349..4437e6e 100644 --- a/service/src/main/java/io/mifos/group/service/internal/repository/MeetingRepository.java +++ b/service/src/main/java/io/mifos/group/service/internal/repository/MeetingRepository.java @@ -18,14 +18,13 @@ */ package io.mifos.group.service.internal.repository; -import io.mifos.core.mariadb.util.LocalDateConverter; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import javax.persistence.Convert; import java.time.LocalDate; import java.util.List; import java.util.Optional; +import javax.persistence.Convert; +import org.apache.fineract.cn.mariadb.util.LocalDateConverter; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; @Repository public interface MeetingRepository extends JpaRepository<MeetingEntity, Long> { diff --git a/service/src/main/java/io/mifos/group/service/internal/service/GroupService.java b/service/src/main/java/io/mifos/group/service/internal/service/GroupService.java index 8cfc35e..8f3f680 100644 --- a/service/src/main/java/io/mifos/group/service/internal/service/GroupService.java +++ b/service/src/main/java/io/mifos/group/service/internal/service/GroupService.java @@ -18,9 +18,6 @@ */ package io.mifos.group.service.internal.service; -import io.mifos.core.lang.ServiceException; -import io.mifos.group.service.internal.repository.AttendeeRepository; -import io.mifos.group.service.internal.repository.GroupRepository; import io.mifos.group.api.v1.domain.Group; import io.mifos.group.api.v1.domain.GroupCommand; import io.mifos.group.api.v1.domain.GroupPage; @@ -31,10 +28,18 @@ import io.mifos.group.service.internal.mapper.AttendeeMapper; import io.mifos.group.service.internal.mapper.GroupCommandMapper; import io.mifos.group.service.internal.mapper.GroupMapper; import io.mifos.group.service.internal.mapper.MeetingMapper; +import io.mifos.group.service.internal.repository.AttendeeRepository; import io.mifos.group.service.internal.repository.GroupCommandRepository; import io.mifos.group.service.internal.repository.GroupEntity; +import io.mifos.group.service.internal.repository.GroupRepository; import io.mifos.group.service.internal.repository.MeetingEntity; import io.mifos.group.service.internal.repository.MeetingRepository; +import java.time.Clock; +import java.time.LocalDate; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; +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; @@ -42,12 +47,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.time.Clock; -import java.time.LocalDate; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - @Service public class GroupService { diff --git a/service/src/main/java/io/mifos/group/service/rest/GroupDefinitionRestController.java b/service/src/main/java/io/mifos/group/service/rest/GroupDefinitionRestController.java index 86588ba..8cee95f 100644 --- a/service/src/main/java/io/mifos/group/service/rest/GroupDefinitionRestController.java +++ b/service/src/main/java/io/mifos/group/service/rest/GroupDefinitionRestController.java @@ -18,14 +18,16 @@ */ package io.mifos.group.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.group.api.v1.domain.GroupDefinition; import io.mifos.group.service.ServiceConstants; import io.mifos.group.service.internal.command.CreateGroupDefinitionCommand; import io.mifos.group.service.internal.service.GroupDefinitionService; -import io.mifos.group.api.v1.domain.GroupDefinition; +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; @@ -38,9 +40,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; -import java.util.List; - @RestController @RequestMapping("/definitions") public class GroupDefinitionRestController { diff --git a/service/src/main/java/io/mifos/group/service/rest/GroupRestController.java b/service/src/main/java/io/mifos/group/service/rest/GroupRestController.java index 34a6780..9e25f64 100644 --- a/service/src/main/java/io/mifos/group/service/rest/GroupRestController.java +++ b/service/src/main/java/io/mifos/group/service/rest/GroupRestController.java @@ -18,15 +18,6 @@ */ package io.mifos.group.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.group.service.internal.command.SignOffMeetingCommand; -import io.mifos.group.service.internal.command.UpdateLeadersCommand; -import io.mifos.group.service.internal.command.UpdateMembersCommand; -import io.mifos.group.service.internal.service.GroupDefinitionService; -import io.mifos.group.service.internal.service.GroupService; import io.mifos.group.api.v1.domain.AssignedEmployeeHolder; import io.mifos.group.api.v1.domain.Group; import io.mifos.group.api.v1.domain.GroupCommand; @@ -38,7 +29,19 @@ import io.mifos.group.service.internal.command.ActivateGroupCommand; import io.mifos.group.service.internal.command.CloseGroupCommand; import io.mifos.group.service.internal.command.CreateGroupCommand; import io.mifos.group.service.internal.command.ReopenGroupCommand; +import io.mifos.group.service.internal.command.SignOffMeetingCommand; import io.mifos.group.service.internal.command.UpdateAssignedEmployeeCommand; +import io.mifos.group.service.internal.command.UpdateLeadersCommand; +import io.mifos.group.service.internal.command.UpdateMembersCommand; +import io.mifos.group.service.internal.service.GroupDefinitionService; +import io.mifos.group.service.internal.service.GroupService; +import java.util.List; +import java.util.Set; +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; @@ -55,10 +58,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; -import java.util.Set; - @RestController @RequestMapping("/groups") public class GroupRestController { diff --git a/service/src/main/java/io/mifos/group/service/rest/MigrationRestController.java b/service/src/main/java/io/mifos/group/service/rest/MigrationRestController.java index efc4886..a1342cc 100644 --- a/service/src/main/java/io/mifos/group/service/rest/MigrationRestController.java +++ b/service/src/main/java/io/mifos/group/service/rest/MigrationRestController.java @@ -18,11 +18,11 @@ */ package io.mifos.group.service.rest; -import io.mifos.anubis.annotation.AcceptedTokenType; -import io.mifos.anubis.annotation.Permittable; -import io.mifos.core.command.gateway.CommandGateway; import io.mifos.group.service.ServiceConstants; import io.mifos.group.service.internal.command.InitializeServiceCommand; +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;
