Adjusting to package name changes in upstream repositories.
diff --git a/api/src/main/java/io/mifos/provisioner/api/v1/client/Provisioner.java b/api/src/main/java/io/mifos/provisioner/api/v1/client/Provisioner.java
index eae41eb..3de62a2 100644
--- a/api/src/main/java/io/mifos/provisioner/api/v1/client/Provisioner.java
+++ b/api/src/main/java/io/mifos/provisioner/api/v1/client/Provisioner.java
@@ -18,8 +18,17 @@
*/
package io.mifos.provisioner.api.v1.client;
-import io.mifos.core.api.util.CustomFeignClientsConfiguration;
-import io.mifos.provisioner.api.v1.domain.*;
+import io.mifos.provisioner.api.v1.domain.Application;
+import io.mifos.provisioner.api.v1.domain.AssignedApplication;
+import io.mifos.provisioner.api.v1.domain.AuthenticationResponse;
+import io.mifos.provisioner.api.v1.domain.Client;
+import io.mifos.provisioner.api.v1.domain.IdentityManagerInitialization;
+import io.mifos.provisioner.api.v1.domain.PasswordPolicy;
+import io.mifos.provisioner.api.v1.domain.Tenant;
+import java.util.List;
+import javax.validation.Valid;
+import org.apache.fineract.cn.api.annotation.ThrowsException;
+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;
@@ -29,12 +38,6 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import java.util.List;
-
-import javax.validation.Valid;
-
-import io.mifos.core.api.annotation.ThrowsException;
-
/**
* @author Myrle Krantz
*/
diff --git a/api/src/main/java/io/mifos/provisioner/api/v1/domain/Application.java b/api/src/main/java/io/mifos/provisioner/api/v1/domain/Application.java
index 9fa558a..0f35123 100644
--- a/api/src/main/java/io/mifos/provisioner/api/v1/domain/Application.java
+++ b/api/src/main/java/io/mifos/provisioner/api/v1/domain/Application.java
@@ -18,7 +18,8 @@
*/
package io.mifos.provisioner.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidApplicationName;
+
+import org.apache.fineract.cn.lang.validation.constraints.ValidApplicationName;
@SuppressWarnings({"unused", "WeakerAccess"})
public class Application {
diff --git a/api/src/main/java/io/mifos/provisioner/api/v1/domain/AssignedApplication.java b/api/src/main/java/io/mifos/provisioner/api/v1/domain/AssignedApplication.java
index 7ef50e7..ff76f36 100644
--- a/api/src/main/java/io/mifos/provisioner/api/v1/domain/AssignedApplication.java
+++ b/api/src/main/java/io/mifos/provisioner/api/v1/domain/AssignedApplication.java
@@ -18,7 +18,7 @@
*/
package io.mifos.provisioner.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidApplicationName;
+import org.apache.fineract.cn.lang.validation.constraints.ValidApplicationName;
@SuppressWarnings({"unused", "WeakerAccess"})
public class AssignedApplication {
diff --git a/api/src/main/java/io/mifos/provisioner/api/v1/domain/Tenant.java b/api/src/main/java/io/mifos/provisioner/api/v1/domain/Tenant.java
index 7639add..1d84ae7 100644
--- a/api/src/main/java/io/mifos/provisioner/api/v1/domain/Tenant.java
+++ b/api/src/main/java/io/mifos/provisioner/api/v1/domain/Tenant.java
@@ -18,10 +18,9 @@
*/
package io.mifos.provisioner.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-
import javax.validation.constraints.NotNull;
import java.util.Objects;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
@SuppressWarnings({"unused", "WeakerAccess"})
public final class Tenant {
diff --git a/api/src/test/java/io/mifos/provisioner/api/v1/domain/ApplicationTest.java b/api/src/test/java/io/mifos/provisioner/api/v1/domain/ApplicationTest.java
index 4f31391..ddee51d 100644
--- a/api/src/test/java/io/mifos/provisioner/api/v1/domain/ApplicationTest.java
+++ b/api/src/test/java/io/mifos/provisioner/api/v1/domain/ApplicationTest.java
@@ -18,12 +18,11 @@
*/
package io.mifos.provisioner.api.v1.domain;
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
-import org.junit.runners.Parameterized;
-
import java.util.ArrayList;
import java.util.Collection;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runners.Parameterized;
/**
* @author Myrle Krantz
diff --git a/api/src/test/java/io/mifos/provisioner/api/v1/domain/AssignedApplicationTest.java b/api/src/test/java/io/mifos/provisioner/api/v1/domain/AssignedApplicationTest.java
index 4e6ecb8..cc844d7 100644
--- a/api/src/test/java/io/mifos/provisioner/api/v1/domain/AssignedApplicationTest.java
+++ b/api/src/test/java/io/mifos/provisioner/api/v1/domain/AssignedApplicationTest.java
@@ -18,12 +18,11 @@
*/
package io.mifos.provisioner.api.v1.domain;
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
-import org.junit.runners.Parameterized;
-
import java.util.ArrayList;
import java.util.Collection;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runners.Parameterized;
/**
* @author Myrle Krantz
diff --git a/api/src/test/java/io/mifos/provisioner/api/v1/domain/TenantTest.java b/api/src/test/java/io/mifos/provisioner/api/v1/domain/TenantTest.java
index 62157ad..c72824b 100644
--- a/api/src/test/java/io/mifos/provisioner/api/v1/domain/TenantTest.java
+++ b/api/src/test/java/io/mifos/provisioner/api/v1/domain/TenantTest.java
@@ -18,13 +18,12 @@
*/
package io.mifos.provisioner.api.v1.domain;
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
-import org.apache.commons.lang.RandomStringUtils;
-import org.junit.runners.Parameterized;
-
import java.util.ArrayList;
import java.util.Collection;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runners.Parameterized;
/**
* @author Myrle Krantz
diff --git a/component-test/src/main/java/io/mifos/provisioner/AbstractServiceTest.java b/component-test/src/main/java/io/mifos/provisioner/AbstractServiceTest.java
index a6ea4d3..8b11ca4 100644
--- a/component-test/src/main/java/io/mifos/provisioner/AbstractServiceTest.java
+++ b/component-test/src/main/java/io/mifos/provisioner/AbstractServiceTest.java
@@ -18,9 +18,9 @@
*/
package io.mifos.provisioner;
-import io.mifos.core.test.env.TestEnvironment;
import io.mifos.provisioner.api.v1.client.Provisioner;
import io.mifos.provisioner.config.ProvisionerServiceConfig;
+import org.apache.fineract.cn.test.env.TestEnvironment;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.rules.RuleChain;
diff --git a/component-test/src/main/java/io/mifos/provisioner/application/TestApplications.java b/component-test/src/main/java/io/mifos/provisioner/application/TestApplications.java
index b6fa154..439ab85 100644
--- a/component-test/src/main/java/io/mifos/provisioner/application/TestApplications.java
+++ b/component-test/src/main/java/io/mifos/provisioner/application/TestApplications.java
@@ -19,14 +19,14 @@
package io.mifos.provisioner.application;
-import io.mifos.core.api.context.AutoSeshat;
-import io.mifos.core.api.util.ApiConstants;
-import io.mifos.core.api.util.NotFoundException;
import io.mifos.provisioner.AbstractServiceTest;
import io.mifos.provisioner.api.v1.client.DuplicateIdentifierException;
import io.mifos.provisioner.api.v1.domain.Application;
import io.mifos.provisioner.api.v1.domain.AuthenticationResponse;
import io.mifos.provisioner.config.ProvisionerConstants;
+import org.apache.fineract.cn.api.context.AutoSeshat;
+import org.apache.fineract.cn.api.util.ApiConstants;
+import org.apache.fineract.cn.api.util.NotFoundException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/component-test/src/main/java/io/mifos/provisioner/client/TestClients.java b/component-test/src/main/java/io/mifos/provisioner/client/TestClients.java
index 4375125..cbcf10a 100644
--- a/component-test/src/main/java/io/mifos/provisioner/client/TestClients.java
+++ b/component-test/src/main/java/io/mifos/provisioner/client/TestClients.java
@@ -18,14 +18,14 @@
*/
package io.mifos.provisioner.client;
-import io.mifos.core.api.context.AutoSeshat;
-import io.mifos.core.api.util.ApiConstants;
-import io.mifos.core.api.util.NotFoundException;
import io.mifos.provisioner.AbstractServiceTest;
import io.mifos.provisioner.api.v1.client.DuplicateIdentifierException;
import io.mifos.provisioner.api.v1.domain.AuthenticationResponse;
import io.mifos.provisioner.api.v1.domain.Client;
import io.mifos.provisioner.config.ProvisionerConstants;
+import org.apache.fineract.cn.api.context.AutoSeshat;
+import org.apache.fineract.cn.api.util.ApiConstants;
+import org.apache.fineract.cn.api.util.NotFoundException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/component-test/src/main/java/io/mifos/provisioner/internal/TestProvision.java b/component-test/src/main/java/io/mifos/provisioner/internal/TestProvision.java
index bbe819c..e011cc3 100644
--- a/component-test/src/main/java/io/mifos/provisioner/internal/TestProvision.java
+++ b/component-test/src/main/java/io/mifos/provisioner/internal/TestProvision.java
@@ -22,9 +22,9 @@
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Session;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.util.CassandraConnectorConstants;
import io.mifos.provisioner.AbstractServiceTest;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.util.CassandraConnectorConstants;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/component-test/src/main/java/io/mifos/provisioner/security/TestAuthentication.java b/component-test/src/main/java/io/mifos/provisioner/security/TestAuthentication.java
index 11dfe26..0942b69 100644
--- a/component-test/src/main/java/io/mifos/provisioner/security/TestAuthentication.java
+++ b/component-test/src/main/java/io/mifos/provisioner/security/TestAuthentication.java
@@ -19,11 +19,11 @@
package io.mifos.provisioner.security;
-import io.mifos.core.api.util.ApiConstants;
import io.mifos.provisioner.AbstractServiceTest;
import io.mifos.provisioner.api.v1.client.InvalidProvisionerCredentialsException;
import io.mifos.provisioner.api.v1.domain.AuthenticationResponse;
import io.mifos.provisioner.config.ProvisionerConstants;
+import org.apache.fineract.cn.api.util.ApiConstants;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.util.Base64Utils;
diff --git a/component-test/src/main/java/io/mifos/provisioner/security/TestPasswordPolicy.java b/component-test/src/main/java/io/mifos/provisioner/security/TestPasswordPolicy.java
index 3ec4ff0..ad73f72 100644
--- a/component-test/src/main/java/io/mifos/provisioner/security/TestPasswordPolicy.java
+++ b/component-test/src/main/java/io/mifos/provisioner/security/TestPasswordPolicy.java
@@ -18,19 +18,18 @@
*/
package io.mifos.provisioner.security;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.ApiConstants;
import io.mifos.provisioner.AbstractServiceTest;
import io.mifos.provisioner.api.v1.domain.AuthenticationResponse;
import io.mifos.provisioner.api.v1.domain.PasswordPolicy;
import io.mifos.provisioner.config.ProvisionerConstants;
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.util.Base64Utils;
-
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.ApiConstants;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.util.Base64Utils;
/**
* @author Myrle Krantz
diff --git a/component-test/src/main/java/io/mifos/provisioner/tenant/Fixture.java b/component-test/src/main/java/io/mifos/provisioner/tenant/Fixture.java
index f387621..a46072d 100644
--- a/component-test/src/main/java/io/mifos/provisioner/tenant/Fixture.java
+++ b/component-test/src/main/java/io/mifos/provisioner/tenant/Fixture.java
@@ -19,10 +19,10 @@
package io.mifos.provisioner.tenant;
-import io.mifos.core.test.env.TestEnvironment;
import io.mifos.provisioner.api.v1.domain.CassandraConnectionInfo;
import io.mifos.provisioner.api.v1.domain.DatabaseConnectionInfo;
import io.mifos.provisioner.api.v1.domain.Tenant;
+import org.apache.fineract.cn.test.env.TestEnvironment;
class Fixture {
static Tenant getCompTestTenant() {
diff --git a/component-test/src/main/java/io/mifos/provisioner/tenant/TestTenantApplicationAssignment.java b/component-test/src/main/java/io/mifos/provisioner/tenant/TestTenantApplicationAssignment.java
index 74356f1..299bdbc 100644
--- a/component-test/src/main/java/io/mifos/provisioner/tenant/TestTenantApplicationAssignment.java
+++ b/component-test/src/main/java/io/mifos/provisioner/tenant/TestTenantApplicationAssignment.java
@@ -18,36 +18,54 @@
*/
package io.mifos.provisioner.tenant;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
+
import com.google.gson.Gson;
-import io.mifos.anubis.api.v1.client.Anubis;
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
-import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
-import io.mifos.anubis.api.v1.domain.Signature;
-import io.mifos.anubis.test.v1.SystemSecurityEnvironment;
-import io.mifos.core.api.context.AutoSeshat;
-import io.mifos.core.api.util.ApiConstants;
-import io.mifos.core.api.util.ApiFactory;
-import io.mifos.core.lang.AutoTenantContext;
-import io.mifos.core.lang.security.RsaKeyPairFactory;
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.identity.api.v1.client.IdentityManager;
-import io.mifos.identity.api.v1.domain.CallEndpointSet;
-import io.mifos.identity.api.v1.domain.Permission;
-import io.mifos.identity.api.v1.domain.PermittableGroup;
-import io.mifos.identity.api.v1.events.ApplicationSignatureEvent;
-import io.mifos.permittedfeignclient.api.v1.client.ApplicationPermissionRequirements;
-import io.mifos.permittedfeignclient.api.v1.domain.ApplicationPermission;
import io.mifos.provisioner.ProvisionerCassandraInitializer;
import io.mifos.provisioner.ProvisionerMariaDBInitializer;
import io.mifos.provisioner.api.v1.client.Provisioner;
-import io.mifos.provisioner.api.v1.domain.*;
+import io.mifos.provisioner.api.v1.domain.Application;
+import io.mifos.provisioner.api.v1.domain.AssignedApplication;
+import io.mifos.provisioner.api.v1.domain.AuthenticationResponse;
+import io.mifos.provisioner.api.v1.domain.IdentityManagerInitialization;
+import io.mifos.provisioner.api.v1.domain.Tenant;
import io.mifos.provisioner.config.ProvisionerConstants;
import io.mifos.provisioner.config.ProvisionerServiceConfig;
import io.mifos.provisioner.internal.listener.IdentityListener;
import io.mifos.provisioner.internal.service.applications.ApplicationCallContextProvider;
import io.mifos.provisioner.internal.util.TokenProvider;
-import org.junit.*;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apache.finearct.cn.permittedfeignclient.api.v1.client.ApplicationPermissionRequirements;
+import org.apache.finearct.cn.permittedfeignclient.api.v1.domain.ApplicationPermission;
+import org.apache.fineract.cn.anubis.api.v1.client.Anubis;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
+import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
+import org.apache.fineract.cn.anubis.test.v1.SystemSecurityEnvironment;
+import org.apache.fineract.cn.api.context.AutoSeshat;
+import org.apache.fineract.cn.api.util.ApiConstants;
+import org.apache.fineract.cn.api.util.ApiFactory;
+import org.apache.fineract.cn.identity.api.v1.client.IdentityManager;
+import org.apache.fineract.cn.identity.api.v1.domain.CallEndpointSet;
+import org.apache.fineract.cn.identity.api.v1.domain.Permission;
+import org.apache.fineract.cn.identity.api.v1.domain.PermittableGroup;
+import org.apache.fineract.cn.identity.api.v1.events.ApplicationSignatureEvent;
+import org.apache.fineract.cn.lang.AutoTenantContext;
+import org.apache.fineract.cn.lang.security.RsaKeyPairFactory;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import org.junit.runner.RunWith;
@@ -66,14 +84,6 @@
import org.springframework.context.annotation.Import;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.*;
-
/**
* @author Myrle Krantz
*/
diff --git a/component-test/src/main/java/io/mifos/provisioner/tenant/TestTenants.java b/component-test/src/main/java/io/mifos/provisioner/tenant/TestTenants.java
index 4d9e9f2..1cef72c 100644
--- a/component-test/src/main/java/io/mifos/provisioner/tenant/TestTenants.java
+++ b/component-test/src/main/java/io/mifos/provisioner/tenant/TestTenants.java
@@ -19,21 +19,20 @@
package io.mifos.provisioner.tenant;
-import io.mifos.core.api.context.AutoSeshat;
-import io.mifos.core.api.util.ApiConstants;
-import io.mifos.core.api.util.NotFoundException;
import io.mifos.provisioner.AbstractServiceTest;
import io.mifos.provisioner.api.v1.client.DuplicateIdentifierException;
import io.mifos.provisioner.api.v1.domain.AuthenticationResponse;
import io.mifos.provisioner.api.v1.domain.Tenant;
import io.mifos.provisioner.config.ProvisionerConstants;
+import java.util.List;
+import org.apache.fineract.cn.api.context.AutoSeshat;
+import org.apache.fineract.cn.api.util.ApiConstants;
+import org.apache.fineract.cn.api.util.NotFoundException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.util.List;
-
public class TestTenants extends AbstractServiceTest {
public TestTenants() {
diff --git a/service/src/main/java/io/mifos/provisioner/config/ProvisionerServiceConfig.java b/service/src/main/java/io/mifos/provisioner/config/ProvisionerServiceConfig.java
index a2b709e..6030297 100644
--- a/service/src/main/java/io/mifos/provisioner/config/ProvisionerServiceConfig.java
+++ b/service/src/main/java/io/mifos/provisioner/config/ProvisionerServiceConfig.java
@@ -18,18 +18,18 @@
*/
package io.mifos.provisioner.config;
-import io.mifos.anubis.config.EnableAnubis;
-import io.mifos.anubis.token.SystemAccessTokenSerializer;
-import io.mifos.core.api.util.ApiFactory;
-import io.mifos.core.async.config.EnableAsync;
-import io.mifos.core.cassandra.config.EnableCassandra;
-import io.mifos.core.lang.config.EnableApplicationName;
-import io.mifos.core.lang.config.EnableServiceException;
-import io.mifos.core.mariadb.config.EnableMariaDB;
import io.mifos.provisioner.internal.util.TokenProvider;
-import io.mifos.tool.crypto.config.EnableCrypto;
import org.apache.activemq.jms.pool.PooledConnectionFactory;
import org.apache.activemq.spring.ActiveMQConnectionFactory;
+import org.apache.fineract.cn.anubis.config.EnableAnubis;
+import org.apache.fineract.cn.anubis.token.SystemAccessTokenSerializer;
+import org.apache.fineract.cn.api.util.ApiFactory;
+import org.apache.fineract.cn.async.config.EnableAsync;
+import org.apache.fineract.cn.cassandra.config.EnableCassandra;
+import org.apache.fineract.cn.crypto.config.EnableCrypto;
+import org.apache.fineract.cn.lang.config.EnableApplicationName;
+import org.apache.fineract.cn.lang.config.EnableServiceException;
+import org.apache.fineract.cn.mariadb.config.EnableMariaDB;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/service/src/main/java/io/mifos/provisioner/internal/listener/IdentityListener.java b/service/src/main/java/io/mifos/provisioner/internal/listener/IdentityListener.java
index fd031a2..793a78e 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/listener/IdentityListener.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/listener/IdentityListener.java
@@ -18,21 +18,21 @@
*/
package io.mifos.provisioner.internal.listener;
+import static org.apache.fineract.cn.identity.api.v1.events.EventConstants.OPERATION_POST_PERMITTABLE_GROUP;
+import static org.apache.fineract.cn.identity.api.v1.events.EventConstants.OPERATION_PUT_APPLICATION_SIGNATURE;
+
import com.google.gson.Gson;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.lang.listening.EventExpectation;
-import io.mifos.core.lang.listening.EventKey;
-import io.mifos.core.lang.listening.TenantedEventListener;
-import io.mifos.identity.api.v1.events.ApplicationSignatureEvent;
-import io.mifos.identity.api.v1.events.EventConstants;
+import org.apache.fineract.cn.identity.api.v1.events.ApplicationSignatureEvent;
+import org.apache.fineract.cn.identity.api.v1.events.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.lang.listening.EventExpectation;
+import org.apache.fineract.cn.lang.listening.EventKey;
+import org.apache.fineract.cn.lang.listening.TenantedEventListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jms.annotation.JmsListener;
import org.springframework.messaging.handler.annotation.Header;
import org.springframework.stereotype.Component;
-import static io.mifos.identity.api.v1.events.EventConstants.OPERATION_POST_PERMITTABLE_GROUP;
-import static io.mifos.identity.api.v1.events.EventConstants.OPERATION_PUT_APPLICATION_SIGNATURE;
-
/**
* @author Myrle Krantz
*/
diff --git a/service/src/main/java/io/mifos/provisioner/internal/repository/ProvisionerInitializer.java b/service/src/main/java/io/mifos/provisioner/internal/repository/ProvisionerInitializer.java
index 38e1ee5..d7193ee 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/repository/ProvisionerInitializer.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/repository/ProvisionerInitializer.java
@@ -22,15 +22,22 @@
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
-import io.mifos.core.api.util.ApiConstants;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.util.CassandraConnectorConstants;
-import io.mifos.core.mariadb.util.MariaDBConstants;
import io.mifos.provisioner.config.ProvisionerConstants;
import io.mifos.provisioner.internal.util.DataSourceUtils;
-import io.mifos.tool.crypto.HashGenerator;
-import io.mifos.tool.crypto.SaltGenerator;
+import java.nio.ByteBuffer;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.PostConstruct;
import org.apache.commons.lang.StringUtils;
+import org.apache.fineract.cn.api.util.ApiConstants;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.util.CassandraConnectorConstants;
+import org.apache.fineract.cn.crypto.HashGenerator;
+import org.apache.fineract.cn.crypto.SaltGenerator;
+import org.apache.fineract.cn.mariadb.util.MariaDBConstants;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -40,14 +47,6 @@
import org.springframework.stereotype.Component;
import org.springframework.util.Base64Utils;
-import javax.annotation.PostConstruct;
-import java.nio.ByteBuffer;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Date;
-import java.util.UUID;
-
@SuppressWarnings({"SqlNoDataSourceInspection", "SqlDialectInspection", "unused"})
@Component
public class ProvisionerInitializer {
diff --git a/service/src/main/java/io/mifos/provisioner/internal/repository/TenantCassandraRepository.java b/service/src/main/java/io/mifos/provisioner/internal/repository/TenantCassandraRepository.java
index 926568e..05c6ddb 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/repository/TenantCassandraRepository.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/repository/TenantCassandraRepository.java
@@ -29,19 +29,18 @@
import com.datastax.driver.mapping.Mapper;
import com.datastax.driver.mapping.MappingManager;
import com.datastax.driver.mapping.Result;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.core.ReplicationStrategyResolver;
-import io.mifos.core.cassandra.util.CassandraConnectorConstants;
-import io.mifos.core.lang.ServiceException;
import io.mifos.provisioner.internal.util.ContactPointUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Nonnull;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
+import javax.annotation.Nonnull;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.core.ReplicationStrategyResolver;
+import org.apache.fineract.cn.cassandra.util.CassandraConnectorConstants;
+import org.apache.fineract.cn.lang.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/provisioner/internal/service/ApplicationService.java b/service/src/main/java/io/mifos/provisioner/internal/service/ApplicationService.java
index 2a71a38..e073975 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/service/ApplicationService.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/service/ApplicationService.java
@@ -21,19 +21,17 @@
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.mapping.Mapper;
import com.datastax.driver.mapping.Result;
-
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.provisioner.internal.repository.ApplicationEntity;
import io.mifos.provisioner.config.ProvisionerConstants;
+import io.mifos.provisioner.internal.repository.ApplicationEntity;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+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;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.List;
-
@Component
public class ApplicationService {
diff --git a/service/src/main/java/io/mifos/provisioner/internal/service/AuthenticationService.java b/service/src/main/java/io/mifos/provisioner/internal/service/AuthenticationService.java
index 616754b..cf994da 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/service/AuthenticationService.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/service/AuthenticationService.java
@@ -26,27 +26,14 @@
import com.datastax.driver.core.utils.Bytes;
import com.datastax.driver.mapping.Mapper;
import com.datastax.driver.mapping.MappingManager;
-
-import io.mifos.anubis.token.TokenSerializationResult;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.provisioner.config.SystemProperties;
-import io.mifos.provisioner.internal.repository.UserEntity;
import io.mifos.provisioner.api.v1.domain.AuthenticationResponse;
import io.mifos.provisioner.api.v1.domain.PasswordPolicy;
+import io.mifos.provisioner.config.ProvisionerConstants;
+import io.mifos.provisioner.config.SystemProperties;
import io.mifos.provisioner.internal.repository.ClientEntity;
import io.mifos.provisioner.internal.repository.ConfigEntity;
+import io.mifos.provisioner.internal.repository.UserEntity;
import io.mifos.provisioner.internal.util.TokenProvider;
-import io.mifos.provisioner.config.ProvisionerConstants;
-import io.mifos.tool.crypto.HashGenerator;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.crypto.util.EncodingUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.Base64Utils;
-
import java.nio.ByteBuffer;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -54,8 +41,18 @@
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.concurrent.TimeUnit;
-
import javax.annotation.Nonnull;
+import org.apache.fineract.cn.anubis.token.TokenSerializationResult;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.crypto.HashGenerator;
+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;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.crypto.util.EncodingUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Base64Utils;
@Service
public class AuthenticationService {
diff --git a/service/src/main/java/io/mifos/provisioner/internal/service/ClientService.java b/service/src/main/java/io/mifos/provisioner/internal/service/ClientService.java
index 75d7718..ada4ed9 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/service/ClientService.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/service/ClientService.java
@@ -21,16 +21,13 @@
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.mapping.Mapper;
import com.datastax.driver.mapping.Result;
-
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.lang.ServiceException;
import io.mifos.provisioner.internal.repository.ClientEntity;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.lang.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
@Service
public class ClientService {
diff --git a/service/src/main/java/io/mifos/provisioner/internal/service/TenantApplicationService.java b/service/src/main/java/io/mifos/provisioner/internal/service/TenantApplicationService.java
index 4666642..5ab4d1c 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/service/TenantApplicationService.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/service/TenantApplicationService.java
@@ -21,12 +21,6 @@
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.mapping.Mapper;
import com.datastax.driver.mapping.Result;
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
-import io.mifos.anubis.config.TenantSignatureRepository;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.lang.AutoTenantContext;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.core.lang.listening.EventExpectation;
import io.mifos.provisioner.config.ProvisionerConstants;
import io.mifos.provisioner.internal.repository.ApplicationEntity;
import io.mifos.provisioner.internal.repository.TenantApplicationEntity;
@@ -34,6 +28,20 @@
import io.mifos.provisioner.internal.repository.TenantEntity;
import io.mifos.provisioner.internal.service.applications.AnubisInitializer;
import io.mifos.provisioner.internal.service.applications.IdentityServiceInitializer;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import org.apache.fineract.cn.anubis.config.TenantSignatureRepository;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.lang.AutoTenantContext;
+import org.apache.fineract.cn.lang.ServiceException;
+import org.apache.fineract.cn.lang.listening.EventExpectation;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -41,12 +49,6 @@
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
-import javax.annotation.Nonnull;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
@Component
public class TenantApplicationService {
@@ -79,7 +81,8 @@
Assert.notNull(appNameToUriMap);
final TenantEntity tenantEntity = tenantCassandraRepository.get(tenantApplicationEntity.getTenantIdentifier())
- .orElseThrow(() -> ServiceException.notFound("Tenant {0} not found.", tenantApplicationEntity.getTenantIdentifier()));
+ .orElseThrow(() -> ServiceException
+ .notFound("Tenant {0} not found.", tenantApplicationEntity.getTenantIdentifier()));
checkApplicationsExist(tenantApplicationEntity.getApplications());
diff --git a/service/src/main/java/io/mifos/provisioner/internal/service/TenantService.java b/service/src/main/java/io/mifos/provisioner/internal/service/TenantService.java
index aa7e87b..0bb0dee 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/service/TenantService.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/service/TenantService.java
@@ -18,10 +18,6 @@
*/
package io.mifos.provisioner.internal.service;
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
-import io.mifos.anubis.repository.TenantAuthorizationDataRepository;
-import io.mifos.core.lang.AutoTenantContext;
-import io.mifos.core.lang.ServiceException;
import io.mifos.provisioner.api.v1.domain.CassandraConnectionInfo;
import io.mifos.provisioner.api.v1.domain.DatabaseConnectionInfo;
import io.mifos.provisioner.api.v1.domain.Tenant;
@@ -33,19 +29,22 @@
import io.mifos.provisioner.internal.service.applications.IdentityServiceInitializer;
import io.mifos.provisioner.internal.util.DataSourceUtils;
import io.mifos.provisioner.internal.util.DataStoreOption;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Nonnull;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
+import javax.annotation.Nonnull;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import org.apache.fineract.cn.anubis.repository.TenantAuthorizationDataRepository;
+import org.apache.fineract.cn.lang.AutoTenantContext;
+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;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
@SuppressWarnings({"SqlNoDataSourceInspection", "SqlDialectInspection"})
@Component
diff --git a/service/src/main/java/io/mifos/provisioner/internal/service/applications/AnubisInitializer.java b/service/src/main/java/io/mifos/provisioner/internal/service/applications/AnubisInitializer.java
index 29442f4..e9285d0 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/service/applications/AnubisInitializer.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/service/applications/AnubisInitializer.java
@@ -18,17 +18,16 @@
*/
package io.mifos.provisioner.internal.service.applications;
-import io.mifos.anubis.api.v1.client.Anubis;
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
-import io.mifos.anubis.api.v1.domain.Signature;
import io.mifos.provisioner.config.ProvisionerConstants;
+import javax.annotation.Nonnull;
+import org.apache.fineract.cn.anubis.api.v1.client.Anubis;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
-import javax.annotation.Nonnull;
-
/**
* @author Myrle Krantz
*/
diff --git a/service/src/main/java/io/mifos/provisioner/internal/service/applications/ApplicationCallContextProvider.java b/service/src/main/java/io/mifos/provisioner/internal/service/applications/ApplicationCallContextProvider.java
index 32ee0b5..f76a60b 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/service/applications/ApplicationCallContextProvider.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/service/applications/ApplicationCallContextProvider.java
@@ -18,13 +18,13 @@
*/
package io.mifos.provisioner.internal.service.applications;
-import io.mifos.anubis.api.v1.RoleConstants;
-import io.mifos.anubis.api.v1.TokenConstants;
-import io.mifos.core.api.context.AutoSeshat;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.ApiFactory;
-import io.mifos.core.lang.AutoTenantContext;
import io.mifos.provisioner.internal.util.TokenProvider;
+import org.apache.fineract.cn.anubis.api.v1.RoleConstants;
+import org.apache.fineract.cn.anubis.api.v1.TokenConstants;
+import org.apache.fineract.cn.api.context.AutoSeshat;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.ApiFactory;
+import org.apache.fineract.cn.lang.AutoTenantContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/service/src/main/java/io/mifos/provisioner/internal/service/applications/IdentityServiceInitializer.java b/service/src/main/java/io/mifos/provisioner/internal/service/applications/IdentityServiceInitializer.java
index b0a3c3a..db23b95 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/service/applications/IdentityServiceInitializer.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/service/applications/IdentityServiceInitializer.java
@@ -19,39 +19,46 @@
package io.mifos.provisioner.internal.service.applications;
-import io.mifos.anubis.api.v1.client.Anubis;
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
-import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
-import io.mifos.core.api.util.InvalidTokenException;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.core.lang.TenantContextHolder;
-import io.mifos.core.lang.listening.EventExpectation;
-import io.mifos.identity.api.v1.client.ApplicationPermissionAlreadyExistsException;
-import io.mifos.identity.api.v1.client.CallEndpointSetAlreadyExistsException;
-import io.mifos.identity.api.v1.client.IdentityManager;
-import io.mifos.identity.api.v1.client.PermittableGroupAlreadyExistsException;
-import io.mifos.identity.api.v1.domain.CallEndpointSet;
-import io.mifos.identity.api.v1.domain.Permission;
-import io.mifos.identity.api.v1.domain.PermittableGroup;
-import io.mifos.permittedfeignclient.api.v1.client.ApplicationPermissionRequirements;
-import io.mifos.permittedfeignclient.api.v1.domain.ApplicationPermission;
import io.mifos.provisioner.config.ProvisionerConstants;
import io.mifos.provisioner.config.SystemProperties;
import io.mifos.provisioner.internal.listener.IdentityListener;
-import io.mifos.tool.crypto.HashGenerator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import org.apache.finearct.cn.permittedfeignclient.api.v1.client.ApplicationPermissionRequirements;
+import org.apache.finearct.cn.permittedfeignclient.api.v1.domain.ApplicationPermission;
+import org.apache.fineract.cn.anubis.api.v1.client.Anubis;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
+import org.apache.fineract.cn.api.util.InvalidTokenException;
+import org.apache.fineract.cn.crypto.HashGenerator;
+import org.apache.fineract.cn.identity.api.v1.client.ApplicationPermissionAlreadyExistsException;
+import org.apache.fineract.cn.identity.api.v1.client.CallEndpointSetAlreadyExistsException;
+import org.apache.fineract.cn.identity.api.v1.client.IdentityManager;
+import org.apache.fineract.cn.identity.api.v1.client.PermittableGroupAlreadyExistsException;
+import org.apache.fineract.cn.identity.api.v1.domain.CallEndpointSet;
+import org.apache.fineract.cn.identity.api.v1.domain.Permission;
+import org.apache.fineract.cn.identity.api.v1.domain.PermittableGroup;
+import org.apache.fineract.cn.lang.ServiceException;
+import org.apache.fineract.cn.lang.TenantContextHolder;
+import org.apache.fineract.cn.lang.listening.EventExpectation;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
import org.springframework.util.Base64Utils;
-import javax.annotation.Nonnull;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
/**
* @author Myrle Krantz
*/
@@ -124,7 +131,8 @@
return new IdentityServiceInitializationResult(signatureSet, encodedPasswordHash);
} catch (final InvalidTokenException e) {
logger.warn("The given identity instance didn't recognize the system token as valid.", e);
- throw ServiceException.conflict("The given identity instance didn't recognize the system token as valid. " +
+ throw ServiceException
+ .conflict("The given identity instance didn't recognize the system token as valid. " +
"Perhaps the system keys for the provisioner or for the identity manager are misconfigured?");
} catch (final Exception e) {
logger.error("An unexpected error occured while initializing identity.", e);
diff --git a/service/src/main/java/io/mifos/provisioner/internal/util/TokenProvider.java b/service/src/main/java/io/mifos/provisioner/internal/util/TokenProvider.java
index 70e772e..0a106a7 100644
--- a/service/src/main/java/io/mifos/provisioner/internal/util/TokenProvider.java
+++ b/service/src/main/java/io/mifos/provisioner/internal/util/TokenProvider.java
@@ -18,15 +18,14 @@
*/
package io.mifos.provisioner.internal.util;
-import io.mifos.anubis.api.v1.RoleConstants;
-import io.mifos.anubis.token.SystemAccessTokenSerializer;
-import io.mifos.anubis.token.TokenSerializationResult;
-
import java.math.BigInteger;
import java.security.KeyFactory;
import java.security.PrivateKey;
import java.security.spec.RSAPrivateKeySpec;
import java.util.concurrent.TimeUnit;
+import org.apache.fineract.cn.anubis.api.v1.RoleConstants;
+import org.apache.fineract.cn.anubis.token.SystemAccessTokenSerializer;
+import org.apache.fineract.cn.anubis.token.TokenSerializationResult;
public class TokenProvider {
private final String keyTimestamp;
diff --git a/service/src/main/java/io/mifos/provisioner/rest/controller/ProvisionerRestController.java b/service/src/main/java/io/mifos/provisioner/rest/controller/ProvisionerRestController.java
index 479eaf5..55a2f28 100644
--- a/service/src/main/java/io/mifos/provisioner/rest/controller/ProvisionerRestController.java
+++ b/service/src/main/java/io/mifos/provisioner/rest/controller/ProvisionerRestController.java
@@ -18,21 +18,34 @@
*/
package io.mifos.provisioner.rest.controller;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.provisioner.api.v1.domain.*;
+import io.mifos.provisioner.api.v1.domain.Application;
+import io.mifos.provisioner.api.v1.domain.AssignedApplication;
+import io.mifos.provisioner.api.v1.domain.AuthenticationResponse;
+import io.mifos.provisioner.api.v1.domain.Client;
+import io.mifos.provisioner.api.v1.domain.IdentityManagerInitialization;
+import io.mifos.provisioner.api.v1.domain.PasswordPolicy;
+import io.mifos.provisioner.api.v1.domain.Tenant;
+import io.mifos.provisioner.config.ProvisionerConstants;
import io.mifos.provisioner.internal.repository.ClientEntity;
import io.mifos.provisioner.internal.repository.TenantApplicationEntity;
-import io.mifos.provisioner.rest.mapper.ApplicationMapper;
-import io.mifos.provisioner.rest.mapper.AssignedApplicationMapper;
-import io.mifos.provisioner.rest.mapper.ClientMapper;
import io.mifos.provisioner.internal.service.ApplicationService;
import io.mifos.provisioner.internal.service.AuthenticationService;
import io.mifos.provisioner.internal.service.ClientService;
import io.mifos.provisioner.internal.service.TenantApplicationService;
import io.mifos.provisioner.internal.service.TenantService;
-import io.mifos.provisioner.config.ProvisionerConstants;
+import io.mifos.provisioner.rest.mapper.ApplicationMapper;
+import io.mifos.provisioner.rest.mapper.AssignedApplicationMapper;
+import io.mifos.provisioner.rest.mapper.ClientMapper;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+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.lang.ServiceException;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -46,10 +59,6 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import javax.validation.Valid;
-import java.util.*;
-import java.util.stream.Collectors;
-
@SuppressWarnings("unused")
@RestController
@RequestMapping("/")
@@ -93,7 +102,8 @@
@RequestParam("password") final String password) {
if (!grantType.equals("password")) {
this.logger.info("Authentication attempt with unknown grant type: " + grantType);
- throw ServiceException.badRequest("Authentication attempt with unknown grant type: {0}", grantType);
+ throw ServiceException
+ .badRequest("Authentication attempt with unknown grant type: {0}", grantType);
}
return ResponseEntity.ok(this.authenticationService.authenticate(clientId, username, password));
}
diff --git a/service/src/test/java/io/mifos/provisioner/config/SystemPropertiesTest.java b/service/src/test/java/io/mifos/provisioner/config/SystemPropertiesTest.java
index 0e97a35..f1dbf52 100644
--- a/service/src/test/java/io/mifos/provisioner/config/SystemPropertiesTest.java
+++ b/service/src/test/java/io/mifos/provisioner/config/SystemPropertiesTest.java
@@ -18,13 +18,12 @@
*/
package io.mifos.provisioner.config;
-import io.mifos.core.lang.security.RsaKeyPairFactory;
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
-import org.junit.runners.Parameterized;
-
import java.util.ArrayList;
import java.util.Collection;
+import org.apache.fineract.cn.lang.security.RsaKeyPairFactory;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runners.Parameterized;
/**
* @author Myrle Krantz
diff --git a/service/src/test/java/io/mifos/provisioner/internal/service/applications/IdentityServiceInitializerTest.java b/service/src/test/java/io/mifos/provisioner/internal/service/applications/IdentityServiceInitializerTest.java
index 75b86b2..4c2b67c 100644
--- a/service/src/test/java/io/mifos/provisioner/internal/service/applications/IdentityServiceInitializerTest.java
+++ b/service/src/test/java/io/mifos/provisioner/internal/service/applications/IdentityServiceInitializerTest.java
@@ -18,14 +18,14 @@
*/
package io.mifos.provisioner.internal.service.applications;
-import io.mifos.anubis.api.v1.client.Anubis;
-import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
-import io.mifos.core.lang.AutoTenantContext;
-import io.mifos.identity.api.v1.client.IdentityManager;
-import io.mifos.identity.api.v1.client.PermittableGroupAlreadyExistsException;
-import io.mifos.identity.api.v1.domain.PermittableGroup;
import io.mifos.provisioner.config.SystemProperties;
import io.mifos.provisioner.internal.listener.IdentityListener;
+import org.apache.fineract.cn.anubis.api.v1.client.Anubis;
+import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
+import org.apache.fineract.cn.identity.api.v1.client.IdentityManager;
+import org.apache.fineract.cn.identity.api.v1.client.PermittableGroupAlreadyExistsException;
+import org.apache.fineract.cn.identity.api.v1.domain.PermittableGroup;
+import org.apache.fineract.cn.lang.AutoTenantContext;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
