From 1465d7277ac48b374ee0f77a3cf5db50ec72ea43 Mon Sep 17 00:00:00 2001 From: Myrle Krantz Date: Fri, 13 Apr 2018 17:44:54 +0200 Subject: [PATCH] Change package names from mifos to apache fineract. --- .../cn}/office/api/v1/EventConstants.java | 2 +- .../office/api/v1/PermittableGroupIds.java | 2 +- .../api/v1/client/AlreadyExistsException.java | 2 +- .../api/v1/client/BadRequestException.java | 2 +- .../api/v1/client/ChildrenExistException.java | 2 +- .../api/v1/client/NotFoundException.java | 2 +- .../api/v1/client/OrganizationManager.java | 18 +++---- .../cn}/office/api/v1/domain/Address.java | 2 +- .../office/api/v1/domain/ContactDetail.java | 2 +- .../cn}/office/api/v1/domain/Employee.java | 2 +- .../office/api/v1/domain/EmployeePage.java | 2 +- .../api/v1/domain/ExternalReference.java | 2 +- .../cn}/office/api/v1/domain/Office.java | 2 +- .../cn}/office/api/v1/domain/OfficePage.java | 2 +- .../fineract/cn}/office/TestEmployee.java | 32 ++++++------ .../fineract/cn}/office/TestOffice.java | 38 +++++++------- .../listener/EmployeeEventListener.java | 4 +- .../listener/MigrationEventListener.java | 4 +- .../office/listener/OfficeEventListener.java | 4 +- .../cn}/office/util/AddressFactory.java | 4 +- .../cn}/office/util/EmployeeFactory.java | 4 +- .../cn}/office/util/OfficeFactory.java | 4 +- .../cn}/office/OfficeApplication.java | 4 +- .../fineract/cn}/office/ServiceConstants.java | 2 +- .../internal/command/AddBranchCommand.java | 4 +- .../command/AddExternalReferenceCommand.java | 4 +- .../command/CreateEmployeeCommand.java | 4 +- .../internal/command/CreateOfficeCommand.java | 4 +- .../command/DeleteAddressOfOfficeCommand.java | 2 +- .../command/DeleteContactDetailCommand.java | 2 +- .../command/DeleteEmployeeCommand.java | 2 +- .../internal/command/DeleteOfficeCommand.java | 2 +- .../command/InitializeServiceCommand.java | 2 +- .../command/SetAddressForOfficeCommand.java | 4 +- .../command/SetContactDetailsCommand.java | 4 +- .../command/UpdateEmployeeCommand.java | 4 +- .../internal/command/UpdateOfficeCommand.java | 4 +- .../command/handler/EmployeeAggregate.java | 36 ++++++------- .../command/handler/MigrationAggregate.java | 8 +-- .../command/handler/OfficeAggregate.java | 42 ++++++++-------- .../internal/command/handler/Utils.java | 2 +- .../config/OfficeServiceConfiguration.java | 12 ++--- .../office/internal/mapper/AddressMapper.java | 6 +-- .../internal/mapper/ContactDetailMapper.java | 6 +-- .../internal/mapper/EmployeeMapper.java | 6 +-- .../office/internal/mapper/OfficeMapper.java | 6 +-- .../internal/repository/AddressEntity.java | 2 +- .../repository/AddressRepository.java | 2 +- .../repository/ContactDetailEntity.java | 2 +- .../repository/ContactDetailRepository.java | 2 +- .../internal/repository/EmployeeEntity.java | 2 +- .../repository/EmployeeRepository.java | 2 +- .../repository/ExternalReferenceEntity.java | 2 +- .../ExternalReferenceRepository.java | 2 +- .../internal/repository/OfficeEntity.java | 2 +- .../internal/repository/OfficeRepository.java | 2 +- .../internal/service/EmployeeService.java | 28 +++++------ .../internal/service/OfficeService.java | 30 +++++------ .../rest/config/OfficeRestConfiguration.java | 8 +-- .../rest/controller/OfficeRestController.java | 50 +++++++++---------- 60 files changed, 223 insertions(+), 223 deletions(-) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/EventConstants.java (98%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/PermittableGroupIds.java (95%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/client/AlreadyExistsException.java (94%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/client/BadRequestException.java (94%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/client/ChildrenExistException.java (94%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/client/NotFoundException.java (94%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/client/OrganizationManager.java (95%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/domain/Address.java (97%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/domain/ContactDetail.java (98%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/domain/Employee.java (97%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/domain/EmployeePage.java (96%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/domain/ExternalReference.java (96%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/domain/Office.java (97%) rename api/src/main/java/{io/mifos => org/apache/fineract/cn}/office/api/v1/domain/OfficePage.java (96%) rename component-test/src/main/java/{io/mifos => org/apache/fineract/cn}/office/TestEmployee.java (94%) rename component-test/src/main/java/{io/mifos => org/apache/fineract/cn}/office/TestOffice.java (94%) rename component-test/src/main/java/{io/mifos => org/apache/fineract/cn}/office/listener/EmployeeEventListener.java (97%) rename component-test/src/main/java/{io/mifos => org/apache/fineract/cn}/office/listener/MigrationEventListener.java (94%) rename component-test/src/main/java/{io/mifos => org/apache/fineract/cn}/office/listener/OfficeEventListener.java (97%) rename component-test/src/main/java/{io/mifos => org/apache/fineract/cn}/office/util/AddressFactory.java (93%) rename component-test/src/main/java/{io/mifos => org/apache/fineract/cn}/office/util/EmployeeFactory.java (92%) rename component-test/src/main/java/{io/mifos => org/apache/fineract/cn}/office/util/OfficeFactory.java (92%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/OfficeApplication.java (90%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/ServiceConstants.java (96%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/AddBranchCommand.java (91%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/AddExternalReferenceCommand.java (91%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/CreateEmployeeCommand.java (89%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/CreateOfficeCommand.java (89%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/DeleteAddressOfOfficeCommand.java (95%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/DeleteContactDetailCommand.java (94%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/DeleteEmployeeCommand.java (94%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/DeleteOfficeCommand.java (94%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/InitializeServiceCommand.java (94%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/SetAddressForOfficeCommand.java (91%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/SetContactDetailsCommand.java (91%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/UpdateEmployeeCommand.java (89%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/UpdateOfficeCommand.java (89%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/handler/EmployeeAggregate.java (87%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/handler/MigrationAggregate.java (89%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/handler/OfficeAggregate.java (87%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/command/handler/Utils.java (94%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/config/OfficeServiceConfiguration.java (83%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/mapper/AddressMapper.java (90%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/mapper/ContactDetailMapper.java (89%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/mapper/EmployeeMapper.java (90%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/mapper/OfficeMapper.java (88%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/repository/AddressEntity.java (97%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/repository/AddressRepository.java (94%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/repository/ContactDetailEntity.java (97%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/repository/ContactDetailRepository.java (95%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/repository/EmployeeEntity.java (98%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/repository/EmployeeRepository.java (96%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/repository/ExternalReferenceEntity.java (97%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/repository/ExternalReferenceRepository.java (95%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/repository/OfficeEntity.java (98%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/repository/OfficeRepository.java (97%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/service/EmployeeService.java (83%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/internal/service/OfficeService.java (88%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/rest/config/OfficeRestConfiguration.java (91%) rename service/src/main/java/{io/mifos => org/apache/fineract/cn}/office/rest/controller/OfficeRestController.java (92%) diff --git a/api/src/main/java/io/mifos/office/api/v1/EventConstants.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/EventConstants.java similarity index 98% rename from api/src/main/java/io/mifos/office/api/v1/EventConstants.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/EventConstants.java index d40226e..a1b40ec 100644 --- a/api/src/main/java/io/mifos/office/api/v1/EventConstants.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/EventConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1; +package org.apache.fineract.cn.office.api.v1; @SuppressWarnings("unused") public interface EventConstants { diff --git a/api/src/main/java/io/mifos/office/api/v1/PermittableGroupIds.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/PermittableGroupIds.java similarity index 95% rename from api/src/main/java/io/mifos/office/api/v1/PermittableGroupIds.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/PermittableGroupIds.java index 371657d..3f91173 100644 --- a/api/src/main/java/io/mifos/office/api/v1/PermittableGroupIds.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/PermittableGroupIds.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1; +package org.apache.fineract.cn.office.api.v1; /** * @author Myrle Krantz diff --git a/api/src/main/java/io/mifos/office/api/v1/client/AlreadyExistsException.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/AlreadyExistsException.java similarity index 94% rename from api/src/main/java/io/mifos/office/api/v1/client/AlreadyExistsException.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/client/AlreadyExistsException.java index 6382ebb..7a9084a 100644 --- a/api/src/main/java/io/mifos/office/api/v1/client/AlreadyExistsException.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/AlreadyExistsException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.client; +package org.apache.fineract.cn.office.api.v1.client; public class AlreadyExistsException extends RuntimeException { } diff --git a/api/src/main/java/io/mifos/office/api/v1/client/BadRequestException.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/BadRequestException.java similarity index 94% rename from api/src/main/java/io/mifos/office/api/v1/client/BadRequestException.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/client/BadRequestException.java index c2bec14..3a7578c 100644 --- a/api/src/main/java/io/mifos/office/api/v1/client/BadRequestException.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/BadRequestException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.client; +package org.apache.fineract.cn.office.api.v1.client; public class BadRequestException extends RuntimeException { } diff --git a/api/src/main/java/io/mifos/office/api/v1/client/ChildrenExistException.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/ChildrenExistException.java similarity index 94% rename from api/src/main/java/io/mifos/office/api/v1/client/ChildrenExistException.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/client/ChildrenExistException.java index df96437..b87e5c7 100644 --- a/api/src/main/java/io/mifos/office/api/v1/client/ChildrenExistException.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/ChildrenExistException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.client; +package org.apache.fineract.cn.office.api.v1.client; public class ChildrenExistException extends RuntimeException { } diff --git a/api/src/main/java/io/mifos/office/api/v1/client/NotFoundException.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/NotFoundException.java similarity index 94% rename from api/src/main/java/io/mifos/office/api/v1/client/NotFoundException.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/client/NotFoundException.java index 94cb72e..79a609a 100644 --- a/api/src/main/java/io/mifos/office/api/v1/client/NotFoundException.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/NotFoundException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.client; +package org.apache.fineract.cn.office.api.v1.client; public class NotFoundException extends RuntimeException { } diff --git a/api/src/main/java/io/mifos/office/api/v1/client/OrganizationManager.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java similarity index 95% rename from api/src/main/java/io/mifos/office/api/v1/client/OrganizationManager.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java index 9f87c2a..9fba240 100644 --- a/api/src/main/java/io/mifos/office/api/v1/client/OrganizationManager.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.client; - -import io.mifos.office.api.v1.domain.Address; -import io.mifos.office.api.v1.domain.ContactDetail; -import io.mifos.office.api.v1.domain.Employee; -import io.mifos.office.api.v1.domain.EmployeePage; -import io.mifos.office.api.v1.domain.ExternalReference; -import io.mifos.office.api.v1.domain.Office; -import io.mifos.office.api.v1.domain.OfficePage; +package org.apache.fineract.cn.office.api.v1.client; + +import org.apache.fineract.cn.office.api.v1.domain.Address; +import org.apache.fineract.cn.office.api.v1.domain.ContactDetail; +import org.apache.fineract.cn.office.api.v1.domain.Employee; +import org.apache.fineract.cn.office.api.v1.domain.EmployeePage; +import org.apache.fineract.cn.office.api.v1.domain.ExternalReference; +import org.apache.fineract.cn.office.api.v1.domain.Office; +import org.apache.fineract.cn.office.api.v1.domain.OfficePage; import java.util.List; import javax.validation.Valid; import org.apache.fineract.cn.api.annotation.ThrowsException; diff --git a/api/src/main/java/io/mifos/office/api/v1/domain/Address.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/Address.java similarity index 97% rename from api/src/main/java/io/mifos/office/api/v1/domain/Address.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/Address.java index 47f73fa..71af3f0 100644 --- a/api/src/main/java/io/mifos/office/api/v1/domain/Address.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/Address.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.domain; +package org.apache.fineract.cn.office.api.v1.domain; import org.hibernate.validator.constraints.NotBlank; diff --git a/api/src/main/java/io/mifos/office/api/v1/domain/ContactDetail.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/ContactDetail.java similarity index 98% rename from api/src/main/java/io/mifos/office/api/v1/domain/ContactDetail.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/ContactDetail.java index 13dd2a3..ec08633 100644 --- a/api/src/main/java/io/mifos/office/api/v1/domain/ContactDetail.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/ContactDetail.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.domain; +package org.apache.fineract.cn.office.api.v1.domain; import org.hibernate.validator.constraints.NotBlank; diff --git a/api/src/main/java/io/mifos/office/api/v1/domain/Employee.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/Employee.java similarity index 97% rename from api/src/main/java/io/mifos/office/api/v1/domain/Employee.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/Employee.java index 4d3949d..a5ea4c0 100644 --- a/api/src/main/java/io/mifos/office/api/v1/domain/Employee.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/Employee.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.domain; +package org.apache.fineract.cn.office.api.v1.domain; import java.util.List; import javax.validation.Valid; diff --git a/api/src/main/java/io/mifos/office/api/v1/domain/EmployeePage.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/EmployeePage.java similarity index 96% rename from api/src/main/java/io/mifos/office/api/v1/domain/EmployeePage.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/EmployeePage.java index c7fece4..97be151 100644 --- a/api/src/main/java/io/mifos/office/api/v1/domain/EmployeePage.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/EmployeePage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.domain; +package org.apache.fineract.cn.office.api.v1.domain; import javax.validation.Valid; import java.util.List; diff --git a/api/src/main/java/io/mifos/office/api/v1/domain/ExternalReference.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/ExternalReference.java similarity index 96% rename from api/src/main/java/io/mifos/office/api/v1/domain/ExternalReference.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/ExternalReference.java index 90c1eeb..5deba22 100644 --- a/api/src/main/java/io/mifos/office/api/v1/domain/ExternalReference.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/ExternalReference.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.domain; +package org.apache.fineract.cn.office.api.v1.domain; import javax.validation.constraints.NotNull; import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier; diff --git a/api/src/main/java/io/mifos/office/api/v1/domain/Office.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/Office.java similarity index 97% rename from api/src/main/java/io/mifos/office/api/v1/domain/Office.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/Office.java index f28ff97..bb06c6a 100644 --- a/api/src/main/java/io/mifos/office/api/v1/domain/Office.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/Office.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.domain; +package org.apache.fineract.cn.office.api.v1.domain; import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier; diff --git a/api/src/main/java/io/mifos/office/api/v1/domain/OfficePage.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/OfficePage.java similarity index 96% rename from api/src/main/java/io/mifos/office/api/v1/domain/OfficePage.java rename to api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/OfficePage.java index 2969abf..875ac4a 100644 --- a/api/src/main/java/io/mifos/office/api/v1/domain/OfficePage.java +++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/domain/OfficePage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.api.v1.domain; +package org.apache.fineract.cn.office.api.v1.domain; import javax.validation.Valid; import java.util.List; diff --git a/component-test/src/main/java/io/mifos/office/TestEmployee.java b/component-test/src/main/java/org/apache/fineract/cn/office/TestEmployee.java similarity index 94% rename from component-test/src/main/java/io/mifos/office/TestEmployee.java rename to component-test/src/main/java/org/apache/fineract/cn/office/TestEmployee.java index df76870..0d1c540 100644 --- a/component-test/src/main/java/io/mifos/office/TestEmployee.java +++ b/component-test/src/main/java/org/apache/fineract/cn/office/TestEmployee.java @@ -16,26 +16,26 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office; - -import io.mifos.office.api.v1.EventConstants; -import io.mifos.office.api.v1.client.AlreadyExistsException; -import io.mifos.office.api.v1.client.BadRequestException; -import io.mifos.office.api.v1.client.NotFoundException; -import io.mifos.office.api.v1.client.OrganizationManager; -import io.mifos.office.api.v1.domain.ContactDetail; -import io.mifos.office.api.v1.domain.Employee; -import io.mifos.office.api.v1.domain.EmployeePage; -import io.mifos.office.api.v1.domain.Office; -import io.mifos.office.rest.config.OfficeRestConfiguration; -import io.mifos.office.util.EmployeeFactory; -import io.mifos.office.util.OfficeFactory; +package org.apache.fineract.cn.office; + +import org.apache.fineract.cn.office.api.v1.EventConstants; +import org.apache.fineract.cn.office.api.v1.client.AlreadyExistsException; +import org.apache.fineract.cn.office.api.v1.client.BadRequestException; +import org.apache.fineract.cn.office.api.v1.client.NotFoundException; +import org.apache.fineract.cn.office.api.v1.client.OrganizationManager; +import org.apache.fineract.cn.office.api.v1.domain.ContactDetail; +import org.apache.fineract.cn.office.api.v1.domain.Employee; +import org.apache.fineract.cn.office.api.v1.domain.EmployeePage; +import org.apache.fineract.cn.office.api.v1.domain.Office; import java.util.Arrays; import java.util.Collections; import java.util.List; import org.apache.commons.lang3.RandomStringUtils; import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; import org.apache.fineract.cn.api.context.AutoUserContext; +import org.apache.fineract.cn.office.rest.config.OfficeRestConfiguration; +import org.apache.fineract.cn.office.util.EmployeeFactory; +import org.apache.fineract.cn.office.util.OfficeFactory; 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; @@ -389,9 +389,9 @@ public void shouldDeleteContactDetailOfEmployee() throws Exception { @Configuration @ComponentScan( - basePackages = "io.mifos.office.listener" + basePackages = "org.apache.fineract.cn.office.listener" ) - @EnableFeignClients(basePackages = {"io.mifos.office.api.v1.client"}) + @EnableFeignClients(basePackages = {"org.apache.fineract.cn.office.api.v1.client"}) @RibbonClient(name = APP_NAME) @EnableEventRecording(maxWait = 5000L) @Import({OfficeRestConfiguration.class}) diff --git a/component-test/src/main/java/io/mifos/office/TestOffice.java b/component-test/src/main/java/org/apache/fineract/cn/office/TestOffice.java similarity index 94% rename from component-test/src/main/java/io/mifos/office/TestOffice.java rename to component-test/src/main/java/org/apache/fineract/cn/office/TestOffice.java index 84822a7..6653c14 100644 --- a/component-test/src/main/java/io/mifos/office/TestOffice.java +++ b/component-test/src/main/java/org/apache/fineract/cn/office/TestOffice.java @@ -16,26 +16,26 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office; - -import io.mifos.office.api.v1.EventConstants; -import io.mifos.office.api.v1.client.AlreadyExistsException; -import io.mifos.office.api.v1.client.BadRequestException; -import io.mifos.office.api.v1.client.ChildrenExistException; -import io.mifos.office.api.v1.client.NotFoundException; -import io.mifos.office.api.v1.client.OrganizationManager; -import io.mifos.office.api.v1.domain.Address; -import io.mifos.office.api.v1.domain.Employee; -import io.mifos.office.api.v1.domain.ExternalReference; -import io.mifos.office.api.v1.domain.Office; -import io.mifos.office.api.v1.domain.OfficePage; -import io.mifos.office.rest.config.OfficeRestConfiguration; -import io.mifos.office.util.AddressFactory; -import io.mifos.office.util.EmployeeFactory; -import io.mifos.office.util.OfficeFactory; +package org.apache.fineract.cn.office; + +import org.apache.fineract.cn.office.api.v1.EventConstants; +import org.apache.fineract.cn.office.api.v1.client.AlreadyExistsException; +import org.apache.fineract.cn.office.api.v1.client.BadRequestException; +import org.apache.fineract.cn.office.api.v1.client.ChildrenExistException; +import org.apache.fineract.cn.office.api.v1.client.NotFoundException; +import org.apache.fineract.cn.office.api.v1.client.OrganizationManager; +import org.apache.fineract.cn.office.api.v1.domain.Address; +import org.apache.fineract.cn.office.api.v1.domain.Employee; +import org.apache.fineract.cn.office.api.v1.domain.ExternalReference; +import org.apache.fineract.cn.office.api.v1.domain.Office; +import org.apache.fineract.cn.office.api.v1.domain.OfficePage; import org.apache.commons.lang3.RandomStringUtils; import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; import org.apache.fineract.cn.api.context.AutoUserContext; +import org.apache.fineract.cn.office.rest.config.OfficeRestConfiguration; +import org.apache.fineract.cn.office.util.AddressFactory; +import org.apache.fineract.cn.office.util.EmployeeFactory; +import org.apache.fineract.cn.office.util.OfficeFactory; 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; @@ -410,9 +410,9 @@ public void shouldIndicateOfficeHasExternalReferences() throws Exception { @Configuration @ComponentScan( - basePackages = "io.mifos.office.listener" + basePackages = "org.apache.fineract.cn.office.listener" ) - @EnableFeignClients(basePackages = {"io.mifos.office.api.v1.client"}) + @EnableFeignClients(basePackages = {"org.apache.fineract.cn.office.api.v1.client"}) @RibbonClient(name = APP_NAME) @EnableEventRecording(maxWait = 5000L) @Import({OfficeRestConfiguration.class}) diff --git a/component-test/src/main/java/io/mifos/office/listener/EmployeeEventListener.java b/component-test/src/main/java/org/apache/fineract/cn/office/listener/EmployeeEventListener.java similarity index 97% rename from component-test/src/main/java/io/mifos/office/listener/EmployeeEventListener.java rename to component-test/src/main/java/org/apache/fineract/cn/office/listener/EmployeeEventListener.java index ce5e831..a084a93 100644 --- a/component-test/src/main/java/io/mifos/office/listener/EmployeeEventListener.java +++ b/component-test/src/main/java/org/apache/fineract/cn/office/listener/EmployeeEventListener.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.listener; +package org.apache.fineract.cn.office.listener; -import io.mifos.office.api.v1.EventConstants; +import org.apache.fineract.cn.office.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; diff --git a/component-test/src/main/java/io/mifos/office/listener/MigrationEventListener.java b/component-test/src/main/java/org/apache/fineract/cn/office/listener/MigrationEventListener.java similarity index 94% rename from component-test/src/main/java/io/mifos/office/listener/MigrationEventListener.java rename to component-test/src/main/java/org/apache/fineract/cn/office/listener/MigrationEventListener.java index ab30d32..8110e00 100644 --- a/component-test/src/main/java/io/mifos/office/listener/MigrationEventListener.java +++ b/component-test/src/main/java/org/apache/fineract/cn/office/listener/MigrationEventListener.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.listener; +package org.apache.fineract.cn.office.listener; -import io.mifos.office.api.v1.EventConstants; +import org.apache.fineract.cn.office.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; diff --git a/component-test/src/main/java/io/mifos/office/listener/OfficeEventListener.java b/component-test/src/main/java/org/apache/fineract/cn/office/listener/OfficeEventListener.java similarity index 97% rename from component-test/src/main/java/io/mifos/office/listener/OfficeEventListener.java rename to component-test/src/main/java/org/apache/fineract/cn/office/listener/OfficeEventListener.java index 8cdb701..2a1ca4d 100644 --- a/component-test/src/main/java/io/mifos/office/listener/OfficeEventListener.java +++ b/component-test/src/main/java/org/apache/fineract/cn/office/listener/OfficeEventListener.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.listener; +package org.apache.fineract.cn.office.listener; import com.google.gson.Gson; -import io.mifos.office.api.v1.EventConstants; +import org.apache.fineract.cn.office.api.v1.EventConstants; import org.apache.fineract.cn.command.util.CommandConstants; import org.apache.fineract.cn.lang.config.TenantHeaderFilter; import org.apache.fineract.cn.test.listener.EventRecorder; diff --git a/component-test/src/main/java/io/mifos/office/util/AddressFactory.java b/component-test/src/main/java/org/apache/fineract/cn/office/util/AddressFactory.java similarity index 93% rename from component-test/src/main/java/io/mifos/office/util/AddressFactory.java rename to component-test/src/main/java/org/apache/fineract/cn/office/util/AddressFactory.java index f2ceda4..059f195 100644 --- a/component-test/src/main/java/io/mifos/office/util/AddressFactory.java +++ b/component-test/src/main/java/org/apache/fineract/cn/office/util/AddressFactory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.util; +package org.apache.fineract.cn.office.util; -import io.mifos.office.api.v1.domain.Address; +import org.apache.fineract.cn.office.api.v1.domain.Address; import org.apache.commons.lang3.RandomStringUtils; public class AddressFactory { diff --git a/component-test/src/main/java/io/mifos/office/util/EmployeeFactory.java b/component-test/src/main/java/org/apache/fineract/cn/office/util/EmployeeFactory.java similarity index 92% rename from component-test/src/main/java/io/mifos/office/util/EmployeeFactory.java rename to component-test/src/main/java/org/apache/fineract/cn/office/util/EmployeeFactory.java index e63b92c..778361d 100644 --- a/component-test/src/main/java/io/mifos/office/util/EmployeeFactory.java +++ b/component-test/src/main/java/org/apache/fineract/cn/office/util/EmployeeFactory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.util; +package org.apache.fineract.cn.office.util; -import io.mifos.office.api.v1.domain.Employee; +import org.apache.fineract.cn.office.api.v1.domain.Employee; import org.apache.commons.lang3.RandomStringUtils; public class EmployeeFactory { diff --git a/component-test/src/main/java/io/mifos/office/util/OfficeFactory.java b/component-test/src/main/java/org/apache/fineract/cn/office/util/OfficeFactory.java similarity index 92% rename from component-test/src/main/java/io/mifos/office/util/OfficeFactory.java rename to component-test/src/main/java/org/apache/fineract/cn/office/util/OfficeFactory.java index 7ba869d..cd896e1 100644 --- a/component-test/src/main/java/io/mifos/office/util/OfficeFactory.java +++ b/component-test/src/main/java/org/apache/fineract/cn/office/util/OfficeFactory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.util; +package org.apache.fineract.cn.office.util; -import io.mifos.office.api.v1.domain.Office; +import org.apache.fineract.cn.office.api.v1.domain.Office; import org.apache.commons.lang3.RandomStringUtils; public class OfficeFactory { diff --git a/service/src/main/java/io/mifos/office/OfficeApplication.java b/service/src/main/java/org/apache/fineract/cn/office/OfficeApplication.java similarity index 90% rename from service/src/main/java/io/mifos/office/OfficeApplication.java rename to service/src/main/java/org/apache/fineract/cn/office/OfficeApplication.java index 2b6a461..b0add3b 100644 --- a/service/src/main/java/io/mifos/office/OfficeApplication.java +++ b/service/src/main/java/org/apache/fineract/cn/office/OfficeApplication.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office; +package org.apache.fineract.cn.office; -import io.mifos.office.rest.config.OfficeRestConfiguration; +import org.apache.fineract.cn.office.rest.config.OfficeRestConfiguration; import org.springframework.boot.SpringApplication; public class OfficeApplication { diff --git a/service/src/main/java/io/mifos/office/ServiceConstants.java b/service/src/main/java/org/apache/fineract/cn/office/ServiceConstants.java similarity index 96% rename from service/src/main/java/io/mifos/office/ServiceConstants.java rename to service/src/main/java/org/apache/fineract/cn/office/ServiceConstants.java index 740fdb1..7fc38fa 100644 --- a/service/src/main/java/io/mifos/office/ServiceConstants.java +++ b/service/src/main/java/org/apache/fineract/cn/office/ServiceConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office; +package org.apache.fineract.cn.office; public interface ServiceConstants { diff --git a/service/src/main/java/io/mifos/office/internal/command/AddBranchCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/AddBranchCommand.java similarity index 91% rename from service/src/main/java/io/mifos/office/internal/command/AddBranchCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/AddBranchCommand.java index f8eee32..598bc1e 100644 --- a/service/src/main/java/io/mifos/office/internal/command/AddBranchCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/AddBranchCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; -import io.mifos.office.api.v1.domain.Office; +import org.apache.fineract.cn.office.api.v1.domain.Office; public class AddBranchCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/AddExternalReferenceCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/AddExternalReferenceCommand.java similarity index 91% rename from service/src/main/java/io/mifos/office/internal/command/AddExternalReferenceCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/AddExternalReferenceCommand.java index 0e74927..bd1cd5e 100644 --- a/service/src/main/java/io/mifos/office/internal/command/AddExternalReferenceCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/AddExternalReferenceCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; -import io.mifos.office.api.v1.domain.ExternalReference; +import org.apache.fineract.cn.office.api.v1.domain.ExternalReference; public class AddExternalReferenceCommand { private final String officeIdentifier; diff --git a/service/src/main/java/io/mifos/office/internal/command/CreateEmployeeCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/CreateEmployeeCommand.java similarity index 89% rename from service/src/main/java/io/mifos/office/internal/command/CreateEmployeeCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/CreateEmployeeCommand.java index b57c80d..ae593ca 100644 --- a/service/src/main/java/io/mifos/office/internal/command/CreateEmployeeCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/CreateEmployeeCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; -import io.mifos.office.api.v1.domain.Employee; +import org.apache.fineract.cn.office.api.v1.domain.Employee; public class CreateEmployeeCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/CreateOfficeCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/CreateOfficeCommand.java similarity index 89% rename from service/src/main/java/io/mifos/office/internal/command/CreateOfficeCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/CreateOfficeCommand.java index 0c48d10..fc290f5 100644 --- a/service/src/main/java/io/mifos/office/internal/command/CreateOfficeCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/CreateOfficeCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; -import io.mifos.office.api.v1.domain.Office; +import org.apache.fineract.cn.office.api.v1.domain.Office; public class CreateOfficeCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/DeleteAddressOfOfficeCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteAddressOfOfficeCommand.java similarity index 95% rename from service/src/main/java/io/mifos/office/internal/command/DeleteAddressOfOfficeCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteAddressOfOfficeCommand.java index 21a0703..161eaf3 100644 --- a/service/src/main/java/io/mifos/office/internal/command/DeleteAddressOfOfficeCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteAddressOfOfficeCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; public class DeleteAddressOfOfficeCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/DeleteContactDetailCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteContactDetailCommand.java similarity index 94% rename from service/src/main/java/io/mifos/office/internal/command/DeleteContactDetailCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteContactDetailCommand.java index 218f20e..6fb7728 100644 --- a/service/src/main/java/io/mifos/office/internal/command/DeleteContactDetailCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteContactDetailCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; public class DeleteContactDetailCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/DeleteEmployeeCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteEmployeeCommand.java similarity index 94% rename from service/src/main/java/io/mifos/office/internal/command/DeleteEmployeeCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteEmployeeCommand.java index 8aab77a..bf2a284 100644 --- a/service/src/main/java/io/mifos/office/internal/command/DeleteEmployeeCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteEmployeeCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; public class DeleteEmployeeCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/DeleteOfficeCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteOfficeCommand.java similarity index 94% rename from service/src/main/java/io/mifos/office/internal/command/DeleteOfficeCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteOfficeCommand.java index 12b171d..bd0ffdf 100644 --- a/service/src/main/java/io/mifos/office/internal/command/DeleteOfficeCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/DeleteOfficeCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; public class DeleteOfficeCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/InitializeServiceCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/InitializeServiceCommand.java similarity index 94% rename from service/src/main/java/io/mifos/office/internal/command/InitializeServiceCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/InitializeServiceCommand.java index b690299..0c2c900 100644 --- a/service/src/main/java/io/mifos/office/internal/command/InitializeServiceCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/InitializeServiceCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; public class InitializeServiceCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/SetAddressForOfficeCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/SetAddressForOfficeCommand.java similarity index 91% rename from service/src/main/java/io/mifos/office/internal/command/SetAddressForOfficeCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/SetAddressForOfficeCommand.java index e14926d..e019383 100644 --- a/service/src/main/java/io/mifos/office/internal/command/SetAddressForOfficeCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/SetAddressForOfficeCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; -import io.mifos.office.api.v1.domain.Address; +import org.apache.fineract.cn.office.api.v1.domain.Address; public class SetAddressForOfficeCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/SetContactDetailsCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/SetContactDetailsCommand.java similarity index 91% rename from service/src/main/java/io/mifos/office/internal/command/SetContactDetailsCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/SetContactDetailsCommand.java index 8b6a186..819ac9f 100644 --- a/service/src/main/java/io/mifos/office/internal/command/SetContactDetailsCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/SetContactDetailsCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; -import io.mifos.office.api.v1.domain.ContactDetail; +import org.apache.fineract.cn.office.api.v1.domain.ContactDetail; import java.util.List; diff --git a/service/src/main/java/io/mifos/office/internal/command/UpdateEmployeeCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/UpdateEmployeeCommand.java similarity index 89% rename from service/src/main/java/io/mifos/office/internal/command/UpdateEmployeeCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/UpdateEmployeeCommand.java index aa7737a..a396748 100644 --- a/service/src/main/java/io/mifos/office/internal/command/UpdateEmployeeCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/UpdateEmployeeCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; -import io.mifos.office.api.v1.domain.Employee; +import org.apache.fineract.cn.office.api.v1.domain.Employee; public class UpdateEmployeeCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/UpdateOfficeCommand.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/UpdateOfficeCommand.java similarity index 89% rename from service/src/main/java/io/mifos/office/internal/command/UpdateOfficeCommand.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/UpdateOfficeCommand.java index 5afa9ad..ef29cf7 100644 --- a/service/src/main/java/io/mifos/office/internal/command/UpdateOfficeCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/UpdateOfficeCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command; +package org.apache.fineract.cn.office.internal.command; -import io.mifos.office.api.v1.domain.Office; +import org.apache.fineract.cn.office.api.v1.domain.Office; public class UpdateOfficeCommand { diff --git a/service/src/main/java/io/mifos/office/internal/command/handler/EmployeeAggregate.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/EmployeeAggregate.java similarity index 87% rename from service/src/main/java/io/mifos/office/internal/command/handler/EmployeeAggregate.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/EmployeeAggregate.java index 7d8d7a5..da7386f 100644 --- a/service/src/main/java/io/mifos/office/internal/command/handler/EmployeeAggregate.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/EmployeeAggregate.java @@ -16,24 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command.handler; - -import io.mifos.office.api.v1.EventConstants; -import io.mifos.office.api.v1.domain.ContactDetail; -import io.mifos.office.api.v1.domain.Employee; -import io.mifos.office.internal.command.CreateEmployeeCommand; -import io.mifos.office.internal.command.DeleteContactDetailCommand; -import io.mifos.office.internal.command.DeleteEmployeeCommand; -import io.mifos.office.internal.command.SetContactDetailsCommand; -import io.mifos.office.internal.command.UpdateEmployeeCommand; -import io.mifos.office.internal.mapper.ContactDetailMapper; -import io.mifos.office.internal.mapper.EmployeeMapper; -import io.mifos.office.internal.repository.ContactDetailEntity; -import io.mifos.office.internal.repository.ContactDetailRepository; -import io.mifos.office.internal.repository.EmployeeEntity; -import io.mifos.office.internal.repository.EmployeeRepository; -import io.mifos.office.internal.repository.OfficeEntity; -import io.mifos.office.internal.repository.OfficeRepository; +package org.apache.fineract.cn.office.internal.command.handler; + import java.util.List; import java.util.Objects; import java.util.Optional; @@ -42,6 +26,22 @@ import org.apache.fineract.cn.command.annotation.CommandHandler; import org.apache.fineract.cn.command.annotation.EventEmitter; import org.apache.fineract.cn.lang.ServiceException; +import org.apache.fineract.cn.office.api.v1.EventConstants; +import org.apache.fineract.cn.office.api.v1.domain.ContactDetail; +import org.apache.fineract.cn.office.api.v1.domain.Employee; +import org.apache.fineract.cn.office.internal.command.CreateEmployeeCommand; +import org.apache.fineract.cn.office.internal.command.DeleteContactDetailCommand; +import org.apache.fineract.cn.office.internal.command.DeleteEmployeeCommand; +import org.apache.fineract.cn.office.internal.command.SetContactDetailsCommand; +import org.apache.fineract.cn.office.internal.command.UpdateEmployeeCommand; +import org.apache.fineract.cn.office.internal.mapper.ContactDetailMapper; +import org.apache.fineract.cn.office.internal.mapper.EmployeeMapper; +import org.apache.fineract.cn.office.internal.repository.ContactDetailEntity; +import org.apache.fineract.cn.office.internal.repository.ContactDetailRepository; +import org.apache.fineract.cn.office.internal.repository.EmployeeEntity; +import org.apache.fineract.cn.office.internal.repository.EmployeeRepository; +import org.apache.fineract.cn.office.internal.repository.OfficeEntity; +import org.apache.fineract.cn.office.internal.repository.OfficeRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; diff --git a/service/src/main/java/io/mifos/office/internal/command/handler/MigrationAggregate.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/MigrationAggregate.java similarity index 89% rename from service/src/main/java/io/mifos/office/internal/command/handler/MigrationAggregate.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/MigrationAggregate.java index b1679b7..c1d17a8 100644 --- a/service/src/main/java/io/mifos/office/internal/command/handler/MigrationAggregate.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/MigrationAggregate.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command.handler; +package org.apache.fineract.cn.office.internal.command.handler; -import io.mifos.office.ServiceConstants; -import io.mifos.office.api.v1.EventConstants; -import io.mifos.office.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.apache.fineract.cn.office.ServiceConstants; +import org.apache.fineract.cn.office.api.v1.EventConstants; +import org.apache.fineract.cn.office.internal.command.InitializeServiceCommand; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/service/src/main/java/io/mifos/office/internal/command/handler/OfficeAggregate.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/OfficeAggregate.java similarity index 87% rename from service/src/main/java/io/mifos/office/internal/command/handler/OfficeAggregate.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/OfficeAggregate.java index f7c3254..49fc06c 100644 --- a/service/src/main/java/io/mifos/office/internal/command/handler/OfficeAggregate.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/OfficeAggregate.java @@ -16,27 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command.handler; - -import io.mifos.office.ServiceConstants; -import io.mifos.office.api.v1.EventConstants; -import io.mifos.office.api.v1.domain.ExternalReference; -import io.mifos.office.api.v1.domain.Office; -import io.mifos.office.internal.command.AddBranchCommand; -import io.mifos.office.internal.command.AddExternalReferenceCommand; -import io.mifos.office.internal.command.CreateOfficeCommand; -import io.mifos.office.internal.command.DeleteAddressOfOfficeCommand; -import io.mifos.office.internal.command.DeleteOfficeCommand; -import io.mifos.office.internal.command.SetAddressForOfficeCommand; -import io.mifos.office.internal.command.UpdateOfficeCommand; -import io.mifos.office.internal.mapper.AddressMapper; -import io.mifos.office.internal.mapper.OfficeMapper; -import io.mifos.office.internal.repository.AddressEntity; -import io.mifos.office.internal.repository.AddressRepository; -import io.mifos.office.internal.repository.ExternalReferenceEntity; -import io.mifos.office.internal.repository.ExternalReferenceRepository; -import io.mifos.office.internal.repository.OfficeEntity; -import io.mifos.office.internal.repository.OfficeRepository; +package org.apache.fineract.cn.office.internal.command.handler; + import java.util.Date; import java.util.Optional; import org.apache.fineract.cn.api.util.UserContextHolder; @@ -44,6 +25,25 @@ import org.apache.fineract.cn.command.annotation.CommandHandler; import org.apache.fineract.cn.command.annotation.EventEmitter; import org.apache.fineract.cn.lang.ServiceException; +import org.apache.fineract.cn.office.ServiceConstants; +import org.apache.fineract.cn.office.api.v1.EventConstants; +import org.apache.fineract.cn.office.api.v1.domain.ExternalReference; +import org.apache.fineract.cn.office.api.v1.domain.Office; +import org.apache.fineract.cn.office.internal.command.AddBranchCommand; +import org.apache.fineract.cn.office.internal.command.AddExternalReferenceCommand; +import org.apache.fineract.cn.office.internal.command.CreateOfficeCommand; +import org.apache.fineract.cn.office.internal.command.DeleteAddressOfOfficeCommand; +import org.apache.fineract.cn.office.internal.command.DeleteOfficeCommand; +import org.apache.fineract.cn.office.internal.command.SetAddressForOfficeCommand; +import org.apache.fineract.cn.office.internal.command.UpdateOfficeCommand; +import org.apache.fineract.cn.office.internal.mapper.AddressMapper; +import org.apache.fineract.cn.office.internal.mapper.OfficeMapper; +import org.apache.fineract.cn.office.internal.repository.AddressEntity; +import org.apache.fineract.cn.office.internal.repository.AddressRepository; +import org.apache.fineract.cn.office.internal.repository.ExternalReferenceEntity; +import org.apache.fineract.cn.office.internal.repository.ExternalReferenceRepository; +import org.apache.fineract.cn.office.internal.repository.OfficeEntity; +import org.apache.fineract.cn.office.internal.repository.OfficeRepository; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/service/src/main/java/io/mifos/office/internal/command/handler/Utils.java b/service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/Utils.java similarity index 94% rename from service/src/main/java/io/mifos/office/internal/command/handler/Utils.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/Utils.java index 11ee9cd..b7b1c40 100644 --- a/service/src/main/java/io/mifos/office/internal/command/handler/Utils.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/command/handler/Utils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.command.handler; +package org.apache.fineract.cn.office.internal.command.handler; import java.time.Clock; import java.time.Instant; diff --git a/service/src/main/java/io/mifos/office/internal/config/OfficeServiceConfiguration.java b/service/src/main/java/org/apache/fineract/cn/office/internal/config/OfficeServiceConfiguration.java similarity index 83% rename from service/src/main/java/io/mifos/office/internal/config/OfficeServiceConfiguration.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/config/OfficeServiceConfiguration.java index 4709dec..48c9b11 100644 --- a/service/src/main/java/io/mifos/office/internal/config/OfficeServiceConfiguration.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/config/OfficeServiceConfiguration.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.config; +package org.apache.fineract.cn.office.internal.config; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import io.mifos.office.ServiceConstants; import org.apache.fineract.cn.mariadb.config.EnableMariaDB; +import org.apache.fineract.cn.office.ServiceConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; @@ -33,14 +33,14 @@ @EnableMariaDB @ComponentScan( basePackages = { - "io.mifos.office.internal.command.handler", - "io.mifos.office.internal.repository", - "io.mifos.office.internal.service" + "org.apache.fineract.cn.office.internal.command.handler", + "org.apache.fineract.cn.office.internal.repository", + "org.apache.fineract.cn.office.internal.service" } ) @EnableJpaRepositories( basePackages = { - "io.mifos.office.internal.repository" + "org.apache.fineract.cn.office.internal.repository" } ) public class OfficeServiceConfiguration { diff --git a/service/src/main/java/io/mifos/office/internal/mapper/AddressMapper.java b/service/src/main/java/org/apache/fineract/cn/office/internal/mapper/AddressMapper.java similarity index 90% rename from service/src/main/java/io/mifos/office/internal/mapper/AddressMapper.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/mapper/AddressMapper.java index fa5a1ab..92104af 100644 --- a/service/src/main/java/io/mifos/office/internal/mapper/AddressMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/mapper/AddressMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.mapper; +package org.apache.fineract.cn.office.internal.mapper; -import io.mifos.office.api.v1.domain.Address; -import io.mifos.office.internal.repository.AddressEntity; +import org.apache.fineract.cn.office.api.v1.domain.Address; +import org.apache.fineract.cn.office.internal.repository.AddressEntity; public final class AddressMapper { diff --git a/service/src/main/java/io/mifos/office/internal/mapper/ContactDetailMapper.java b/service/src/main/java/org/apache/fineract/cn/office/internal/mapper/ContactDetailMapper.java similarity index 89% rename from service/src/main/java/io/mifos/office/internal/mapper/ContactDetailMapper.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/mapper/ContactDetailMapper.java index da8fc8b..e73be1b 100644 --- a/service/src/main/java/io/mifos/office/internal/mapper/ContactDetailMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/mapper/ContactDetailMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.mapper; +package org.apache.fineract.cn.office.internal.mapper; -import io.mifos.office.api.v1.domain.ContactDetail; -import io.mifos.office.internal.repository.ContactDetailEntity; +import org.apache.fineract.cn.office.api.v1.domain.ContactDetail; +import org.apache.fineract.cn.office.internal.repository.ContactDetailEntity; public class ContactDetailMapper { diff --git a/service/src/main/java/io/mifos/office/internal/mapper/EmployeeMapper.java b/service/src/main/java/org/apache/fineract/cn/office/internal/mapper/EmployeeMapper.java similarity index 90% rename from service/src/main/java/io/mifos/office/internal/mapper/EmployeeMapper.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/mapper/EmployeeMapper.java index fb32ee4..4427d29 100644 --- a/service/src/main/java/io/mifos/office/internal/mapper/EmployeeMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/mapper/EmployeeMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.mapper; +package org.apache.fineract.cn.office.internal.mapper; -import io.mifos.office.api.v1.domain.Employee; -import io.mifos.office.internal.repository.EmployeeEntity; +import org.apache.fineract.cn.office.api.v1.domain.Employee; +import org.apache.fineract.cn.office.internal.repository.EmployeeEntity; public class EmployeeMapper { diff --git a/service/src/main/java/io/mifos/office/internal/mapper/OfficeMapper.java b/service/src/main/java/org/apache/fineract/cn/office/internal/mapper/OfficeMapper.java similarity index 88% rename from service/src/main/java/io/mifos/office/internal/mapper/OfficeMapper.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/mapper/OfficeMapper.java index 810da16..5cf1a21 100644 --- a/service/src/main/java/io/mifos/office/internal/mapper/OfficeMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/mapper/OfficeMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.mapper; +package org.apache.fineract.cn.office.internal.mapper; -import io.mifos.office.api.v1.domain.Office; -import io.mifos.office.internal.repository.OfficeEntity; +import org.apache.fineract.cn.office.api.v1.domain.Office; +import org.apache.fineract.cn.office.internal.repository.OfficeEntity; public final class OfficeMapper { diff --git a/service/src/main/java/io/mifos/office/internal/repository/AddressEntity.java b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/AddressEntity.java similarity index 97% rename from service/src/main/java/io/mifos/office/internal/repository/AddressEntity.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/repository/AddressEntity.java index 2c95ce8..eb6d045 100644 --- a/service/src/main/java/io/mifos/office/internal/repository/AddressEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/AddressEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.repository; +package org.apache.fineract.cn.office.internal.repository; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/service/src/main/java/io/mifos/office/internal/repository/AddressRepository.java b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/AddressRepository.java similarity index 94% rename from service/src/main/java/io/mifos/office/internal/repository/AddressRepository.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/repository/AddressRepository.java index 38931d6..c60c2fe 100644 --- a/service/src/main/java/io/mifos/office/internal/repository/AddressRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/AddressRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.repository; +package org.apache.fineract.cn.office.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/service/src/main/java/io/mifos/office/internal/repository/ContactDetailEntity.java b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/ContactDetailEntity.java similarity index 97% rename from service/src/main/java/io/mifos/office/internal/repository/ContactDetailEntity.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/repository/ContactDetailEntity.java index ba374e9..d112d49 100644 --- a/service/src/main/java/io/mifos/office/internal/repository/ContactDetailEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/ContactDetailEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.repository; +package org.apache.fineract.cn.office.internal.repository; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/service/src/main/java/io/mifos/office/internal/repository/ContactDetailRepository.java b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/ContactDetailRepository.java similarity index 95% rename from service/src/main/java/io/mifos/office/internal/repository/ContactDetailRepository.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/repository/ContactDetailRepository.java index b92b0af..b97076c 100644 --- a/service/src/main/java/io/mifos/office/internal/repository/ContactDetailRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/ContactDetailRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.repository; +package org.apache.fineract.cn.office.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/service/src/main/java/io/mifos/office/internal/repository/EmployeeEntity.java b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/EmployeeEntity.java similarity index 98% rename from service/src/main/java/io/mifos/office/internal/repository/EmployeeEntity.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/repository/EmployeeEntity.java index 7ad0d6f..3b856fa 100644 --- a/service/src/main/java/io/mifos/office/internal/repository/EmployeeEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/EmployeeEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.repository; +package org.apache.fineract.cn.office.internal.repository; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/service/src/main/java/io/mifos/office/internal/repository/EmployeeRepository.java b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/EmployeeRepository.java similarity index 96% rename from service/src/main/java/io/mifos/office/internal/repository/EmployeeRepository.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/repository/EmployeeRepository.java index 142c692..0ac2042 100644 --- a/service/src/main/java/io/mifos/office/internal/repository/EmployeeRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/EmployeeRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.repository; +package org.apache.fineract.cn.office.internal.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/service/src/main/java/io/mifos/office/internal/repository/ExternalReferenceEntity.java b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/ExternalReferenceEntity.java similarity index 97% rename from service/src/main/java/io/mifos/office/internal/repository/ExternalReferenceEntity.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/repository/ExternalReferenceEntity.java index 9ef9fdf..2e0ca23 100644 --- a/service/src/main/java/io/mifos/office/internal/repository/ExternalReferenceEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/ExternalReferenceEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.repository; +package org.apache.fineract.cn.office.internal.repository; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/service/src/main/java/io/mifos/office/internal/repository/ExternalReferenceRepository.java b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/ExternalReferenceRepository.java similarity index 95% rename from service/src/main/java/io/mifos/office/internal/repository/ExternalReferenceRepository.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/repository/ExternalReferenceRepository.java index 586b950..b01dd1c 100644 --- a/service/src/main/java/io/mifos/office/internal/repository/ExternalReferenceRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/ExternalReferenceRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.repository; +package org.apache.fineract.cn.office.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/service/src/main/java/io/mifos/office/internal/repository/OfficeEntity.java b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/OfficeEntity.java similarity index 98% rename from service/src/main/java/io/mifos/office/internal/repository/OfficeEntity.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/repository/OfficeEntity.java index 6edd728..a8bfced 100644 --- a/service/src/main/java/io/mifos/office/internal/repository/OfficeEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/OfficeEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.repository; +package org.apache.fineract.cn.office.internal.repository; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/service/src/main/java/io/mifos/office/internal/repository/OfficeRepository.java b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/OfficeRepository.java similarity index 97% rename from service/src/main/java/io/mifos/office/internal/repository/OfficeRepository.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/repository/OfficeRepository.java index daa8b13..78b9fcf 100644 --- a/service/src/main/java/io/mifos/office/internal/repository/OfficeRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/repository/OfficeRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.repository; +package org.apache.fineract.cn.office.internal.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/service/src/main/java/io/mifos/office/internal/service/EmployeeService.java b/service/src/main/java/org/apache/fineract/cn/office/internal/service/EmployeeService.java similarity index 83% rename from service/src/main/java/io/mifos/office/internal/service/EmployeeService.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/service/EmployeeService.java index 9686973..048914f 100644 --- a/service/src/main/java/io/mifos/office/internal/service/EmployeeService.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/service/EmployeeService.java @@ -16,26 +16,26 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.service; - -import io.mifos.office.ServiceConstants; -import io.mifos.office.api.v1.domain.ContactDetail; -import io.mifos.office.api.v1.domain.Employee; -import io.mifos.office.api.v1.domain.EmployeePage; -import io.mifos.office.internal.mapper.ContactDetailMapper; -import io.mifos.office.internal.mapper.EmployeeMapper; -import io.mifos.office.internal.repository.ContactDetailEntity; -import io.mifos.office.internal.repository.ContactDetailRepository; -import io.mifos.office.internal.repository.EmployeeEntity; -import io.mifos.office.internal.repository.EmployeeRepository; -import io.mifos.office.internal.repository.OfficeEntity; -import io.mifos.office.internal.repository.OfficeRepository; +package org.apache.fineract.cn.office.internal.service; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; import org.apache.fineract.cn.lang.ServiceException; +import org.apache.fineract.cn.office.ServiceConstants; +import org.apache.fineract.cn.office.api.v1.domain.ContactDetail; +import org.apache.fineract.cn.office.api.v1.domain.Employee; +import org.apache.fineract.cn.office.api.v1.domain.EmployeePage; +import org.apache.fineract.cn.office.internal.mapper.ContactDetailMapper; +import org.apache.fineract.cn.office.internal.mapper.EmployeeMapper; +import org.apache.fineract.cn.office.internal.repository.ContactDetailEntity; +import org.apache.fineract.cn.office.internal.repository.ContactDetailRepository; +import org.apache.fineract.cn.office.internal.repository.EmployeeEntity; +import org.apache.fineract.cn.office.internal.repository.EmployeeRepository; +import org.apache.fineract.cn.office.internal.repository.OfficeEntity; +import org.apache.fineract.cn.office.internal.repository.OfficeRepository; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/service/src/main/java/io/mifos/office/internal/service/OfficeService.java b/service/src/main/java/org/apache/fineract/cn/office/internal/service/OfficeService.java similarity index 88% rename from service/src/main/java/io/mifos/office/internal/service/OfficeService.java rename to service/src/main/java/org/apache/fineract/cn/office/internal/service/OfficeService.java index 81b12be..79f0bf6 100644 --- a/service/src/main/java/io/mifos/office/internal/service/OfficeService.java +++ b/service/src/main/java/org/apache/fineract/cn/office/internal/service/OfficeService.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.internal.service; - -import io.mifos.office.ServiceConstants; -import io.mifos.office.api.v1.domain.Address; -import io.mifos.office.api.v1.domain.ExternalReference; -import io.mifos.office.api.v1.domain.Office; -import io.mifos.office.api.v1.domain.OfficePage; -import io.mifos.office.internal.mapper.AddressMapper; -import io.mifos.office.internal.mapper.OfficeMapper; -import io.mifos.office.internal.repository.AddressEntity; -import io.mifos.office.internal.repository.AddressRepository; -import io.mifos.office.internal.repository.EmployeeRepository; -import io.mifos.office.internal.repository.ExternalReferenceRepository; -import io.mifos.office.internal.repository.OfficeEntity; -import io.mifos.office.internal.repository.OfficeRepository; +package org.apache.fineract.cn.office.internal.service; + import java.util.ArrayList; import java.util.List; import java.util.Optional; import org.apache.fineract.cn.lang.ServiceException; +import org.apache.fineract.cn.office.ServiceConstants; +import org.apache.fineract.cn.office.api.v1.domain.Address; +import org.apache.fineract.cn.office.api.v1.domain.ExternalReference; +import org.apache.fineract.cn.office.api.v1.domain.Office; +import org.apache.fineract.cn.office.api.v1.domain.OfficePage; +import org.apache.fineract.cn.office.internal.mapper.AddressMapper; +import org.apache.fineract.cn.office.internal.mapper.OfficeMapper; +import org.apache.fineract.cn.office.internal.repository.AddressEntity; +import org.apache.fineract.cn.office.internal.repository.AddressRepository; +import org.apache.fineract.cn.office.internal.repository.EmployeeRepository; +import org.apache.fineract.cn.office.internal.repository.ExternalReferenceRepository; +import org.apache.fineract.cn.office.internal.repository.OfficeEntity; +import org.apache.fineract.cn.office.internal.repository.OfficeRepository; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/service/src/main/java/io/mifos/office/rest/config/OfficeRestConfiguration.java b/service/src/main/java/org/apache/fineract/cn/office/rest/config/OfficeRestConfiguration.java similarity index 91% rename from service/src/main/java/io/mifos/office/rest/config/OfficeRestConfiguration.java rename to service/src/main/java/org/apache/fineract/cn/office/rest/config/OfficeRestConfiguration.java index 334ce32..30ba0f1 100644 --- a/service/src/main/java/io/mifos/office/rest/config/OfficeRestConfiguration.java +++ b/service/src/main/java/org/apache/fineract/cn/office/rest/config/OfficeRestConfiguration.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.rest.config; +package org.apache.fineract.cn.office.rest.config; -import io.mifos.office.ServiceConstants; -import io.mifos.office.internal.config.OfficeServiceConfiguration; 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.office.ServiceConstants; +import org.apache.fineract.cn.office.internal.config.OfficeServiceConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -47,7 +47,7 @@ @EnableServiceException @EnableAnubis @ComponentScan({ - "io.mifos.office.rest.controller" + "org.apache.fineract.cn.office.rest.controller" }) @Import({ OfficeServiceConfiguration.class diff --git a/service/src/main/java/io/mifos/office/rest/controller/OfficeRestController.java b/service/src/main/java/org/apache/fineract/cn/office/rest/controller/OfficeRestController.java similarity index 92% rename from service/src/main/java/io/mifos/office/rest/controller/OfficeRestController.java rename to service/src/main/java/org/apache/fineract/cn/office/rest/controller/OfficeRestController.java index b403c65..6aedda1 100644 --- a/service/src/main/java/io/mifos/office/rest/controller/OfficeRestController.java +++ b/service/src/main/java/org/apache/fineract/cn/office/rest/controller/OfficeRestController.java @@ -16,31 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.office.rest.controller; - -import io.mifos.office.api.v1.PermittableGroupIds; -import io.mifos.office.api.v1.domain.Address; -import io.mifos.office.api.v1.domain.ContactDetail; -import io.mifos.office.api.v1.domain.Employee; -import io.mifos.office.api.v1.domain.EmployeePage; -import io.mifos.office.api.v1.domain.ExternalReference; -import io.mifos.office.api.v1.domain.Office; -import io.mifos.office.api.v1.domain.OfficePage; -import io.mifos.office.internal.command.AddBranchCommand; -import io.mifos.office.internal.command.AddExternalReferenceCommand; -import io.mifos.office.internal.command.CreateEmployeeCommand; -import io.mifos.office.internal.command.CreateOfficeCommand; -import io.mifos.office.internal.command.DeleteAddressOfOfficeCommand; -import io.mifos.office.internal.command.DeleteContactDetailCommand; -import io.mifos.office.internal.command.DeleteEmployeeCommand; -import io.mifos.office.internal.command.DeleteOfficeCommand; -import io.mifos.office.internal.command.InitializeServiceCommand; -import io.mifos.office.internal.command.SetAddressForOfficeCommand; -import io.mifos.office.internal.command.SetContactDetailsCommand; -import io.mifos.office.internal.command.UpdateEmployeeCommand; -import io.mifos.office.internal.command.UpdateOfficeCommand; -import io.mifos.office.internal.service.EmployeeService; -import io.mifos.office.internal.service.OfficeService; +package org.apache.fineract.cn.office.rest.controller; + +import org.apache.fineract.cn.office.api.v1.PermittableGroupIds; +import org.apache.fineract.cn.office.api.v1.domain.Address; +import org.apache.fineract.cn.office.api.v1.domain.ContactDetail; +import org.apache.fineract.cn.office.api.v1.domain.Employee; +import org.apache.fineract.cn.office.api.v1.domain.EmployeePage; +import org.apache.fineract.cn.office.api.v1.domain.ExternalReference; +import org.apache.fineract.cn.office.api.v1.domain.Office; +import org.apache.fineract.cn.office.api.v1.domain.OfficePage; import java.util.List; import java.util.Optional; import javax.validation.Valid; @@ -48,6 +33,21 @@ 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.apache.fineract.cn.office.internal.command.AddBranchCommand; +import org.apache.fineract.cn.office.internal.command.AddExternalReferenceCommand; +import org.apache.fineract.cn.office.internal.command.CreateEmployeeCommand; +import org.apache.fineract.cn.office.internal.command.CreateOfficeCommand; +import org.apache.fineract.cn.office.internal.command.DeleteAddressOfOfficeCommand; +import org.apache.fineract.cn.office.internal.command.DeleteContactDetailCommand; +import org.apache.fineract.cn.office.internal.command.DeleteEmployeeCommand; +import org.apache.fineract.cn.office.internal.command.DeleteOfficeCommand; +import org.apache.fineract.cn.office.internal.command.InitializeServiceCommand; +import org.apache.fineract.cn.office.internal.command.SetAddressForOfficeCommand; +import org.apache.fineract.cn.office.internal.command.SetContactDetailsCommand; +import org.apache.fineract.cn.office.internal.command.UpdateEmployeeCommand; +import org.apache.fineract.cn.office.internal.command.UpdateOfficeCommand; +import org.apache.fineract.cn.office.internal.service.EmployeeService; +import org.apache.fineract.cn.office.internal.service.OfficeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable;