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 e8ae29842e0569fbd9b7fe897b95f7f268cf3592 Author: Myrle Krantz <[email protected]> AuthorDate: Mon Apr 16 20:55:38 2018 +0200 Improving directory structure. --- .../org/apache/fineract/cn/group/TestGroup.java | 1 - .../fineract/cn/group/TestGroupDefinition.java | 1 - .../cn/group/{service => }/GroupApplication.java | 2 +- .../cn/group/{service => }/GroupConfiguration.java | 12 +++--- .../cn/group/{service => }/ServiceConstants.java | 2 +- .../internal/command/ActivateGroupCommand.java | 2 +- .../internal/command/CloseGroupCommand.java | 2 +- .../internal/command/CreateGroupCommand.java | 2 +- .../command/CreateGroupDefinitionCommand.java | 2 +- .../internal/command/InitializeServiceCommand.java | 2 +- .../internal/command/ReopenGroupCommand.java | 2 +- .../internal/command/SignOffMeetingCommand.java | 2 +- .../command/UpdateAssignedEmployeeCommand.java | 2 +- .../internal/command/UpdateLeadersCommand.java | 2 +- .../internal/command/UpdateMembersCommand.java | 2 +- .../internal/command/handler/GroupAggregate.java | 48 +++++++++++----------- .../command/handler/MigrationAggregate.java | 6 +-- .../internal/mapper/AddressMapper.java | 4 +- .../internal/mapper/AttendeeMapper.java | 4 +- .../internal/mapper/GroupCommandMapper.java | 4 +- .../internal/mapper/GroupDefinitionMapper.java | 4 +- .../{service => }/internal/mapper/GroupMapper.java | 4 +- .../internal/mapper/MeetingMapper.java | 4 +- .../internal/repository/AddressEntity.java | 2 +- .../internal/repository/AddressRepository.java | 2 +- .../internal/repository/AttendeeEntity.java | 2 +- .../internal/repository/AttendeeRepository.java | 2 +- .../internal/repository/GroupCommandEntity.java | 2 +- .../repository/GroupCommandRepository.java | 2 +- .../internal/repository/GroupDefinitionEntity.java | 2 +- .../repository/GroupDefinitionRepository.java | 2 +- .../internal/repository/GroupEntity.java | 2 +- .../internal/repository/GroupRepository.java | 2 +- .../internal/repository/MeetingEntity.java | 2 +- .../internal/repository/MeetingRepository.java | 2 +- .../internal/service/GroupDefinitionService.java | 8 ++-- .../internal/service/GroupService.java | 26 ++++++------ .../rest/GroupDefinitionRestController.java | 8 ++-- .../{service => }/rest/GroupRestController.java | 24 +++++------ .../rest/MigrationRestController.java | 6 +-- 40 files changed, 105 insertions(+), 107 deletions(-) diff --git a/component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java b/component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java index 19df79c..1307d66 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java +++ b/component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java @@ -27,7 +27,6 @@ import org.apache.fineract.cn.group.api.v1.domain.GroupCommand; import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition; import org.apache.fineract.cn.group.api.v1.domain.Meeting; import org.apache.fineract.cn.group.api.v1.domain.SignOffMeeting; -import org.apache.fineract.cn.group.service.GroupConfiguration; import org.apache.fineract.cn.group.util.GroupDefinitionGenerator; import org.apache.fineract.cn.group.util.GroupGenerator; import java.time.Clock; diff --git a/component-test/src/main/java/org/apache/fineract/cn/group/TestGroupDefinition.java b/component-test/src/main/java/org/apache/fineract/cn/group/TestGroupDefinition.java index 4af1087..608cf64 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/group/TestGroupDefinition.java +++ b/component-test/src/main/java/org/apache/fineract/cn/group/TestGroupDefinition.java @@ -21,7 +21,6 @@ package org.apache.fineract.cn.group; import org.apache.fineract.cn.group.api.v1.EventConstants; import org.apache.fineract.cn.group.api.v1.client.GroupManager; import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition; -import org.apache.fineract.cn.group.service.GroupConfiguration; import org.apache.fineract.cn.group.util.GroupDefinitionGenerator; import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; import org.apache.fineract.cn.api.context.AutoUserContext; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/GroupApplication.java b/service/src/main/java/org/apache/fineract/cn/group/GroupApplication.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/GroupApplication.java rename to service/src/main/java/org/apache/fineract/cn/group/GroupApplication.java index fc17f94..117e078 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/GroupApplication.java +++ b/service/src/main/java/org/apache/fineract/cn/group/GroupApplication.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service; +package org.apache.fineract.cn.group; import org.springframework.boot.SpringApplication; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/GroupConfiguration.java b/service/src/main/java/org/apache/fineract/cn/group/GroupConfiguration.java similarity index 87% rename from service/src/main/java/org/apache/fineract/cn/group/service/GroupConfiguration.java rename to service/src/main/java/org/apache/fineract/cn/group/GroupConfiguration.java index ee583e0..f2f0642 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/GroupConfiguration.java +++ b/service/src/main/java/org/apache/fineract/cn/group/GroupConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service; +package org.apache.fineract.cn.group; import org.apache.fineract.cn.anubis.config.EnableAnubis; import org.apache.fineract.cn.async.config.EnableAsync; @@ -48,13 +48,13 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter @EnableAnubis @EnableServiceException @ComponentScan({ - "org.apache.fineract.cn.group.service.rest", - "org.apache.fineract.cn.group.service.internal.service", - "org.apache.fineract.cn.group.service.internal.repository", - "org.apache.fineract.cn.group.service.internal.command.handler" + "org.apache.fineract.cn.group.rest", + "org.apache.fineract.cn.group.internal.service", + "org.apache.fineract.cn.group.internal.repository", + "org.apache.fineract.cn.group.internal.command.handler" }) @EnableJpaRepositories({ - "org.apache.fineract.cn.group.service.internal.repository" + "org.apache.fineract.cn.group.internal.repository" }) public class GroupConfiguration extends WebMvcConfigurerAdapter { diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/ServiceConstants.java b/service/src/main/java/org/apache/fineract/cn/group/ServiceConstants.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/ServiceConstants.java rename to service/src/main/java/org/apache/fineract/cn/group/ServiceConstants.java index de8f2ff..1da6c58 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/ServiceConstants.java +++ b/service/src/main/java/org/apache/fineract/cn/group/ServiceConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service; +package org.apache.fineract.cn.group; public interface ServiceConstants { String LOGGER_NAME = "group-logger"; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/ActivateGroupCommand.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/ActivateGroupCommand.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/ActivateGroupCommand.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/ActivateGroupCommand.java index 1892d62..8d654b7 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/ActivateGroupCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/ActivateGroupCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command; +package org.apache.fineract.cn.group.internal.command; import org.apache.fineract.cn.group.api.v1.domain.GroupCommand; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/CloseGroupCommand.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CloseGroupCommand.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/CloseGroupCommand.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/CloseGroupCommand.java index 43a6937..54cdab4 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/CloseGroupCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CloseGroupCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command; +package org.apache.fineract.cn.group.internal.command; import org.apache.fineract.cn.group.api.v1.domain.GroupCommand; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/CreateGroupCommand.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupCommand.java similarity index 94% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/CreateGroupCommand.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupCommand.java index a367a12..f995bca 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/CreateGroupCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command; +package org.apache.fineract.cn.group.internal.command; import org.apache.fineract.cn.group.api.v1.domain.Group; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/CreateGroupDefinitionCommand.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupDefinitionCommand.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/CreateGroupDefinitionCommand.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupDefinitionCommand.java index c034284..98a13b1 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/CreateGroupDefinitionCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupDefinitionCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command; +package org.apache.fineract.cn.group.internal.command; import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/InitializeServiceCommand.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/InitializeServiceCommand.java similarity index 93% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/InitializeServiceCommand.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/InitializeServiceCommand.java index 8d65200..b67a546 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/InitializeServiceCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/InitializeServiceCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command; +package org.apache.fineract.cn.group.internal.command; public class InitializeServiceCommand { diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/ReopenGroupCommand.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/ReopenGroupCommand.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/ReopenGroupCommand.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/ReopenGroupCommand.java index f21e26a..a96f239 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/ReopenGroupCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/ReopenGroupCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command; +package org.apache.fineract.cn.group.internal.command; import org.apache.fineract.cn.group.api.v1.domain.GroupCommand; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/SignOffMeetingCommand.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/SignOffMeetingCommand.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/SignOffMeetingCommand.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/SignOffMeetingCommand.java index f67962d..da1ae48 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/SignOffMeetingCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/SignOffMeetingCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command; +package org.apache.fineract.cn.group.internal.command; import org.apache.fineract.cn.group.api.v1.domain.SignOffMeeting; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/UpdateAssignedEmployeeCommand.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateAssignedEmployeeCommand.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/UpdateAssignedEmployeeCommand.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateAssignedEmployeeCommand.java index f44d86b..7168e27 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/UpdateAssignedEmployeeCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateAssignedEmployeeCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command; +package org.apache.fineract.cn.group.internal.command; public class UpdateAssignedEmployeeCommand { diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/UpdateLeadersCommand.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateLeadersCommand.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/UpdateLeadersCommand.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateLeadersCommand.java index 5a5fc72..3e0fcc7 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/UpdateLeadersCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateLeadersCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command; +package org.apache.fineract.cn.group.internal.command; import java.util.Set; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/UpdateMembersCommand.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateMembersCommand.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/UpdateMembersCommand.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateMembersCommand.java index dd4d86e..ffd5305 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/UpdateMembersCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateMembersCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command; +package org.apache.fineract.cn.group.internal.command; import java.util.Set; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/handler/GroupAggregate.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/GroupAggregate.java similarity index 88% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/handler/GroupAggregate.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/GroupAggregate.java index 3d99783..2ddf42f 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/handler/GroupAggregate.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/GroupAggregate.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command.handler; +package org.apache.fineract.cn.group.internal.command.handler; import org.apache.fineract.cn.group.api.v1.EventConstants; import org.apache.fineract.cn.group.api.v1.domain.Attendee; @@ -25,29 +25,29 @@ import org.apache.fineract.cn.group.api.v1.domain.Group; import org.apache.fineract.cn.group.api.v1.domain.GroupCommand; import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition; import org.apache.fineract.cn.group.api.v1.domain.SignOffMeeting; -import org.apache.fineract.cn.group.service.internal.command.ActivateGroupCommand; -import org.apache.fineract.cn.group.service.internal.command.CloseGroupCommand; -import org.apache.fineract.cn.group.service.internal.command.CreateGroupCommand; -import org.apache.fineract.cn.group.service.internal.command.CreateGroupDefinitionCommand; -import org.apache.fineract.cn.group.service.internal.command.ReopenGroupCommand; -import org.apache.fineract.cn.group.service.internal.command.SignOffMeetingCommand; -import org.apache.fineract.cn.group.service.internal.command.UpdateAssignedEmployeeCommand; -import org.apache.fineract.cn.group.service.internal.command.UpdateLeadersCommand; -import org.apache.fineract.cn.group.service.internal.command.UpdateMembersCommand; -import org.apache.fineract.cn.group.service.internal.mapper.AddressMapper; -import org.apache.fineract.cn.group.service.internal.mapper.GroupCommandMapper; -import org.apache.fineract.cn.group.service.internal.repository.AddressEntity; -import org.apache.fineract.cn.group.service.internal.repository.AddressRepository; -import org.apache.fineract.cn.group.service.internal.repository.AttendeeEntity; -import org.apache.fineract.cn.group.service.internal.repository.AttendeeRepository; -import org.apache.fineract.cn.group.service.internal.repository.GroupCommandEntity; -import org.apache.fineract.cn.group.service.internal.repository.GroupCommandRepository; -import org.apache.fineract.cn.group.service.internal.repository.GroupDefinitionEntity; -import org.apache.fineract.cn.group.service.internal.repository.GroupDefinitionRepository; -import org.apache.fineract.cn.group.service.internal.repository.GroupEntity; -import org.apache.fineract.cn.group.service.internal.repository.GroupRepository; -import org.apache.fineract.cn.group.service.internal.repository.MeetingEntity; -import org.apache.fineract.cn.group.service.internal.repository.MeetingRepository; +import org.apache.fineract.cn.group.internal.command.ActivateGroupCommand; +import org.apache.fineract.cn.group.internal.command.CloseGroupCommand; +import org.apache.fineract.cn.group.internal.command.CreateGroupCommand; +import org.apache.fineract.cn.group.internal.command.CreateGroupDefinitionCommand; +import org.apache.fineract.cn.group.internal.command.ReopenGroupCommand; +import org.apache.fineract.cn.group.internal.command.SignOffMeetingCommand; +import org.apache.fineract.cn.group.internal.command.UpdateAssignedEmployeeCommand; +import org.apache.fineract.cn.group.internal.command.UpdateLeadersCommand; +import org.apache.fineract.cn.group.internal.command.UpdateMembersCommand; +import org.apache.fineract.cn.group.internal.mapper.AddressMapper; +import org.apache.fineract.cn.group.internal.mapper.GroupCommandMapper; +import org.apache.fineract.cn.group.internal.repository.AddressEntity; +import org.apache.fineract.cn.group.internal.repository.AddressRepository; +import org.apache.fineract.cn.group.internal.repository.AttendeeEntity; +import org.apache.fineract.cn.group.internal.repository.AttendeeRepository; +import org.apache.fineract.cn.group.internal.repository.GroupCommandEntity; +import org.apache.fineract.cn.group.internal.repository.GroupCommandRepository; +import org.apache.fineract.cn.group.internal.repository.GroupDefinitionEntity; +import org.apache.fineract.cn.group.internal.repository.GroupDefinitionRepository; +import org.apache.fineract.cn.group.internal.repository.GroupEntity; +import org.apache.fineract.cn.group.internal.repository.GroupRepository; +import org.apache.fineract.cn.group.internal.repository.MeetingEntity; +import org.apache.fineract.cn.group.internal.repository.MeetingRepository; import java.time.Clock; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/MigrationAggregate.java similarity index 91% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/command/handler/MigrationAggregate.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/MigrationAggregate.java index 66fbd9e..3ea23ff 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/command/handler/MigrationAggregate.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/MigrationAggregate.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.command.handler; +package org.apache.fineract.cn.group.internal.command.handler; import org.apache.fineract.cn.group.api.v1.EventConstants; -import org.apache.fineract.cn.group.service.ServiceConstants; -import org.apache.fineract.cn.group.service.internal.command.InitializeServiceCommand; +import org.apache.fineract.cn.group.ServiceConstants; +import org.apache.fineract.cn.group.internal.command.InitializeServiceCommand; import javax.sql.DataSource; import org.apache.fineract.cn.command.annotation.Aggregate; import org.apache.fineract.cn.command.annotation.CommandHandler; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/AddressMapper.java b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AddressMapper.java similarity index 92% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/AddressMapper.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AddressMapper.java index aad505e..995189f 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/AddressMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AddressMapper.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.mapper; +package org.apache.fineract.cn.group.internal.mapper; -import org.apache.fineract.cn.group.service.internal.repository.AddressEntity; +import org.apache.fineract.cn.group.internal.repository.AddressEntity; import org.apache.fineract.cn.group.api.v1.domain.Address; public class AddressMapper { diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/AttendeeMapper.java b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AttendeeMapper.java similarity index 89% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/AttendeeMapper.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AttendeeMapper.java index 94be880..cee9d56 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/AttendeeMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AttendeeMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.mapper; +package org.apache.fineract.cn.group.internal.mapper; import org.apache.fineract.cn.group.api.v1.domain.Attendee; -import org.apache.fineract.cn.group.service.internal.repository.AttendeeEntity; +import org.apache.fineract.cn.group.internal.repository.AttendeeEntity; public class AttendeeMapper { diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupCommandMapper.java b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupCommandMapper.java similarity index 93% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupCommandMapper.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupCommandMapper.java index 90b0027..301a0a0 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupCommandMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupCommandMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.mapper; +package org.apache.fineract.cn.group.internal.mapper; import org.apache.fineract.cn.group.api.v1.domain.GroupCommand; -import org.apache.fineract.cn.group.service.internal.repository.GroupCommandEntity; +import org.apache.fineract.cn.group.internal.repository.GroupCommandEntity; import java.time.Clock; import java.time.LocalDateTime; import org.apache.fineract.cn.api.util.UserContextHolder; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupDefinitionMapper.java b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupDefinitionMapper.java similarity index 93% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupDefinitionMapper.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupDefinitionMapper.java index 2b33d43..38b4a7e 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupDefinitionMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupDefinitionMapper.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.mapper; +package org.apache.fineract.cn.group.internal.mapper; import org.apache.fineract.cn.group.api.v1.domain.Cycle; import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition; -import org.apache.fineract.cn.group.service.internal.repository.GroupDefinitionEntity; +import org.apache.fineract.cn.group.internal.repository.GroupDefinitionEntity; import org.apache.fineract.cn.lang.DateConverter; public class GroupDefinitionMapper { diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupMapper.java b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupMapper.java similarity index 93% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupMapper.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupMapper.java index 45c40ef..6195222 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.mapper; +package org.apache.fineract.cn.group.internal.mapper; import org.apache.fineract.cn.group.api.v1.domain.Group; -import org.apache.fineract.cn.group.service.internal.repository.GroupEntity; +import org.apache.fineract.cn.group.internal.repository.GroupEntity; import org.apache.fineract.cn.lang.DateConverter; import org.springframework.util.StringUtils; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/MeetingMapper.java b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/MeetingMapper.java similarity index 92% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/MeetingMapper.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/mapper/MeetingMapper.java index 2d91e1d..1073155 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/MeetingMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/MeetingMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.mapper; +package org.apache.fineract.cn.group.internal.mapper; import org.apache.fineract.cn.group.api.v1.domain.Meeting; -import org.apache.fineract.cn.group.service.internal.repository.MeetingEntity; +import org.apache.fineract.cn.group.internal.repository.MeetingEntity; import org.apache.fineract.cn.lang.DateConverter; public class MeetingMapper { diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AddressEntity.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressEntity.java similarity index 97% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AddressEntity.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressEntity.java index bbdde39..7474499 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AddressEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AddressRepository.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressRepository.java similarity index 93% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AddressRepository.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressRepository.java index 03146b4..535ffae 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AddressRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AttendeeEntity.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeEntity.java similarity index 97% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AttendeeEntity.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeEntity.java index fa2d5d5..6252f47 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AttendeeEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AttendeeRepository.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeRepository.java similarity index 94% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AttendeeRepository.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeRepository.java index d50fefd..8b16819 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/AttendeeRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupCommandEntity.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandEntity.java similarity index 97% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupCommandEntity.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandEntity.java index 7f60768..67c8286 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupCommandEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import java.time.LocalDateTime; import javax.persistence.Column; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupCommandRepository.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandRepository.java similarity index 94% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupCommandRepository.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandRepository.java index eef9d7f..f729204 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupCommandRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupDefinitionEntity.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionEntity.java similarity index 98% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupDefinitionEntity.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionEntity.java index 3f755b2..5b4c856 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupDefinitionEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import java.time.LocalDateTime; import javax.persistence.Column; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupDefinitionRepository.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionRepository.java similarity index 94% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupDefinitionRepository.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionRepository.java index 74724ee..5bb130b 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupDefinitionRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupEntity.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupEntity.java similarity index 98% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupEntity.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupEntity.java index 7fc37df..10e8a57 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import java.time.LocalDateTime; import javax.persistence.Column; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupRepository.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupRepository.java similarity index 95% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupRepository.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupRepository.java index 0186fbf..d1cf609 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/MeetingEntity.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingEntity.java similarity index 98% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/MeetingEntity.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingEntity.java index 86c339f..dc9fef9 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/MeetingEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/MeetingRepository.java b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingRepository.java similarity index 96% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/MeetingRepository.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingRepository.java index e8125fe..c094de0 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/MeetingRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.repository; +package org.apache.fineract.cn.group.internal.repository; import java.time.LocalDate; import java.util.List; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/internal/service/GroupDefinitionService.java b/service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupDefinitionService.java similarity index 87% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/service/GroupDefinitionService.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupDefinitionService.java index 75e6bac..6d34e81 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/service/GroupDefinitionService.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupDefinitionService.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.service; +package org.apache.fineract.cn.group.internal.service; import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition; -import org.apache.fineract.cn.group.service.ServiceConstants; -import org.apache.fineract.cn.group.service.internal.mapper.GroupDefinitionMapper; -import org.apache.fineract.cn.group.service.internal.repository.GroupDefinitionRepository; +import org.apache.fineract.cn.group.ServiceConstants; +import org.apache.fineract.cn.group.internal.mapper.GroupDefinitionMapper; +import org.apache.fineract.cn.group.internal.repository.GroupDefinitionRepository; 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/org/apache/fineract/cn/group/service/internal/service/GroupService.java b/service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupService.java similarity index 83% rename from service/src/main/java/org/apache/fineract/cn/group/service/internal/service/GroupService.java rename to service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupService.java index d842714..2b7909c 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/internal/service/GroupService.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupService.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.internal.service; +package org.apache.fineract.cn.group.internal.service; import org.apache.fineract.cn.group.api.v1.domain.Group; import org.apache.fineract.cn.group.api.v1.domain.GroupCommand; import org.apache.fineract.cn.group.api.v1.domain.GroupPage; import org.apache.fineract.cn.group.api.v1.domain.Meeting; -import org.apache.fineract.cn.group.service.ServiceConstants; -import org.apache.fineract.cn.group.service.internal.mapper.AddressMapper; -import org.apache.fineract.cn.group.service.internal.mapper.AttendeeMapper; -import org.apache.fineract.cn.group.service.internal.mapper.GroupCommandMapper; -import org.apache.fineract.cn.group.service.internal.mapper.GroupMapper; -import org.apache.fineract.cn.group.service.internal.mapper.MeetingMapper; -import org.apache.fineract.cn.group.service.internal.repository.AttendeeRepository; -import org.apache.fineract.cn.group.service.internal.repository.GroupCommandRepository; -import org.apache.fineract.cn.group.service.internal.repository.GroupEntity; -import org.apache.fineract.cn.group.service.internal.repository.GroupRepository; -import org.apache.fineract.cn.group.service.internal.repository.MeetingEntity; -import org.apache.fineract.cn.group.service.internal.repository.MeetingRepository; +import org.apache.fineract.cn.group.ServiceConstants; +import org.apache.fineract.cn.group.internal.mapper.AddressMapper; +import org.apache.fineract.cn.group.internal.mapper.AttendeeMapper; +import org.apache.fineract.cn.group.internal.mapper.GroupCommandMapper; +import org.apache.fineract.cn.group.internal.mapper.GroupMapper; +import org.apache.fineract.cn.group.internal.mapper.MeetingMapper; +import org.apache.fineract.cn.group.internal.repository.AttendeeRepository; +import org.apache.fineract.cn.group.internal.repository.GroupCommandRepository; +import org.apache.fineract.cn.group.internal.repository.GroupEntity; +import org.apache.fineract.cn.group.internal.repository.GroupRepository; +import org.apache.fineract.cn.group.internal.repository.MeetingEntity; +import org.apache.fineract.cn.group.internal.repository.MeetingRepository; import java.time.Clock; import java.time.LocalDate; import java.util.List; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupDefinitionRestController.java b/service/src/main/java/org/apache/fineract/cn/group/rest/GroupDefinitionRestController.java similarity index 93% rename from service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupDefinitionRestController.java rename to service/src/main/java/org/apache/fineract/cn/group/rest/GroupDefinitionRestController.java index 075427f..a526450 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupDefinitionRestController.java +++ b/service/src/main/java/org/apache/fineract/cn/group/rest/GroupDefinitionRestController.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.rest; +package org.apache.fineract.cn.group.rest; import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition; -import org.apache.fineract.cn.group.service.ServiceConstants; -import org.apache.fineract.cn.group.service.internal.command.CreateGroupDefinitionCommand; -import org.apache.fineract.cn.group.service.internal.service.GroupDefinitionService; +import org.apache.fineract.cn.group.ServiceConstants; +import org.apache.fineract.cn.group.internal.command.CreateGroupDefinitionCommand; +import org.apache.fineract.cn.group.internal.service.GroupDefinitionService; import java.util.List; import javax.validation.Valid; import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupRestController.java b/service/src/main/java/org/apache/fineract/cn/group/rest/GroupRestController.java similarity index 91% rename from service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupRestController.java rename to service/src/main/java/org/apache/fineract/cn/group/rest/GroupRestController.java index 51e66cd..c9edae9 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupRestController.java +++ b/service/src/main/java/org/apache/fineract/cn/group/rest/GroupRestController.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.rest; +package org.apache.fineract.cn.group.rest; import org.apache.fineract.cn.group.api.v1.domain.AssignedEmployeeHolder; import org.apache.fineract.cn.group.api.v1.domain.Group; @@ -24,17 +24,17 @@ import org.apache.fineract.cn.group.api.v1.domain.GroupCommand; import org.apache.fineract.cn.group.api.v1.domain.GroupPage; import org.apache.fineract.cn.group.api.v1.domain.Meeting; import org.apache.fineract.cn.group.api.v1.domain.SignOffMeeting; -import org.apache.fineract.cn.group.service.ServiceConstants; -import org.apache.fineract.cn.group.service.internal.command.ActivateGroupCommand; -import org.apache.fineract.cn.group.service.internal.command.CloseGroupCommand; -import org.apache.fineract.cn.group.service.internal.command.CreateGroupCommand; -import org.apache.fineract.cn.group.service.internal.command.ReopenGroupCommand; -import org.apache.fineract.cn.group.service.internal.command.SignOffMeetingCommand; -import org.apache.fineract.cn.group.service.internal.command.UpdateAssignedEmployeeCommand; -import org.apache.fineract.cn.group.service.internal.command.UpdateLeadersCommand; -import org.apache.fineract.cn.group.service.internal.command.UpdateMembersCommand; -import org.apache.fineract.cn.group.service.internal.service.GroupDefinitionService; -import org.apache.fineract.cn.group.service.internal.service.GroupService; +import org.apache.fineract.cn.group.ServiceConstants; +import org.apache.fineract.cn.group.internal.command.ActivateGroupCommand; +import org.apache.fineract.cn.group.internal.command.CloseGroupCommand; +import org.apache.fineract.cn.group.internal.command.CreateGroupCommand; +import org.apache.fineract.cn.group.internal.command.ReopenGroupCommand; +import org.apache.fineract.cn.group.internal.command.SignOffMeetingCommand; +import org.apache.fineract.cn.group.internal.command.UpdateAssignedEmployeeCommand; +import org.apache.fineract.cn.group.internal.command.UpdateLeadersCommand; +import org.apache.fineract.cn.group.internal.command.UpdateMembersCommand; +import org.apache.fineract.cn.group.internal.service.GroupDefinitionService; +import org.apache.fineract.cn.group.internal.service.GroupService; import java.util.List; import java.util.Set; import javax.validation.Valid; diff --git a/service/src/main/java/org/apache/fineract/cn/group/service/rest/MigrationRestController.java b/service/src/main/java/org/apache/fineract/cn/group/rest/MigrationRestController.java similarity index 92% rename from service/src/main/java/org/apache/fineract/cn/group/service/rest/MigrationRestController.java rename to service/src/main/java/org/apache/fineract/cn/group/rest/MigrationRestController.java index ebd850e..9bc8f92 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/service/rest/MigrationRestController.java +++ b/service/src/main/java/org/apache/fineract/cn/group/rest/MigrationRestController.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.group.service.rest; +package org.apache.fineract.cn.group.rest; -import org.apache.fineract.cn.group.service.ServiceConstants; -import org.apache.fineract.cn.group.service.internal.command.InitializeServiceCommand; +import org.apache.fineract.cn.group.ServiceConstants; +import org.apache.fineract.cn.group.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;
