Skip to content
Permalink
Browse files
Merge pull request #4 from myrle-krantz/develop
Updating package names.
  • Loading branch information
myrle-krantz committed Apr 16, 2018
2 parents b1773fe + 52de03e commit 131263e250b521f49012a3c3f1fdf9701d740fc6
Showing 50 changed files with 277 additions and 295 deletions.
@@ -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 {
@@ -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 {
@@ -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 {
}
@@ -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 {
}
@@ -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 {
}
@@ -16,15 +16,17 @@
* 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.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 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;
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.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 {
@@ -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 {
}
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.mifos.payroll.api.v1.domain;

import io.mifos.core.lang.validation.constraints.ValidIdentifier;
package org.apache.fineract.cn.payroll.api.v1.domain;

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 {

@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.mifos.payroll.api.v1.domain;

import io.mifos.core.lang.validation.constraints.ValidIdentifier;
package org.apache.fineract.cn.payroll.api.v1.domain;

import javax.validation.constraints.NotNull;
import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;

public class PayrollCollectionHistory {

@@ -16,13 +16,12 @@
* 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 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 {

@@ -16,13 +16,12 @@
* 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 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 {

@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.mifos.payroll.api.v1.domain;

import io.mifos.core.lang.validation.constraints.ValidIdentifier;
package org.apache.fineract.cn.payroll.api.v1.domain;

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 {

@@ -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;
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.mifos.payroll;
package org.apache.fineract.cn.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.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;
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;
@@ -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({
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.mifos.payroll;
package org.apache.fineract.cn.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;
@@ -16,27 +16,26 @@
* 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.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 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;
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
@@ -16,34 +16,33 @@
* 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.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;
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;
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
@@ -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;
@@ -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;
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.mifos.payroll.listener;
package org.apache.fineract.cn.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.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;
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package io.mifos.payroll.listener;
package org.apache.fineract.cn.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.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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;

0 comments on commit 131263e

Please sign in to comment.