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-payroll.git
commit 52de03e06164f07e713890f94ca359725a406ec5 Author: Myrle Krantz <[email protected]> AuthorDate: Mon Apr 16 14:05:36 2018 +0200 Change package names from mifos to apache fineract. --- .../cn}/payroll/api/v1/EventConstants.java | 2 +- .../cn}/payroll/api/v1/PermittableGroupIds.java | 2 +- .../api/v1/client/CustomerNotFoundException.java | 2 +- .../PayrollConfigurationNotFoundException.java | 2 +- .../PayrollDistributionValidationException.java | 2 +- .../cn}/payroll/api/v1/client/PayrollManager.java | 10 ++++----- .../client/PayrollPaymentValidationException.java | 2 +- .../payroll/api/v1/domain/PayrollAllocation.java | 2 +- .../api/v1/domain/PayrollCollectionHistory.java | 2 +- .../api/v1/domain/PayrollCollectionSheet.java | 2 +- .../api/v1/domain/PayrollConfiguration.java | 2 +- .../cn}/payroll/api/v1/domain/PayrollPayment.java | 2 +- .../payroll/api/v1/domain/PayrollPaymentPage.java | 2 +- .../fineract/cn}/payroll/AbstractPayrollTest.java | 12 +++++----- .../fineract/cn}/payroll/SuiteTestEnvironment.java | 2 +- .../cn}/payroll/TestPayrollConfiguration.java | 14 ++++++------ .../cn}/payroll/TestPayrollDistribution.java | 26 +++++++++++----------- .../apache/fineract/cn}/payroll/TestSuite.java | 2 +- .../cn}/payroll/domain/DomainObjectGenerator.java | 6 ++--- .../payroll/listener/MigrationEventListener.java | 4 ++-- .../listener/PayrollConfigurationListener.java | 6 ++--- .../listener/PayrollDistributionListener.java | 6 ++--- .../cn}/payroll/service/PayrollApplication.java | 2 +- .../service/PayrollServiceConfiguration.java | 12 +++++----- .../cn}/payroll/service/ServiceConstants.java | 2 +- .../internal/command/DistributePayrollCommand.java | 4 ++-- .../internal/command/MigrateServiceCommand.java | 2 +- .../command/PutPayrollConfigurationCommand.java | 4 ++-- .../command/handler/MigrationAggregate.java | 4 ++-- .../handler/PayrollConfigurationAggregate.java | 22 +++++++++--------- .../handler/PayrollDistributionAggregate.java | 22 +++++++++--------- .../internal/mapper/PayrollAllocationMapper.java | 6 ++--- .../mapper/PayrollConfigurationMapper.java | 6 ++--- .../internal/mapper/PayrollPaymentMapper.java | 6 ++--- .../repository/PayrollAllocationEntity.java | 2 +- .../repository/PayrollAllocationRepository.java | 2 +- .../repository/PayrollCollectionEntity.java | 2 +- .../repository/PayrollCollectionRepository.java | 2 +- .../repository/PayrollConfigurationEntity.java | 2 +- .../repository/PayrollConfigurationRepository.java | 2 +- .../internal/repository/PayrollPaymentEntity.java | 2 +- .../repository/PayrollPaymentRepository.java | 2 +- .../service/PayrollConfigurationService.java | 20 ++++++++--------- .../service/PayrollDistributionService.java | 20 ++++++++--------- .../service/adaptor/AccountingAdaptor.java | 10 ++++----- .../internal/service/adaptor/CustomerAdaptor.java | 4 ++-- .../service/rest/MigrationRestController.java | 4 ++-- .../rest/PayrollConfigurationRestController.java | 14 ++++++------ .../rest/PayrollDistributionRestController.java | 24 ++++++++++---------- .../payroll/service/rest/util/PageableBuilder.java | 2 +- 50 files changed, 159 insertions(+), 159 deletions(-) diff --git a/api/src/main/java/io/mifos/payroll/api/v1/EventConstants.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/EventConstants.java similarity index 97% rename from api/src/main/java/io/mifos/payroll/api/v1/EventConstants.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/EventConstants.java index 17cd448..bbf0ac2 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/EventConstants.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/EventConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1; +package org.apache.fineract.cn.payroll.api.v1; @SuppressWarnings("unused") public interface EventConstants { diff --git a/api/src/main/java/io/mifos/payroll/api/v1/PermittableGroupIds.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/PermittableGroupIds.java similarity index 95% rename from api/src/main/java/io/mifos/payroll/api/v1/PermittableGroupIds.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/PermittableGroupIds.java index d6dbe1b..06528c3 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/PermittableGroupIds.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/PermittableGroupIds.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1; +package org.apache.fineract.cn.payroll.api.v1; @SuppressWarnings("unused") public interface PermittableGroupIds { diff --git a/api/src/main/java/io/mifos/payroll/api/v1/client/CustomerNotFoundException.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/CustomerNotFoundException.java similarity index 94% rename from api/src/main/java/io/mifos/payroll/api/v1/client/CustomerNotFoundException.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/CustomerNotFoundException.java index 2168504..a59ce73 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/client/CustomerNotFoundException.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/CustomerNotFoundException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.client; +package org.apache.fineract.cn.payroll.api.v1.client; public class CustomerNotFoundException extends RuntimeException { } diff --git a/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollConfigurationNotFoundException.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollConfigurationNotFoundException.java similarity index 94% rename from api/src/main/java/io/mifos/payroll/api/v1/client/PayrollConfigurationNotFoundException.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollConfigurationNotFoundException.java index 44dff96..94c05c6 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollConfigurationNotFoundException.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollConfigurationNotFoundException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.client; +package org.apache.fineract.cn.payroll.api.v1.client; public class PayrollConfigurationNotFoundException extends RuntimeException { } diff --git a/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollDistributionValidationException.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollDistributionValidationException.java similarity index 94% rename from api/src/main/java/io/mifos/payroll/api/v1/client/PayrollDistributionValidationException.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollDistributionValidationException.java index e4d73f8..a604090 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollDistributionValidationException.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollDistributionValidationException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.client; +package org.apache.fineract.cn.payroll.api.v1.client; public class PayrollDistributionValidationException extends RuntimeException { } diff --git a/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollManager.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollManager.java similarity index 92% rename from api/src/main/java/io/mifos/payroll/api/v1/client/PayrollManager.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollManager.java index bbc410e..bae7952 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollManager.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollManager.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.client; +package org.apache.fineract.cn.payroll.api.v1.client; -import io.mifos.payroll.api.v1.domain.PayrollCollectionHistory; -import io.mifos.payroll.api.v1.domain.PayrollCollectionSheet; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; -import io.mifos.payroll.api.v1.domain.PayrollPaymentPage; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollCollectionHistory; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollCollectionSheet; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollPaymentPage; 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/payroll/api/v1/client/PayrollPaymentValidationException.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollPaymentValidationException.java similarity index 94% rename from api/src/main/java/io/mifos/payroll/api/v1/client/PayrollPaymentValidationException.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollPaymentValidationException.java index dc016cb..fd249e2 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollPaymentValidationException.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollPaymentValidationException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.client; +package org.apache.fineract.cn.payroll.api.v1.client; public class PayrollPaymentValidationException extends RuntimeException { } diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollAllocation.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollAllocation.java similarity index 97% rename from api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollAllocation.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollAllocation.java index 9bc8e45..ee4fb4a 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollAllocation.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollAllocation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.domain; +package org.apache.fineract.cn.payroll.api.v1.domain; import java.math.BigDecimal; import javax.validation.constraints.DecimalMax; diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionHistory.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollCollectionHistory.java similarity index 97% rename from api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionHistory.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollCollectionHistory.java index 876f0c4..3180fd8 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionHistory.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollCollectionHistory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.domain; +package org.apache.fineract.cn.payroll.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/payroll/api/v1/domain/PayrollCollectionSheet.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollCollectionSheet.java similarity index 96% rename from api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionSheet.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollCollectionSheet.java index 5f493a1..be5da6e 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionSheet.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollCollectionSheet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.domain; +package org.apache.fineract.cn.payroll.api.v1.domain; import java.util.List; import javax.validation.Valid; diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollConfiguration.java similarity index 97% rename from api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollConfiguration.java index 35757ee..60aa71d 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.domain; +package org.apache.fineract.cn.payroll.api.v1.domain; import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollPayment.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollPayment.java similarity index 97% rename from api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollPayment.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollPayment.java index cc38f75..b40ad83 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollPayment.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollPayment.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.domain; +package org.apache.fineract.cn.payroll.api.v1.domain; import java.math.BigDecimal; import javax.validation.constraints.DecimalMax; diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollPaymentPage.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollPaymentPage.java similarity index 97% rename from api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollPaymentPage.java rename to api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollPaymentPage.java index 33aeb97..e6c587c 100644 --- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollPaymentPage.java +++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollPaymentPage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.api.v1.domain; +package org.apache.fineract.cn.payroll.api.v1.domain; import java.util.ArrayList; import java.util.List; diff --git a/component-test/src/main/java/io/mifos/payroll/AbstractPayrollTest.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java similarity index 91% rename from component-test/src/main/java/io/mifos/payroll/AbstractPayrollTest.java rename to component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java index be6f8ce..2030b48 100644 --- a/component-test/src/main/java/io/mifos/payroll/AbstractPayrollTest.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll; +package org.apache.fineract.cn.payroll; -import io.mifos.payroll.api.v1.EventConstants; -import io.mifos.payroll.api.v1.client.PayrollManager; -import io.mifos.payroll.service.PayrollServiceConfiguration; +import org.apache.fineract.cn.payroll.api.v1.EventConstants; +import org.apache.fineract.cn.payroll.api.v1.client.PayrollManager; +import org.apache.fineract.cn.payroll.service.PayrollServiceConfiguration; import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; import org.apache.fineract.cn.api.context.AutoUserContext; import org.apache.fineract.cn.test.fixture.TenantDataStoreContextTestRule; @@ -53,12 +53,12 @@ public class AbstractPayrollTest extends SuiteTestEnvironment { @Configuration @EnableEventRecording @EnableFeignClients(basePackages = { - "io.mifos.payroll.api.v1.client" + "org.apache.fineract.cn.payroll.api.v1.client" }) @RibbonClient(name = SuiteTestEnvironment.APP_NAME) @ComponentScan( basePackages = { - "io.mifos.payroll.listener" + "org.apache.fineract.cn.payroll.listener" } ) @Import({ diff --git a/component-test/src/main/java/io/mifos/payroll/SuiteTestEnvironment.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/SuiteTestEnvironment.java similarity index 98% rename from component-test/src/main/java/io/mifos/payroll/SuiteTestEnvironment.java rename to component-test/src/main/java/org/apache/fineract/cn/payroll/SuiteTestEnvironment.java index 4eb6812..ebe1880 100644 --- a/component-test/src/main/java/io/mifos/payroll/SuiteTestEnvironment.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/SuiteTestEnvironment.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll; +package org.apache.fineract.cn.payroll; import org.apache.fineract.cn.test.env.TestEnvironment; import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; diff --git a/component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/TestPayrollConfiguration.java similarity index 91% rename from component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java rename to component-test/src/main/java/org/apache/fineract/cn/payroll/TestPayrollConfiguration.java index 82e49a2..b79b6a3 100644 --- a/component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/TestPayrollConfiguration.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll; +package org.apache.fineract.cn.payroll; import com.google.common.collect.Lists; -import io.mifos.payroll.api.v1.EventConstants; -import io.mifos.payroll.api.v1.domain.PayrollAllocation; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; -import io.mifos.payroll.domain.DomainObjectGenerator; -import io.mifos.payroll.service.internal.service.adaptor.AccountingAdaptor; -import io.mifos.payroll.service.internal.service.adaptor.CustomerAdaptor; +import org.apache.fineract.cn.payroll.api.v1.EventConstants; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollAllocation; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.domain.DomainObjectGenerator; +import org.apache.fineract.cn.payroll.service.internal.service.adaptor.AccountingAdaptor; +import org.apache.fineract.cn.payroll.service.internal.service.adaptor.CustomerAdaptor; import java.math.BigDecimal; import java.util.Optional; import org.apache.commons.lang3.RandomStringUtils; diff --git a/component-test/src/main/java/io/mifos/payroll/TestPayrollDistribution.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/TestPayrollDistribution.java similarity index 90% rename from component-test/src/main/java/io/mifos/payroll/TestPayrollDistribution.java rename to component-test/src/main/java/org/apache/fineract/cn/payroll/TestPayrollDistribution.java index 0d1e358..2b759eb 100644 --- a/component-test/src/main/java/io/mifos/payroll/TestPayrollDistribution.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/TestPayrollDistribution.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll; +package org.apache.fineract.cn.payroll; import com.google.common.collect.Lists; -import io.mifos.payroll.api.v1.EventConstants; -import io.mifos.payroll.api.v1.client.PayrollPaymentValidationException; -import io.mifos.payroll.api.v1.domain.PayrollAllocation; -import io.mifos.payroll.api.v1.domain.PayrollCollectionHistory; -import io.mifos.payroll.api.v1.domain.PayrollCollectionSheet; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; -import io.mifos.payroll.api.v1.domain.PayrollPayment; -import io.mifos.payroll.api.v1.domain.PayrollPaymentPage; -import io.mifos.payroll.domain.DomainObjectGenerator; -import io.mifos.payroll.service.internal.repository.PayrollCollectionEntity; -import io.mifos.payroll.service.internal.service.adaptor.AccountingAdaptor; -import io.mifos.payroll.service.internal.service.adaptor.CustomerAdaptor; +import org.apache.fineract.cn.payroll.api.v1.EventConstants; +import org.apache.fineract.cn.payroll.api.v1.client.PayrollPaymentValidationException; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollAllocation; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollCollectionHistory; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollCollectionSheet; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollPayment; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollPaymentPage; +import org.apache.fineract.cn.payroll.domain.DomainObjectGenerator; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollCollectionEntity; +import org.apache.fineract.cn.payroll.service.internal.service.adaptor.AccountingAdaptor; +import org.apache.fineract.cn.payroll.service.internal.service.adaptor.CustomerAdaptor; import java.math.BigDecimal; import java.util.List; import java.util.Optional; diff --git a/component-test/src/main/java/io/mifos/payroll/TestSuite.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/TestSuite.java similarity index 96% rename from component-test/src/main/java/io/mifos/payroll/TestSuite.java rename to component-test/src/main/java/org/apache/fineract/cn/payroll/TestSuite.java index 18994aa..5fe0817 100644 --- a/component-test/src/main/java/io/mifos/payroll/TestSuite.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/TestSuite.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll; +package org.apache.fineract.cn.payroll; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/component-test/src/main/java/io/mifos/payroll/domain/DomainObjectGenerator.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/domain/DomainObjectGenerator.java similarity index 90% rename from component-test/src/main/java/io/mifos/payroll/domain/DomainObjectGenerator.java rename to component-test/src/main/java/org/apache/fineract/cn/payroll/domain/DomainObjectGenerator.java index c97cc29..bfa6f7e 100644 --- a/component-test/src/main/java/io/mifos/payroll/domain/DomainObjectGenerator.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/domain/DomainObjectGenerator.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.domain; +package org.apache.fineract.cn.payroll.domain; -import io.mifos.payroll.api.v1.domain.PayrollAllocation; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollAllocation; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; import org.apache.commons.lang3.RandomStringUtils; import java.math.BigDecimal; diff --git a/component-test/src/main/java/io/mifos/payroll/listener/MigrationEventListener.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/listener/MigrationEventListener.java similarity index 94% rename from component-test/src/main/java/io/mifos/payroll/listener/MigrationEventListener.java rename to component-test/src/main/java/org/apache/fineract/cn/payroll/listener/MigrationEventListener.java index 2a33ca6..2cb7a17 100644 --- a/component-test/src/main/java/io/mifos/payroll/listener/MigrationEventListener.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/listener/MigrationEventListener.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.listener; +package org.apache.fineract.cn.payroll.listener; -import io.mifos.payroll.api.v1.EventConstants; +import org.apache.fineract.cn.payroll.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/payroll/listener/PayrollConfigurationListener.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/listener/PayrollConfigurationListener.java similarity index 92% rename from component-test/src/main/java/io/mifos/payroll/listener/PayrollConfigurationListener.java rename to component-test/src/main/java/org/apache/fineract/cn/payroll/listener/PayrollConfigurationListener.java index 14894e1..dfb5984 100644 --- a/component-test/src/main/java/io/mifos/payroll/listener/PayrollConfigurationListener.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/listener/PayrollConfigurationListener.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.listener; +package org.apache.fineract.cn.payroll.listener; -import io.mifos.payroll.api.v1.EventConstants; -import io.mifos.payroll.service.ServiceConstants; +import org.apache.fineract.cn.payroll.api.v1.EventConstants; +import org.apache.fineract.cn.payroll.service.ServiceConstants; import org.apache.fineract.cn.lang.config.TenantHeaderFilter; import org.apache.fineract.cn.test.listener.EventRecorder; import org.slf4j.Logger; diff --git a/component-test/src/main/java/io/mifos/payroll/listener/PayrollDistributionListener.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/listener/PayrollDistributionListener.java similarity index 92% rename from component-test/src/main/java/io/mifos/payroll/listener/PayrollDistributionListener.java rename to component-test/src/main/java/org/apache/fineract/cn/payroll/listener/PayrollDistributionListener.java index b99f1fd..2f89973 100644 --- a/component-test/src/main/java/io/mifos/payroll/listener/PayrollDistributionListener.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/listener/PayrollDistributionListener.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.listener; +package org.apache.fineract.cn.payroll.listener; -import io.mifos.payroll.api.v1.EventConstants; -import io.mifos.payroll.service.ServiceConstants; +import org.apache.fineract.cn.payroll.api.v1.EventConstants; +import org.apache.fineract.cn.payroll.service.ServiceConstants; import org.apache.fineract.cn.lang.config.TenantHeaderFilter; import org.apache.fineract.cn.test.listener.EventRecorder; import org.slf4j.Logger; diff --git a/service/src/main/java/io/mifos/payroll/service/PayrollApplication.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/PayrollApplication.java similarity index 95% rename from service/src/main/java/io/mifos/payroll/service/PayrollApplication.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/PayrollApplication.java index 6caf110..01635dc 100644 --- a/service/src/main/java/io/mifos/payroll/service/PayrollApplication.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/PayrollApplication.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service; +package org.apache.fineract.cn.payroll.service; import org.springframework.boot.SpringApplication; diff --git a/service/src/main/java/io/mifos/payroll/service/PayrollServiceConfiguration.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/PayrollServiceConfiguration.java similarity index 88% rename from service/src/main/java/io/mifos/payroll/service/PayrollServiceConfiguration.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/PayrollServiceConfiguration.java index 3e94283..ab36995 100644 --- a/service/src/main/java/io/mifos/payroll/service/PayrollServiceConfiguration.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/PayrollServiceConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service; +package org.apache.fineract.cn.payroll.service; import org.apache.fineract.cn.accounting.api.v1.client.LedgerManager; import org.apache.fineract.cn.anubis.config.EnableAnubis; @@ -55,13 +55,13 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter CustomerManager.class }) @ComponentScan({ - "io.mifos.payroll.service.rest", - "io.mifos.payroll.service.internal.service", - "io.mifos.payroll.service.internal.repository", - "io.mifos.payroll.service.internal.command.handler" + "org.apache.fineract.cn.payroll.service.rest", + "org.apache.fineract.cn.payroll.service.internal.service", + "org.apache.fineract.cn.payroll.service.internal.repository", + "org.apache.fineract.cn.payroll.service.internal.command.handler" }) @EnableJpaRepositories({ - "io.mifos.payroll.service.internal.repository" + "org.apache.fineract.cn.payroll.service.internal.repository" }) public class PayrollServiceConfiguration extends WebMvcConfigurerAdapter { diff --git a/service/src/main/java/io/mifos/payroll/service/ServiceConstants.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/ServiceConstants.java similarity index 94% rename from service/src/main/java/io/mifos/payroll/service/ServiceConstants.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/ServiceConstants.java index f379023..e6f7664 100644 --- a/service/src/main/java/io/mifos/payroll/service/ServiceConstants.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/ServiceConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service; +package org.apache.fineract.cn.payroll.service; public interface ServiceConstants { String LOGGER_NAME = "payroll-logger"; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/command/DistributePayrollCommand.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/DistributePayrollCommand.java similarity index 89% rename from service/src/main/java/io/mifos/payroll/service/internal/command/DistributePayrollCommand.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/DistributePayrollCommand.java index 44dec7e..e6a7583 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/command/DistributePayrollCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/DistributePayrollCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.command; +package org.apache.fineract.cn.payroll.service.internal.command; -import io.mifos.payroll.api.v1.domain.PayrollCollectionSheet; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollCollectionSheet; public class DistributePayrollCommand { private final PayrollCollectionSheet payrollCollectionSheet; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/command/MigrateServiceCommand.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/MigrateServiceCommand.java similarity index 93% rename from service/src/main/java/io/mifos/payroll/service/internal/command/MigrateServiceCommand.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/MigrateServiceCommand.java index 7053c9a..ba3b948 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/command/MigrateServiceCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/MigrateServiceCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.command; +package org.apache.fineract.cn.payroll.service.internal.command; public class MigrateServiceCommand { public MigrateServiceCommand() { diff --git a/service/src/main/java/io/mifos/payroll/service/internal/command/PutPayrollConfigurationCommand.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/PutPayrollConfigurationCommand.java similarity index 91% rename from service/src/main/java/io/mifos/payroll/service/internal/command/PutPayrollConfigurationCommand.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/PutPayrollConfigurationCommand.java index b1f6ab7..3eddc0c 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/command/PutPayrollConfigurationCommand.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/PutPayrollConfigurationCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.command; +package org.apache.fineract.cn.payroll.service.internal.command; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; public class PutPayrollConfigurationCommand { private final String customerIdentifier; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/handler/MigrationAggregate.java similarity index 93% rename from service/src/main/java/io/mifos/payroll/service/internal/command/handler/MigrationAggregate.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/handler/MigrationAggregate.java index 7e836fb..ba185a4 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/MigrationAggregate.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/handler/MigrationAggregate.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.command.handler; +package org.apache.fineract.cn.payroll.service.internal.command.handler; -import io.mifos.payroll.service.internal.command.MigrateServiceCommand; +import org.apache.fineract.cn.payroll.service.internal.command.MigrateServiceCommand; import javax.sql.DataSource; import org.apache.fineract.cn.accounting.api.v1.EventConstants; import org.apache.fineract.cn.command.annotation.Aggregate; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java similarity index 83% rename from service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java index b1ca617..2d016ae 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.command.handler; +package org.apache.fineract.cn.payroll.service.internal.command.handler; -import io.mifos.payroll.api.v1.EventConstants; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; -import io.mifos.payroll.service.ServiceConstants; -import io.mifos.payroll.service.internal.command.PutPayrollConfigurationCommand; -import io.mifos.payroll.service.internal.mapper.PayrollAllocationMapper; -import io.mifos.payroll.service.internal.repository.PayrollAllocationEntity; -import io.mifos.payroll.service.internal.repository.PayrollAllocationRepository; -import io.mifos.payroll.service.internal.repository.PayrollConfigurationEntity; -import io.mifos.payroll.service.internal.repository.PayrollConfigurationRepository; -import io.mifos.payroll.service.internal.service.PayrollConfigurationService; +import org.apache.fineract.cn.payroll.api.v1.EventConstants; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.service.ServiceConstants; +import org.apache.fineract.cn.payroll.service.internal.command.PutPayrollConfigurationCommand; +import org.apache.fineract.cn.payroll.service.internal.mapper.PayrollAllocationMapper; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollAllocationEntity; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollAllocationRepository; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollConfigurationEntity; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollConfigurationRepository; +import org.apache.fineract.cn.payroll.service.internal.service.PayrollConfigurationService; import java.time.Clock; import java.time.LocalDateTime; import java.util.Optional; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollDistributionAggregate.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/handler/PayrollDistributionAggregate.java similarity index 83% rename from service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollDistributionAggregate.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/handler/PayrollDistributionAggregate.java index 61470b4..322afec 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollDistributionAggregate.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/command/handler/PayrollDistributionAggregate.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.command.handler; +package org.apache.fineract.cn.payroll.service.internal.command.handler; -import io.mifos.payroll.api.v1.EventConstants; -import io.mifos.payroll.api.v1.domain.PayrollCollectionSheet; -import io.mifos.payroll.service.ServiceConstants; -import io.mifos.payroll.service.internal.command.DistributePayrollCommand; -import io.mifos.payroll.service.internal.repository.PayrollCollectionEntity; -import io.mifos.payroll.service.internal.repository.PayrollCollectionRepository; -import io.mifos.payroll.service.internal.repository.PayrollPaymentEntity; -import io.mifos.payroll.service.internal.repository.PayrollPaymentRepository; -import io.mifos.payroll.service.internal.service.PayrollConfigurationService; -import io.mifos.payroll.service.internal.service.adaptor.AccountingAdaptor; +import org.apache.fineract.cn.payroll.api.v1.EventConstants; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollCollectionSheet; +import org.apache.fineract.cn.payroll.service.ServiceConstants; +import org.apache.fineract.cn.payroll.service.internal.command.DistributePayrollCommand; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollCollectionEntity; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollCollectionRepository; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollPaymentEntity; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollPaymentRepository; +import org.apache.fineract.cn.payroll.service.internal.service.PayrollConfigurationService; +import org.apache.fineract.cn.payroll.service.internal.service.adaptor.AccountingAdaptor; import java.time.Clock; import java.time.LocalDateTime; import java.util.Optional; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollAllocationMapper.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/mapper/PayrollAllocationMapper.java similarity index 88% rename from service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollAllocationMapper.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/mapper/PayrollAllocationMapper.java index 5c9e752..2b948f1 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollAllocationMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/mapper/PayrollAllocationMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.mapper; +package org.apache.fineract.cn.payroll.service.internal.mapper; -import io.mifos.payroll.api.v1.domain.PayrollAllocation; -import io.mifos.payroll.service.internal.repository.PayrollAllocationEntity; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollAllocation; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollAllocationEntity; public class PayrollAllocationMapper { diff --git a/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/mapper/PayrollConfigurationMapper.java similarity index 88% rename from service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/mapper/PayrollConfigurationMapper.java index 4429ff5..450c48b 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/mapper/PayrollConfigurationMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.mapper; +package org.apache.fineract.cn.payroll.service.internal.mapper; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; -import io.mifos.payroll.service.internal.repository.PayrollConfigurationEntity; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollConfigurationEntity; import org.apache.fineract.cn.lang.DateConverter; public class PayrollConfigurationMapper { diff --git a/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollPaymentMapper.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/mapper/PayrollPaymentMapper.java similarity index 86% rename from service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollPaymentMapper.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/mapper/PayrollPaymentMapper.java index b52ebec..9fa087d 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollPaymentMapper.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/mapper/PayrollPaymentMapper.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.mapper; +package org.apache.fineract.cn.payroll.service.internal.mapper; -import io.mifos.payroll.api.v1.domain.PayrollPayment; -import io.mifos.payroll.service.internal.repository.PayrollPaymentEntity; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollPayment; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollPaymentEntity; public class PayrollPaymentMapper { diff --git a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollAllocationEntity.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollAllocationEntity.java similarity index 97% rename from service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollAllocationEntity.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollAllocationEntity.java index ed7e0c4..415e4cd 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollAllocationEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollAllocationEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.repository; +package org.apache.fineract.cn.payroll.service.internal.repository; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollAllocationRepository.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollAllocationRepository.java similarity index 94% rename from service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollAllocationRepository.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollAllocationRepository.java index 9826c10..bd2782e 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollAllocationRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollAllocationRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.repository; +package org.apache.fineract.cn.payroll.service.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollCollectionEntity.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollCollectionEntity.java similarity index 97% rename from service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollCollectionEntity.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollCollectionEntity.java index 4c999aa..92fdad3 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollCollectionEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollCollectionEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.repository; +package org.apache.fineract.cn.payroll.service.internal.repository; import java.time.LocalDateTime; import javax.persistence.Column; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollCollectionRepository.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollCollectionRepository.java similarity index 94% rename from service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollCollectionRepository.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollCollectionRepository.java index 98ead7f..a4da0ba 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollCollectionRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollCollectionRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.repository; +package org.apache.fineract.cn.payroll.service.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollConfigurationEntity.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollConfigurationEntity.java similarity index 97% rename from service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollConfigurationEntity.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollConfigurationEntity.java index 23ddebd..aaf99fa 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollConfigurationEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollConfigurationEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.repository; +package org.apache.fineract.cn.payroll.service.internal.repository; import java.time.LocalDateTime; import javax.persistence.Column; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollConfigurationRepository.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollConfigurationRepository.java similarity index 94% rename from service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollConfigurationRepository.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollConfigurationRepository.java index 9d8a4b3..23d93c3 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollConfigurationRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollConfigurationRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.repository; +package org.apache.fineract.cn.payroll.service.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollPaymentEntity.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollPaymentEntity.java similarity index 97% rename from service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollPaymentEntity.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollPaymentEntity.java index 36ca60c..c0620c7 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollPaymentEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollPaymentEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.repository; +package org.apache.fineract.cn.payroll.service.internal.repository; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollPaymentRepository.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollPaymentRepository.java similarity index 95% rename from service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollPaymentRepository.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollPaymentRepository.java index 60f624f..5b3fc7a 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollPaymentRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/repository/PayrollPaymentRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.repository; +package org.apache.fineract.cn.payroll.service.internal.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/PayrollConfigurationService.java similarity index 80% rename from service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/PayrollConfigurationService.java index 3385436..96c1d14 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/PayrollConfigurationService.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.service; +package org.apache.fineract.cn.payroll.service.internal.service; -import io.mifos.payroll.api.v1.domain.PayrollAllocation; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; -import io.mifos.payroll.service.ServiceConstants; -import io.mifos.payroll.service.internal.mapper.PayrollAllocationMapper; -import io.mifos.payroll.service.internal.mapper.PayrollConfigurationMapper; -import io.mifos.payroll.service.internal.repository.PayrollAllocationRepository; -import io.mifos.payroll.service.internal.repository.PayrollConfigurationRepository; -import io.mifos.payroll.service.internal.service.adaptor.AccountingAdaptor; -import io.mifos.payroll.service.internal.service.adaptor.CustomerAdaptor; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollAllocation; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.service.ServiceConstants; +import org.apache.fineract.cn.payroll.service.internal.mapper.PayrollAllocationMapper; +import org.apache.fineract.cn.payroll.service.internal.mapper.PayrollConfigurationMapper; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollAllocationRepository; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollConfigurationRepository; +import org.apache.fineract.cn.payroll.service.internal.service.adaptor.AccountingAdaptor; +import org.apache.fineract.cn.payroll.service.internal.service.adaptor.CustomerAdaptor; import java.util.Comparator; import java.util.Optional; import java.util.stream.Collectors; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollDistributionService.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/PayrollDistributionService.java similarity index 83% rename from service/src/main/java/io/mifos/payroll/service/internal/service/PayrollDistributionService.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/PayrollDistributionService.java index 4eadd63..293d48b 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollDistributionService.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/PayrollDistributionService.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.service; +package org.apache.fineract.cn.payroll.service.internal.service; -import io.mifos.payroll.api.v1.domain.PayrollCollectionHistory; -import io.mifos.payroll.api.v1.domain.PayrollPaymentPage; -import io.mifos.payroll.service.ServiceConstants; -import io.mifos.payroll.service.internal.mapper.PayrollPaymentMapper; -import io.mifos.payroll.service.internal.repository.PayrollCollectionEntity; -import io.mifos.payroll.service.internal.repository.PayrollCollectionRepository; -import io.mifos.payroll.service.internal.repository.PayrollPaymentEntity; -import io.mifos.payroll.service.internal.repository.PayrollPaymentRepository; -import io.mifos.payroll.service.internal.service.adaptor.AccountingAdaptor; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollCollectionHistory; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollPaymentPage; +import org.apache.fineract.cn.payroll.service.ServiceConstants; +import org.apache.fineract.cn.payroll.service.internal.mapper.PayrollPaymentMapper; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollCollectionEntity; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollCollectionRepository; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollPaymentEntity; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollPaymentRepository; +import org.apache.fineract.cn.payroll.service.internal.service.adaptor.AccountingAdaptor; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/AccountingAdaptor.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/adaptor/AccountingAdaptor.java similarity index 93% rename from service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/AccountingAdaptor.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/adaptor/AccountingAdaptor.java index 7f6fab0..d4c5c51 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/AccountingAdaptor.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/adaptor/AccountingAdaptor.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.service.adaptor; +package org.apache.fineract.cn.payroll.service.internal.service.adaptor; import com.google.common.collect.Sets; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; -import io.mifos.payroll.api.v1.domain.PayrollPayment; -import io.mifos.payroll.service.ServiceConstants; -import io.mifos.payroll.service.internal.repository.PayrollCollectionEntity; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollPayment; +import org.apache.fineract.cn.payroll.service.ServiceConstants; +import org.apache.fineract.cn.payroll.service.internal.repository.PayrollCollectionEntity; import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; diff --git a/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/CustomerAdaptor.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/adaptor/CustomerAdaptor.java similarity index 93% rename from service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/CustomerAdaptor.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/adaptor/CustomerAdaptor.java index 713a495..a350e02 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/CustomerAdaptor.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/internal/service/adaptor/CustomerAdaptor.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.internal.service.adaptor; +package org.apache.fineract.cn.payroll.service.internal.service.adaptor; -import io.mifos.payroll.service.ServiceConstants; +import org.apache.fineract.cn.payroll.service.ServiceConstants; import java.util.Optional; import org.apache.fineract.cn.customer.api.v1.client.CustomerManager; import org.apache.fineract.cn.customer.api.v1.client.CustomerNotFoundException; diff --git a/service/src/main/java/io/mifos/payroll/service/rest/MigrationRestController.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/MigrationRestController.java similarity index 93% rename from service/src/main/java/io/mifos/payroll/service/rest/MigrationRestController.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/rest/MigrationRestController.java index 997dd32..268e4f8 100644 --- a/service/src/main/java/io/mifos/payroll/service/rest/MigrationRestController.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/MigrationRestController.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.rest; +package org.apache.fineract.cn.payroll.service.rest; -import io.mifos.payroll.service.internal.command.MigrateServiceCommand; +import org.apache.fineract.cn.payroll.service.internal.command.MigrateServiceCommand; import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; import org.apache.fineract.cn.anubis.annotation.Permittable; import org.apache.fineract.cn.command.gateway.CommandGateway; diff --git a/service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/PayrollConfigurationRestController.java similarity index 90% rename from service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/rest/PayrollConfigurationRestController.java index 84782ee..32aa19b 100644 --- a/service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/PayrollConfigurationRestController.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.rest; +package org.apache.fineract.cn.payroll.service.rest; -import io.mifos.payroll.api.v1.PermittableGroupIds; -import io.mifos.payroll.api.v1.domain.PayrollAllocation; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; -import io.mifos.payroll.service.ServiceConstants; -import io.mifos.payroll.service.internal.command.PutPayrollConfigurationCommand; -import io.mifos.payroll.service.internal.service.PayrollConfigurationService; +import org.apache.fineract.cn.payroll.api.v1.PermittableGroupIds; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollAllocation; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.service.ServiceConstants; +import org.apache.fineract.cn.payroll.service.internal.command.PutPayrollConfigurationCommand; +import org.apache.fineract.cn.payroll.service.internal.service.PayrollConfigurationService; import java.util.List; import javax.validation.Valid; import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; diff --git a/service/src/main/java/io/mifos/payroll/service/rest/PayrollDistributionRestController.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/PayrollDistributionRestController.java similarity index 87% rename from service/src/main/java/io/mifos/payroll/service/rest/PayrollDistributionRestController.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/rest/PayrollDistributionRestController.java index a4c2435..801a92b 100644 --- a/service/src/main/java/io/mifos/payroll/service/rest/PayrollDistributionRestController.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/PayrollDistributionRestController.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.rest; +package org.apache.fineract.cn.payroll.service.rest; -import io.mifos.payroll.api.v1.PermittableGroupIds; -import io.mifos.payroll.api.v1.domain.PayrollCollectionHistory; -import io.mifos.payroll.api.v1.domain.PayrollCollectionSheet; -import io.mifos.payroll.api.v1.domain.PayrollConfiguration; -import io.mifos.payroll.api.v1.domain.PayrollPaymentPage; -import io.mifos.payroll.service.ServiceConstants; -import io.mifos.payroll.service.internal.command.DistributePayrollCommand; -import io.mifos.payroll.service.internal.service.PayrollConfigurationService; -import io.mifos.payroll.service.internal.service.PayrollDistributionService; -import io.mifos.payroll.service.internal.service.adaptor.AccountingAdaptor; -import io.mifos.payroll.service.rest.util.PageableBuilder; +import org.apache.fineract.cn.payroll.api.v1.PermittableGroupIds; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollCollectionHistory; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollCollectionSheet; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollConfiguration; +import org.apache.fineract.cn.payroll.api.v1.domain.PayrollPaymentPage; +import org.apache.fineract.cn.payroll.service.ServiceConstants; +import org.apache.fineract.cn.payroll.service.internal.command.DistributePayrollCommand; +import org.apache.fineract.cn.payroll.service.internal.service.PayrollConfigurationService; +import org.apache.fineract.cn.payroll.service.internal.service.PayrollDistributionService; +import org.apache.fineract.cn.payroll.service.internal.service.adaptor.AccountingAdaptor; +import org.apache.fineract.cn.payroll.service.rest.util.PageableBuilder; import java.util.List; import javax.validation.Valid; import org.apache.fineract.cn.accounting.api.v1.domain.Account; diff --git a/service/src/main/java/io/mifos/payroll/service/rest/util/PageableBuilder.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/util/PageableBuilder.java similarity index 96% rename from service/src/main/java/io/mifos/payroll/service/rest/util/PageableBuilder.java rename to service/src/main/java/org/apache/fineract/cn/payroll/service/rest/util/PageableBuilder.java index 8a7ec5a..82befa0 100644 --- a/service/src/main/java/io/mifos/payroll/service/rest/util/PageableBuilder.java +++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/util/PageableBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.payroll.service.rest.util; +package org.apache.fineract.cn.payroll.service.rest.util; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable;
