You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by aw...@apache.org on 2019/06/03 19:03:10 UTC
[fineract-cn-payroll] 35/50: Adjusting to package name changes in
upstream repositories.
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 ba4109b158828bf3e713a2faa9108d16a823acb2
Author: Myrle Krantz <my...@apache.org>
AuthorDate: Mon Apr 16 14:03:09 2018 +0200
Adjusting to package name changes in upstream repositories.
---
.../payroll/api/v1/client/PayrollManager.java | 11 +++++------
.../payroll/api/v1/domain/PayrollAllocation.java | 5 ++---
.../api/v1/domain/PayrollCollectionHistory.java | 3 +--
.../api/v1/domain/PayrollCollectionSheet.java | 7 +++----
.../api/v1/domain/PayrollConfiguration.java | 5 ++---
.../payroll/api/v1/domain/PayrollPayment.java | 5 ++---
.../java/io/mifos/payroll/AbstractPayrollTest.java | 10 +++++-----
.../io/mifos/payroll/SuiteTestEnvironment.java | 6 +++---
.../io/mifos/payroll/TestPayrollConfiguration.java | 9 ++++-----
.../io/mifos/payroll/TestPayrollDistribution.java | 11 +++++------
.../payroll/listener/MigrationEventListener.java | 4 ++--
.../listener/PayrollConfigurationListener.java | 4 ++--
.../listener/PayrollDistributionListener.java | 4 ++--
.../service/PayrollServiceConfiguration.java | 18 ++++++++---------
.../command/handler/MigrationAggregate.java | 15 +++++++-------
.../handler/PayrollConfigurationAggregate.java | 15 +++++++-------
.../handler/PayrollDistributionAggregate.java | 15 +++++++-------
.../mapper/PayrollConfigurationMapper.java | 2 +-
.../repository/PayrollCollectionEntity.java | 5 ++---
.../repository/PayrollConfigurationEntity.java | 5 ++---
.../service/PayrollConfigurationService.java | 11 +++++------
.../service/PayrollDistributionService.java | 11 +++++------
.../service/adaptor/AccountingAdaptor.java | 23 +++++++++++-----------
.../internal/service/adaptor/CustomerAdaptor.java | 9 ++++-----
.../service/rest/MigrationRestController.java | 6 +++---
.../rest/PayrollConfigurationRestController.java | 18 ++++++++---------
.../rest/PayrollDistributionRestController.java | 17 ++++++++--------
27 files changed, 118 insertions(+), 136 deletions(-)
diff --git a/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollManager.java b/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollManager.java
index 6931edd..bbc410e 100644
--- a/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollManager.java
+++ b/api/src/main/java/io/mifos/payroll/api/v1/client/PayrollManager.java
@@ -18,13 +18,15 @@
*/
package io.mifos.payroll.api.v1.client;
-import io.mifos.core.api.annotation.ThrowsException;
-import io.mifos.core.api.annotation.ThrowsExceptions;
-import io.mifos.core.api.util.CustomFeignClientsConfiguration;
import io.mifos.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 java.util.List;
+import javax.validation.Valid;
+import org.apache.fineract.cn.api.annotation.ThrowsException;
+import org.apache.fineract.cn.api.annotation.ThrowsExceptions;
+import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -34,9 +36,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import javax.validation.Valid;
-import java.util.List;
-
@SuppressWarnings("unused")
@FeignClient(name="payroll-v1", path="/payroll/v1", configuration = CustomFeignClientsConfiguration.class)
public interface PayrollManager {
diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollAllocation.java b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollAllocation.java
index ded3ff1..9bc8e45 100644
--- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollAllocation.java
+++ b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollAllocation.java
@@ -18,12 +18,11 @@
*/
package io.mifos.payroll.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-
+import java.math.BigDecimal;
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
public class PayrollAllocation {
diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionHistory.java b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionHistory.java
index c38a6a6..876f0c4 100644
--- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionHistory.java
+++ b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionHistory.java
@@ -18,9 +18,8 @@
*/
package io.mifos.payroll.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-
import javax.validation.constraints.NotNull;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
public class PayrollCollectionHistory {
diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionSheet.java b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionSheet.java
index bd7bcf3..5f493a1 100644
--- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionSheet.java
+++ b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollCollectionSheet.java
@@ -18,11 +18,10 @@
*/
package io.mifos.payroll.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import javax.validation.Valid;
import java.util.List;
+import javax.validation.Valid;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
+import org.hibernate.validator.constraints.NotEmpty;
public class PayrollCollectionSheet {
diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java
index 253fee6..35757ee 100644
--- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java
+++ b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollConfiguration.java
@@ -18,11 +18,10 @@
*/
package io.mifos.payroll.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-
-import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
+import javax.validation.Valid;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
public class PayrollConfiguration {
diff --git a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollPayment.java b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollPayment.java
index a7f195a..cc38f75 100644
--- a/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollPayment.java
+++ b/api/src/main/java/io/mifos/payroll/api/v1/domain/PayrollPayment.java
@@ -18,12 +18,11 @@
*/
package io.mifos.payroll.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-
+import java.math.BigDecimal;
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
public class PayrollPayment {
diff --git a/component-test/src/main/java/io/mifos/payroll/AbstractPayrollTest.java b/component-test/src/main/java/io/mifos/payroll/AbstractPayrollTest.java
index 8cb455a..be6f8ce 100644
--- a/component-test/src/main/java/io/mifos/payroll/AbstractPayrollTest.java
+++ b/component-test/src/main/java/io/mifos/payroll/AbstractPayrollTest.java
@@ -19,14 +19,14 @@
package io.mifos.payroll;
-import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.test.fixture.TenantDataStoreContextTestRule;
-import io.mifos.core.test.listener.EnableEventRecording;
-import io.mifos.core.test.listener.EventRecorder;
import io.mifos.payroll.api.v1.EventConstants;
import io.mifos.payroll.api.v1.client.PayrollManager;
import io.mifos.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;
+import org.apache.fineract.cn.test.listener.EnableEventRecording;
+import org.apache.fineract.cn.test.listener.EventRecorder;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/component-test/src/main/java/io/mifos/payroll/SuiteTestEnvironment.java b/component-test/src/main/java/io/mifos/payroll/SuiteTestEnvironment.java
index 9566a65..4eb6812 100644
--- a/component-test/src/main/java/io/mifos/payroll/SuiteTestEnvironment.java
+++ b/component-test/src/main/java/io/mifos/payroll/SuiteTestEnvironment.java
@@ -18,9 +18,9 @@
*/
package io.mifos.payroll;
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.core.test.fixture.cassandra.CassandraInitializer;
-import io.mifos.core.test.fixture.mariadb.MariaDBInitializer;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer;
+import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer;
import org.junit.ClassRule;
import org.junit.rules.RuleChain;
import org.junit.rules.RunExternalResourceOnce;
diff --git a/component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java b/component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java
index 2d250b8..82e49a2 100644
--- a/component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java
+++ b/component-test/src/main/java/io/mifos/payroll/TestPayrollConfiguration.java
@@ -19,24 +19,23 @@
package io.mifos.payroll;
import com.google.common.collect.Lists;
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.customer.api.v1.domain.Customer;
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 java.math.BigDecimal;
+import java.util.Optional;
import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
+import org.apache.fineract.cn.customer.api.v1.domain.Customer;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Matchers;
import org.mockito.Mockito;
import org.springframework.boot.test.mock.mockito.MockBean;
-import java.math.BigDecimal;
-import java.util.Optional;
-
public class TestPayrollConfiguration extends AbstractPayrollTest {
@MockBean
diff --git a/component-test/src/main/java/io/mifos/payroll/TestPayrollDistribution.java b/component-test/src/main/java/io/mifos/payroll/TestPayrollDistribution.java
index 097d460..0d1e358 100644
--- a/component-test/src/main/java/io/mifos/payroll/TestPayrollDistribution.java
+++ b/component-test/src/main/java/io/mifos/payroll/TestPayrollDistribution.java
@@ -19,8 +19,6 @@
package io.mifos.payroll;
import com.google.common.collect.Lists;
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.customer.api.v1.domain.Customer;
import io.mifos.payroll.api.v1.EventConstants;
import io.mifos.payroll.api.v1.client.PayrollPaymentValidationException;
import io.mifos.payroll.api.v1.domain.PayrollAllocation;
@@ -33,17 +31,18 @@ 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 java.math.BigDecimal;
+import java.util.List;
+import java.util.Optional;
import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
+import org.apache.fineract.cn.customer.api.v1.domain.Customer;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Matchers;
import org.mockito.Mockito;
import org.springframework.boot.test.mock.mockito.MockBean;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Optional;
-
public class TestPayrollDistribution extends AbstractPayrollTest {
@MockBean
diff --git a/component-test/src/main/java/io/mifos/payroll/listener/MigrationEventListener.java b/component-test/src/main/java/io/mifos/payroll/listener/MigrationEventListener.java
index 27d28f5..2a33ca6 100644
--- a/component-test/src/main/java/io/mifos/payroll/listener/MigrationEventListener.java
+++ b/component-test/src/main/java/io/mifos/payroll/listener/MigrationEventListener.java
@@ -18,9 +18,9 @@
*/
package io.mifos.payroll.listener;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
import io.mifos.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;
import org.springframework.jms.annotation.JmsListener;
import org.springframework.messaging.handler.annotation.Header;
diff --git a/component-test/src/main/java/io/mifos/payroll/listener/PayrollConfigurationListener.java b/component-test/src/main/java/io/mifos/payroll/listener/PayrollConfigurationListener.java
index 56c31b5..14894e1 100644
--- a/component-test/src/main/java/io/mifos/payroll/listener/PayrollConfigurationListener.java
+++ b/component-test/src/main/java/io/mifos/payroll/listener/PayrollConfigurationListener.java
@@ -18,10 +18,10 @@
*/
package io.mifos.payroll.listener;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
import io.mifos.payroll.api.v1.EventConstants;
import io.mifos.payroll.service.ServiceConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/component-test/src/main/java/io/mifos/payroll/listener/PayrollDistributionListener.java b/component-test/src/main/java/io/mifos/payroll/listener/PayrollDistributionListener.java
index 7514b88..b99f1fd 100644
--- a/component-test/src/main/java/io/mifos/payroll/listener/PayrollDistributionListener.java
+++ b/component-test/src/main/java/io/mifos/payroll/listener/PayrollDistributionListener.java
@@ -18,10 +18,10 @@
*/
package io.mifos.payroll.listener;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
import io.mifos.payroll.api.v1.EventConstants;
import io.mifos.payroll.service.ServiceConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
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/payroll/service/PayrollServiceConfiguration.java b/service/src/main/java/io/mifos/payroll/service/PayrollServiceConfiguration.java
index 6559900..3e94283 100644
--- a/service/src/main/java/io/mifos/payroll/service/PayrollServiceConfiguration.java
+++ b/service/src/main/java/io/mifos/payroll/service/PayrollServiceConfiguration.java
@@ -18,15 +18,15 @@
*/
package io.mifos.payroll.service;
-import io.mifos.accounting.api.v1.client.LedgerManager;
-import io.mifos.anubis.config.EnableAnubis;
-import io.mifos.core.async.config.EnableAsync;
-import io.mifos.core.cassandra.config.EnableCassandra;
-import io.mifos.core.command.config.EnableCommandProcessing;
-import io.mifos.core.lang.config.EnableServiceException;
-import io.mifos.core.lang.config.EnableTenantContext;
-import io.mifos.core.mariadb.config.EnableMariaDB;
-import io.mifos.customer.api.v1.client.CustomerManager;
+import org.apache.fineract.cn.accounting.api.v1.client.LedgerManager;
+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.customer.api.v1.client.CustomerManager;
+import org.apache.fineract.cn.lang.config.EnableServiceException;
+import org.apache.fineract.cn.lang.config.EnableTenantContext;
+import org.apache.fineract.cn.mariadb.config.EnableMariaDB;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/io/mifos/payroll/service/internal/command/handler/MigrationAggregate.java
index 279c211..7e836fb 100644
--- a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/MigrationAggregate.java
+++ b/service/src/main/java/io/mifos/payroll/service/internal/command/handler/MigrationAggregate.java
@@ -18,18 +18,17 @@
*/
package io.mifos.payroll.service.internal.command.handler;
-import io.mifos.accounting.api.v1.EventConstants;
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.EventEmitter;
-import io.mifos.core.lang.ApplicationName;
-import io.mifos.core.mariadb.domain.FlywayFactoryBean;
import io.mifos.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;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.EventEmitter;
+import org.apache.fineract.cn.lang.ApplicationName;
+import org.apache.fineract.cn.mariadb.domain.FlywayFactoryBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import javax.sql.DataSource;
-
@Aggregate
public class MigrationAggregate {
diff --git a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java b/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java
index f2e7161..b1ca617 100644
--- a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java
+++ b/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java
@@ -18,10 +18,6 @@
*/
package io.mifos.payroll.service.internal.command.handler;
-import io.mifos.core.api.util.UserContextHolder;
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.EventEmitter;
import io.mifos.payroll.api.v1.EventConstants;
import io.mifos.payroll.api.v1.domain.PayrollConfiguration;
import io.mifos.payroll.service.ServiceConstants;
@@ -32,15 +28,18 @@ 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 java.time.Clock;
+import java.time.LocalDateTime;
+import java.util.Optional;
+import org.apache.fineract.cn.api.util.UserContextHolder;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.EventEmitter;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.transaction.annotation.Transactional;
-import java.time.Clock;
-import java.time.LocalDateTime;
-import java.util.Optional;
-
@Aggregate
public class PayrollConfigurationAggregate {
diff --git a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollDistributionAggregate.java b/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollDistributionAggregate.java
index 6bead07..61470b4 100644
--- a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollDistributionAggregate.java
+++ b/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollDistributionAggregate.java
@@ -18,10 +18,6 @@
*/
package io.mifos.payroll.service.internal.command.handler;
-import io.mifos.core.api.util.UserContextHolder;
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.EventEmitter;
import io.mifos.payroll.api.v1.EventConstants;
import io.mifos.payroll.api.v1.domain.PayrollCollectionSheet;
import io.mifos.payroll.service.ServiceConstants;
@@ -32,16 +28,19 @@ 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 java.time.Clock;
+import java.time.LocalDateTime;
+import java.util.Optional;
import org.apache.commons.lang.RandomStringUtils;
+import org.apache.fineract.cn.api.util.UserContextHolder;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.EventEmitter;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.transaction.annotation.Transactional;
-import java.time.Clock;
-import java.time.LocalDateTime;
-import java.util.Optional;
-
@Aggregate
public class PayrollDistributionAggregate {
diff --git a/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java b/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java
index 586b7b8..4429ff5 100644
--- a/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java
+++ b/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java
@@ -18,9 +18,9 @@
*/
package io.mifos.payroll.service.internal.mapper;
-import io.mifos.core.lang.DateConverter;
import io.mifos.payroll.api.v1.domain.PayrollConfiguration;
import io.mifos.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/repository/PayrollCollectionEntity.java b/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollCollectionEntity.java
index 2715dc0..4c999aa 100644
--- a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollCollectionEntity.java
+++ b/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollCollectionEntity.java
@@ -18,8 +18,7 @@
*/
package io.mifos.payroll.service.internal.repository;
-import io.mifos.core.mariadb.util.LocalDateTimeConverter;
-
+import java.time.LocalDateTime;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
@@ -27,7 +26,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import java.time.LocalDateTime;
+import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter;
@Entity
@Table(name = "meketre_payroll_collections")
diff --git a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollConfigurationEntity.java b/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollConfigurationEntity.java
index c92cee9..23ddebd 100644
--- a/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollConfigurationEntity.java
+++ b/service/src/main/java/io/mifos/payroll/service/internal/repository/PayrollConfigurationEntity.java
@@ -18,8 +18,7 @@
*/
package io.mifos.payroll.service.internal.repository;
-import io.mifos.core.mariadb.util.LocalDateTimeConverter;
-
+import java.time.LocalDateTime;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
@@ -27,7 +26,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import java.time.LocalDateTime;
+import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter;
@Entity
@Table(name = "meketre_payroll_configurations")
diff --git a/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java b/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java
index e00fbd3..3385436 100644
--- a/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java
+++ b/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollConfigurationService.java
@@ -18,8 +18,6 @@
*/
package io.mifos.payroll.service.internal.service;
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.customer.api.v1.domain.Customer;
import io.mifos.payroll.api.v1.domain.PayrollAllocation;
import io.mifos.payroll.api.v1.domain.PayrollConfiguration;
import io.mifos.payroll.service.ServiceConstants;
@@ -29,15 +27,16 @@ 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 java.util.Comparator;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
+import org.apache.fineract.cn.customer.api.v1.domain.Customer;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import java.util.Comparator;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
@Service
public class PayrollConfigurationService {
diff --git a/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollDistributionService.java b/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollDistributionService.java
index 748d097..4eadd63 100644
--- a/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollDistributionService.java
+++ b/service/src/main/java/io/mifos/payroll/service/internal/service/PayrollDistributionService.java
@@ -18,8 +18,6 @@
*/
package io.mifos.payroll.service.internal.service;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.core.lang.ServiceException;
import io.mifos.payroll.api.v1.domain.PayrollCollectionHistory;
import io.mifos.payroll.api.v1.domain.PayrollPaymentPage;
import io.mifos.payroll.service.ServiceConstants;
@@ -29,6 +27,11 @@ 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 java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.apache.fineract.cn.lang.ServiceException;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -36,10 +39,6 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
@Service
public class PayrollDistributionService {
diff --git a/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/AccountingAdaptor.java b/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/AccountingAdaptor.java
index 600f5a4..7f6fab0 100644
--- a/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/AccountingAdaptor.java
+++ b/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/AccountingAdaptor.java
@@ -19,22 +19,10 @@
package io.mifos.payroll.service.internal.service.adaptor;
import com.google.common.collect.Sets;
-import io.mifos.accounting.api.v1.client.AccountNotFoundException;
-import io.mifos.accounting.api.v1.client.LedgerManager;
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.accounting.api.v1.domain.Creditor;
-import io.mifos.accounting.api.v1.domain.Debtor;
-import io.mifos.accounting.api.v1.domain.JournalEntry;
-import io.mifos.core.lang.DateConverter;
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.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
@@ -43,6 +31,17 @@ import java.time.LocalDateTime;
import java.util.HashSet;
import java.util.Optional;
import java.util.UUID;
+import org.apache.fineract.cn.accounting.api.v1.client.AccountNotFoundException;
+import org.apache.fineract.cn.accounting.api.v1.client.LedgerManager;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
+import org.apache.fineract.cn.accounting.api.v1.domain.Creditor;
+import org.apache.fineract.cn.accounting.api.v1.domain.Debtor;
+import org.apache.fineract.cn.accounting.api.v1.domain.JournalEntry;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
@Service
public class AccountingAdaptor {
diff --git a/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/CustomerAdaptor.java b/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/CustomerAdaptor.java
index 13d14d5..713a495 100644
--- a/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/CustomerAdaptor.java
+++ b/service/src/main/java/io/mifos/payroll/service/internal/service/adaptor/CustomerAdaptor.java
@@ -18,17 +18,16 @@
*/
package io.mifos.payroll.service.internal.service.adaptor;
-import io.mifos.customer.api.v1.client.CustomerManager;
-import io.mifos.customer.api.v1.client.CustomerNotFoundException;
-import io.mifos.customer.api.v1.domain.Customer;
import io.mifos.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;
+import org.apache.fineract.cn.customer.api.v1.domain.Customer;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
-import java.util.Optional;
-
@Service
public class CustomerAdaptor {
diff --git a/service/src/main/java/io/mifos/payroll/service/rest/MigrationRestController.java b/service/src/main/java/io/mifos/payroll/service/rest/MigrationRestController.java
index cdad73a..997dd32 100644
--- a/service/src/main/java/io/mifos/payroll/service/rest/MigrationRestController.java
+++ b/service/src/main/java/io/mifos/payroll/service/rest/MigrationRestController.java
@@ -18,10 +18,10 @@
*/
package io.mifos.payroll.service.rest;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
import io.mifos.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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
diff --git a/service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java b/service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java
index 7df6f25..84782ee 100644
--- a/service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java
+++ b/service/src/main/java/io/mifos/payroll/service/rest/PayrollConfigurationRestController.java
@@ -18,17 +18,19 @@
*/
package io.mifos.payroll.service.rest;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.anubis.annotation.Permittables;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.ServiceException;
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 java.util.List;
+import javax.validation.Valid;
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.anubis.annotation.Permittables;
+import org.apache.fineract.cn.command.gateway.CommandGateway;
+import org.apache.fineract.cn.lang.ServiceException;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -41,9 +43,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import javax.validation.Valid;
-import java.util.List;
-
@RestController
@RequestMapping("/customers/{identifier}/payroll")
public class PayrollConfigurationRestController {
@@ -78,7 +77,8 @@ public class PayrollConfigurationRestController {
public ResponseEntity<Void> setPayrollConfiguration(@PathVariable(value = "identifier") final String customerIdentifier,
@RequestBody @Valid final PayrollConfiguration payrollConfiguration) {
this.payrollConfigurationService.findCustomer(customerIdentifier)
- .orElseThrow(() -> ServiceException.notFound("Customer {0} not available.", customerIdentifier)
+ .orElseThrow(() -> ServiceException
+ .notFound("Customer {0} not available.", customerIdentifier)
);
this.payrollConfigurationService.findAccount(payrollConfiguration.getMainAccountNumber())
diff --git a/service/src/main/java/io/mifos/payroll/service/rest/PayrollDistributionRestController.java b/service/src/main/java/io/mifos/payroll/service/rest/PayrollDistributionRestController.java
index 244610a..a4c2435 100644
--- a/service/src/main/java/io/mifos/payroll/service/rest/PayrollDistributionRestController.java
+++ b/service/src/main/java/io/mifos/payroll/service/rest/PayrollDistributionRestController.java
@@ -18,12 +18,6 @@
*/
package io.mifos.payroll.service.rest;
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.anubis.annotation.Permittables;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.ServiceException;
import io.mifos.payroll.api.v1.PermittableGroupIds;
import io.mifos.payroll.api.v1.domain.PayrollCollectionHistory;
import io.mifos.payroll.api.v1.domain.PayrollCollectionSheet;
@@ -35,6 +29,14 @@ 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 java.util.List;
+import javax.validation.Valid;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.anubis.annotation.Permittables;
+import org.apache.fineract.cn.command.gateway.CommandGateway;
+import org.apache.fineract.cn.lang.ServiceException;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -48,9 +50,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import javax.validation.Valid;
-import java.util.List;
-
@RestController
@RequestMapping("/distribution")
public class PayrollDistributionRestController {