Adjusting to package name changes in upstream repositories.
diff --git a/api/src/main/java/io/mifos/identity/api/v1/client/IdentityManager.java b/api/src/main/java/io/mifos/identity/api/v1/client/IdentityManager.java
index 5e82889..f65b722 100644
--- a/api/src/main/java/io/mifos/identity/api/v1/client/IdentityManager.java
+++ b/api/src/main/java/io/mifos/identity/api/v1/client/IdentityManager.java
@@ -18,20 +18,32 @@
*/
package io.mifos.identity.api.v1.client;
-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.anubis.api.v1.validation.ValidKeyTimestamp;
-import io.mifos.core.api.annotation.ThrowsException;
-import io.mifos.core.api.util.CustomFeignClientsConfiguration;
-import io.mifos.identity.api.v1.domain.*;
+import io.mifos.identity.api.v1.domain.Authentication;
+import io.mifos.identity.api.v1.domain.CallEndpointSet;
+import io.mifos.identity.api.v1.domain.Password;
+import io.mifos.identity.api.v1.domain.Permission;
+import io.mifos.identity.api.v1.domain.PermittableGroup;
+import io.mifos.identity.api.v1.domain.Role;
+import io.mifos.identity.api.v1.domain.RoleIdentifier;
+import io.mifos.identity.api.v1.domain.User;
+import io.mifos.identity.api.v1.domain.UserWithPassword;
+import java.util.List;
+import java.util.Set;
+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.apache.fineract.cn.anubis.api.v1.validation.ValidKeyTimestamp;
+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;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Set;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* @author Myrle Krantz
diff --git a/api/src/main/java/io/mifos/identity/api/v1/domain/CallEndpointSet.java b/api/src/main/java/io/mifos/identity/api/v1/domain/CallEndpointSet.java
index 6596436..119e614 100644
--- a/api/src/main/java/io/mifos/identity/api/v1/domain/CallEndpointSet.java
+++ b/api/src/main/java/io/mifos/identity/api/v1/domain/CallEndpointSet.java
@@ -18,11 +18,11 @@
*/
package io.mifos.identity.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Objects;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
/**
* @author Myrle Krantz
diff --git a/api/src/main/java/io/mifos/identity/api/v1/domain/Permission.java b/api/src/main/java/io/mifos/identity/api/v1/domain/Permission.java
index 1e41fdf..5933973 100644
--- a/api/src/main/java/io/mifos/identity/api/v1/domain/Permission.java
+++ b/api/src/main/java/io/mifos/identity/api/v1/domain/Permission.java
@@ -18,13 +18,12 @@
*/
package io.mifos.identity.api.v1.domain;
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
-import org.hibernate.validator.constraints.NotBlank;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
import java.util.Objects;
import java.util.Set;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import org.hibernate.validator.constraints.NotBlank;
/**
* @author Myrle Krantz
diff --git a/api/src/main/java/io/mifos/identity/api/v1/domain/PermittableGroup.java b/api/src/main/java/io/mifos/identity/api/v1/domain/PermittableGroup.java
index fea7382..d2a915d 100644
--- a/api/src/main/java/io/mifos/identity/api/v1/domain/PermittableGroup.java
+++ b/api/src/main/java/io/mifos/identity/api/v1/domain/PermittableGroup.java
@@ -18,12 +18,12 @@
*/
package io.mifos.identity.api.v1.domain;
-import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Objects;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
/**
* @author Myrle Krantz
diff --git a/api/src/main/java/io/mifos/identity/api/v1/domain/Role.java b/api/src/main/java/io/mifos/identity/api/v1/domain/Role.java
index a0f9488..86794db 100644
--- a/api/src/main/java/io/mifos/identity/api/v1/domain/Role.java
+++ b/api/src/main/java/io/mifos/identity/api/v1/domain/Role.java
@@ -18,8 +18,8 @@
*/
package io.mifos.identity.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
import io.mifos.identity.api.v1.validation.ChangeableRole;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
import org.hibernate.validator.constraints.ScriptAssert;
import org.springframework.util.Assert;
diff --git a/api/src/main/java/io/mifos/identity/api/v1/domain/UserWithPassword.java b/api/src/main/java/io/mifos/identity/api/v1/domain/UserWithPassword.java
index 5205d32..221bb80 100644
--- a/api/src/main/java/io/mifos/identity/api/v1/domain/UserWithPassword.java
+++ b/api/src/main/java/io/mifos/identity/api/v1/domain/UserWithPassword.java
@@ -18,7 +18,7 @@
*/
package io.mifos.identity.api.v1.domain;
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.NotBlank;
import org.hibernate.validator.constraints.ScriptAssert;
diff --git a/api/src/test/java/io/mifos/identity/api/v1/domain/CallEndpointSetTest.java b/api/src/test/java/io/mifos/identity/api/v1/domain/CallEndpointSetTest.java
index 91f405d..c76138f 100644
--- a/api/src/test/java/io/mifos/identity/api/v1/domain/CallEndpointSetTest.java
+++ b/api/src/test/java/io/mifos/identity/api/v1/domain/CallEndpointSetTest.java
@@ -18,14 +18,13 @@
*/
package io.mifos.identity.api.v1.domain;
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
/**
* @author Myrle Krantz
diff --git a/api/src/test/java/io/mifos/identity/v1/domain/PasswordTest.java b/api/src/test/java/io/mifos/identity/v1/domain/PasswordTest.java
index 4900acb..c68bed1 100644
--- a/api/src/test/java/io/mifos/identity/v1/domain/PasswordTest.java
+++ b/api/src/test/java/io/mifos/identity/v1/domain/PasswordTest.java
@@ -18,8 +18,8 @@
*/
package io.mifos.identity.v1.domain;
-import io.mifos.core.test.domain.ValidationTestCase;
import io.mifos.identity.api.v1.domain.Password;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/api/src/test/java/io/mifos/identity/v1/domain/RoleIdentifierTest.java b/api/src/test/java/io/mifos/identity/v1/domain/RoleIdentifierTest.java
index bea62eb..9f4b0d3 100644
--- a/api/src/test/java/io/mifos/identity/v1/domain/RoleIdentifierTest.java
+++ b/api/src/test/java/io/mifos/identity/v1/domain/RoleIdentifierTest.java
@@ -18,8 +18,8 @@
*/
package io.mifos.identity.v1.domain;
-import io.mifos.core.test.domain.ValidationTestCase;
import io.mifos.identity.api.v1.domain.RoleIdentifier;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/api/src/test/java/io/mifos/identity/v1/domain/RoleTest.java b/api/src/test/java/io/mifos/identity/v1/domain/RoleTest.java
index 2f1a374..def123d 100644
--- a/api/src/test/java/io/mifos/identity/v1/domain/RoleTest.java
+++ b/api/src/test/java/io/mifos/identity/v1/domain/RoleTest.java
@@ -18,15 +18,14 @@
*/
package io.mifos.identity.v1.domain;
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
import io.mifos.identity.api.v1.domain.Role;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
/**
* @author Myrle Krantz
diff --git a/api/src/test/java/io/mifos/identity/v1/domain/UserWithPasswordTest.java b/api/src/test/java/io/mifos/identity/v1/domain/UserWithPasswordTest.java
index 41d7d26..8773ad4 100644
--- a/api/src/test/java/io/mifos/identity/v1/domain/UserWithPasswordTest.java
+++ b/api/src/test/java/io/mifos/identity/v1/domain/UserWithPasswordTest.java
@@ -18,17 +18,16 @@
*/
package io.mifos.identity.v1.domain;
-import io.mifos.core.api.util.ApiConstants;
-import io.mifos.core.test.domain.ValidationTestCase;
import io.mifos.identity.api.v1.domain.UserWithPassword;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.fineract.cn.api.util.ApiConstants;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import java.util.ArrayList;
-import java.util.Collection;
-
/**
* @author Myrle Krantz
*/
diff --git a/component-test/src/main/java/AbstractComponentTest.java b/component-test/src/main/java/AbstractComponentTest.java
index eade908..b02011d 100644
--- a/component-test/src/main/java/AbstractComponentTest.java
+++ b/component-test/src/main/java/AbstractComponentTest.java
@@ -16,27 +16,33 @@
* specific language governing permissions and limitations
* under the License.
*/
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
-import io.mifos.anubis.api.v1.domain.Signature;
-import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
-import io.mifos.core.api.config.EnableApiFactory;
-import io.mifos.core.api.context.AutoGuest;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.ApiFactory;
-import io.mifos.core.api.util.UserContextHolder;
-import io.mifos.core.lang.security.RsaKeyPairFactory;
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.core.test.fixture.TenantDataStoreContextTestRule;
-import io.mifos.core.test.listener.EnableEventRecording;
-import io.mifos.core.test.listener.EventRecorder;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.client.IdentityManager;
-import io.mifos.identity.api.v1.domain.*;
+import io.mifos.identity.api.v1.domain.Authentication;
+import io.mifos.identity.api.v1.domain.Password;
+import io.mifos.identity.api.v1.domain.Permission;
+import io.mifos.identity.api.v1.domain.Role;
+import io.mifos.identity.api.v1.domain.UserWithPassword;
import io.mifos.identity.api.v1.events.ApplicationPermissionEvent;
import io.mifos.identity.api.v1.events.ApplicationSignatureEvent;
import io.mifos.identity.api.v1.events.EventConstants;
import io.mifos.identity.config.IdentityServiceConfig;
+import java.util.Arrays;
+import javax.annotation.PostConstruct;
import org.apache.commons.lang.RandomStringUtils;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
+import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+import org.apache.fineract.cn.api.config.EnableApiFactory;
+import org.apache.fineract.cn.api.context.AutoGuest;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.ApiFactory;
+import org.apache.fineract.cn.api.util.UserContextHolder;
+import org.apache.fineract.cn.lang.security.RsaKeyPairFactory;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+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.Assert;
import org.junit.ClassRule;
@@ -49,9 +55,6 @@
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
-import javax.annotation.PostConstruct;
-import java.util.Arrays;
-
/**
* @author Myrle Krantz
*/
diff --git a/component-test/src/main/java/SuiteTestEnvironment.java b/component-test/src/main/java/SuiteTestEnvironment.java
index 38ffb40..a1abcab 100644
--- a/component-test/src/main/java/SuiteTestEnvironment.java
+++ b/component-test/src/main/java/SuiteTestEnvironment.java
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.core.test.fixture.cassandra.CassandraInitializer;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer;
import org.junit.ClassRule;
import org.junit.rules.RuleChain;
import org.junit.rules.RunExternalResourceOnce;
diff --git a/component-test/src/main/java/TestApplications.java b/component-test/src/main/java/TestApplications.java
index 96eda9d..06a2cbc 100644
--- a/component-test/src/main/java/TestApplications.java
+++ b/component-test/src/main/java/TestApplications.java
@@ -16,11 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
-import io.mifos.anubis.token.TenantRefreshTokenSerializer;
-import io.mifos.anubis.token.TokenSerializationResult;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.NotFoundException;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.domain.Authentication;
import io.mifos.identity.api.v1.domain.CallEndpointSet;
@@ -31,6 +26,11 @@
import io.mifos.identity.api.v1.events.ApplicationPermissionUserEvent;
import io.mifos.identity.api.v1.events.EventConstants;
import org.apache.commons.lang.RandomStringUtils;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import org.apache.fineract.cn.anubis.token.TenantRefreshTokenSerializer;
+import org.apache.fineract.cn.anubis.token.TokenSerializationResult;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.NotFoundException;
import org.junit.Assert;
import org.junit.Test;
diff --git a/component-test/src/main/java/TestAuthentication.java b/component-test/src/main/java/TestAuthentication.java
index fc6c3d5..1404166 100644
--- a/component-test/src/main/java/TestAuthentication.java
+++ b/component-test/src/main/java/TestAuthentication.java
@@ -16,25 +16,40 @@
* specific language governing permissions and limitations
* under the License.
*/
+import static io.mifos.identity.api.v1.events.EventConstants.OPERATION_POST_PERMITTABLE_GROUP;
+import static io.mifos.identity.api.v1.events.EventConstants.OPERATION_POST_ROLE;
+import static io.mifos.identity.api.v1.events.EventConstants.OPERATION_POST_USER;
+import static io.mifos.identity.api.v1.events.EventConstants.OPERATION_PUT_USER_PASSWORD;
+
import com.google.common.collect.Sets;
-import io.mifos.anubis.api.v1.client.Anubis;
-import io.mifos.anubis.api.v1.domain.*;
-import io.mifos.anubis.test.v1.SystemSecurityEnvironment;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.InvalidTokenException;
-import io.mifos.core.api.util.NotFoundException;
-import io.mifos.core.lang.AutoTenantContext;
-import io.mifos.core.lang.security.RsaPublicKeyBuilder;
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.identity.api.v1.domain.*;
+import io.mifos.identity.api.v1.domain.Authentication;
+import io.mifos.identity.api.v1.domain.Password;
+import io.mifos.identity.api.v1.domain.Permission;
+import io.mifos.identity.api.v1.domain.PermittableGroup;
+import io.mifos.identity.api.v1.domain.Role;
+import io.mifos.identity.api.v1.domain.UserWithPassword;
+import java.security.PublicKey;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+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.PermittableEndpoint;
+import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
+import org.apache.fineract.cn.anubis.api.v1.domain.TokenContent;
+import org.apache.fineract.cn.anubis.api.v1.domain.TokenPermission;
+import org.apache.fineract.cn.anubis.test.v1.SystemSecurityEnvironment;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.InvalidTokenException;
+import org.apache.fineract.cn.api.util.NotFoundException;
+import org.apache.fineract.cn.lang.AutoTenantContext;
+import org.apache.fineract.cn.lang.security.RsaPublicKeyBuilder;
+import org.apache.fineract.cn.test.env.TestEnvironment;
import org.junit.Assert;
import org.junit.Test;
-import java.security.PublicKey;
-import java.util.*;
-
-import static io.mifos.identity.api.v1.events.EventConstants.*;
-
/**
* @author Myrle Krantz
*/
@@ -137,7 +152,8 @@
}
final Authentication authentication = getTestSubject().login(user.getIdentifier(), user.getPassword());
- final TokenContent tokenContent = SystemSecurityEnvironment.getTokenContent(authentication.getAccessToken(), getPublicKey());
+ final TokenContent tokenContent = SystemSecurityEnvironment
+ .getTokenContent(authentication.getAccessToken(), getPublicKey());
final Set<TokenPermission> tokenPermissions = new HashSet<>(tokenContent.getTokenPermissions());
final Set<TokenPermission> expectedTokenPermissions= new HashSet<>();
diff --git a/component-test/src/main/java/TestKeyRotation.java b/component-test/src/main/java/TestKeyRotation.java
index a1bffdc..152284d 100644
--- a/component-test/src/main/java/TestKeyRotation.java
+++ b/component-test/src/main/java/TestKeyRotation.java
@@ -16,20 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-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.core.api.context.AutoGuest;
-import io.mifos.core.api.context.AutoSeshat;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.NotFoundException;
-import io.mifos.core.test.env.TestEnvironment;
import io.mifos.identity.api.v1.domain.Authentication;
-import org.junit.Assert;
-import org.junit.Test;
-
import java.util.List;
import java.util.concurrent.TimeUnit;
+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.apache.fineract.cn.api.context.AutoGuest;
+import org.apache.fineract.cn.api.context.AutoSeshat;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.NotFoundException;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @author Myrle Krantz
@@ -82,7 +81,8 @@
final Authentication adminAuthenticationOnSecondKeyset;
try (final AutoUserContext ignored2 = new AutoGuest()) {
- adminAuthenticationOnSecondKeyset = getTestSubject().login(ADMIN_IDENTIFIER, TestEnvironment.encodePassword(ADMIN_PASSWORD));
+ adminAuthenticationOnSecondKeyset = getTestSubject().login(ADMIN_IDENTIFIER, TestEnvironment
+ .encodePassword(ADMIN_PASSWORD));
}
Assert.assertTrue(canAccessResources(adminAuthenticationOnFirstKeyset));
diff --git a/component-test/src/main/java/TestPasswords.java b/component-test/src/main/java/TestPasswords.java
index 0cf22da..cfa9e22 100644
--- a/component-test/src/main/java/TestPasswords.java
+++ b/component-test/src/main/java/TestPasswords.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.NotFoundException;
-import io.mifos.core.test.domain.TimeStampChecker;
-import io.mifos.core.test.env.TestEnvironment;
import io.mifos.identity.api.v1.domain.Authentication;
import io.mifos.identity.api.v1.domain.Password;
import io.mifos.identity.api.v1.domain.UserWithPassword;
import io.mifos.identity.api.v1.events.EventConstants;
import org.apache.commons.lang.RandomStringUtils;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.NotFoundException;
+import org.apache.fineract.cn.test.domain.TimeStampChecker;
+import org.apache.fineract.cn.test.env.TestEnvironment;
import org.junit.Assert;
import org.junit.Test;
diff --git a/component-test/src/main/java/TestPermittableGroups.java b/component-test/src/main/java/TestPermittableGroups.java
index 7f75251..acb31bb 100644
--- a/component-test/src/main/java/TestPermittableGroups.java
+++ b/component-test/src/main/java/TestPermittableGroups.java
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.identity.api.v1.events.EventConstants;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.domain.PermittableGroup;
-import org.junit.Assert;
-import org.junit.Test;
-
+import io.mifos.identity.api.v1.events.EventConstants;
import java.util.Collections;
import java.util.List;
+import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @author Myrle Krantz
diff --git a/component-test/src/main/java/TestProvisioning.java b/component-test/src/main/java/TestProvisioning.java
index e1ef55c..e4ffb00 100644
--- a/component-test/src/main/java/TestProvisioning.java
+++ b/component-test/src/main/java/TestProvisioning.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-import io.mifos.anubis.api.v1.RoleConstants;
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
-import io.mifos.anubis.api.v1.domain.Signature;
-import io.mifos.anubis.token.SystemAccessTokenSerializer;
-import io.mifos.core.api.context.AutoSeshat;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.InvalidTokenException;
-import io.mifos.core.lang.AutoTenantContext;
-import io.mifos.core.lang.TenantContextHolder;
-import io.mifos.core.test.env.TestEnvironment;
import io.mifos.identity.api.v1.client.IdentityManager;
+import org.apache.fineract.cn.anubis.api.v1.RoleConstants;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
+import org.apache.fineract.cn.anubis.token.SystemAccessTokenSerializer;
+import org.apache.fineract.cn.api.context.AutoSeshat;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.InvalidTokenException;
+import org.apache.fineract.cn.lang.AutoTenantContext;
+import org.apache.fineract.cn.lang.TenantContextHolder;
+import org.apache.fineract.cn.test.env.TestEnvironment;
import org.junit.Assert;
import org.junit.Test;
diff --git a/component-test/src/main/java/TestRefreshToken.java b/component-test/src/main/java/TestRefreshToken.java
index 6d45dc2..8385721 100644
--- a/component-test/src/main/java/TestRefreshToken.java
+++ b/component-test/src/main/java/TestRefreshToken.java
@@ -16,21 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-import io.mifos.anubis.api.v1.TokenConstants;
-import io.mifos.anubis.token.TenantRefreshTokenSerializer;
-import io.mifos.anubis.token.TokenSerializationResult;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.FeignTargetWithCookieJar;
-import io.mifos.core.api.util.InvalidTokenException;
-import io.mifos.core.api.util.NotFoundException;
-import io.mifos.core.test.domain.TimeStampChecker;
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.core.test.fixture.TenantDataStoreTestContext;
+
import io.mifos.identity.api.v1.client.IdentityManager;
import io.mifos.identity.api.v1.domain.Authentication;
import io.mifos.identity.api.v1.domain.Password;
import io.mifos.identity.api.v1.domain.Permission;
import io.mifos.identity.api.v1.domain.User;
+import org.apache.fineract.cn.anubis.api.v1.TokenConstants;
+import org.apache.fineract.cn.anubis.token.TenantRefreshTokenSerializer;
+import org.apache.fineract.cn.anubis.token.TokenSerializationResult;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.FeignTargetWithCookieJar;
+import org.apache.fineract.cn.api.util.InvalidTokenException;
+import org.apache.fineract.cn.api.util.NotFoundException;
+import org.apache.fineract.cn.test.domain.TimeStampChecker;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.fixture.TenantDataStoreTestContext;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/component-test/src/main/java/TestRoles.java b/component-test/src/main/java/TestRoles.java
index 7479d27..8902d5b 100644
--- a/component-test/src/main/java/TestRoles.java
+++ b/component-test/src/main/java/TestRoles.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.NotFoundException;
import io.mifos.identity.api.v1.domain.Permission;
import io.mifos.identity.api.v1.domain.Role;
import io.mifos.identity.api.v1.events.EventConstants;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.NotFoundException;
import org.junit.Assert;
import org.junit.Test;
diff --git a/component-test/src/main/java/TestUsers.java b/component-test/src/main/java/TestUsers.java
index cb5d6fc..b267fab 100644
--- a/component-test/src/main/java/TestUsers.java
+++ b/component-test/src/main/java/TestUsers.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.test.env.TestEnvironment;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.domain.*;
import io.mifos.identity.api.v1.events.EventConstants;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.test.env.TestEnvironment;
import org.junit.Assert;
import org.junit.Test;
diff --git a/component-test/src/main/java/listener/ApplicationEventListener.java b/component-test/src/main/java/listener/ApplicationEventListener.java
index 11c7e1c..0d73b6c 100644
--- a/component-test/src/main/java/listener/ApplicationEventListener.java
+++ b/component-test/src/main/java/listener/ApplicationEventListener.java
@@ -18,9 +18,13 @@
*/
package listener;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.identity.api.v1.events.*;
+import io.mifos.identity.api.v1.events.ApplicationCallEndpointSetEvent;
+import io.mifos.identity.api.v1.events.ApplicationPermissionEvent;
+import io.mifos.identity.api.v1.events.ApplicationPermissionUserEvent;
+import io.mifos.identity.api.v1.events.ApplicationSignatureEvent;
+import io.mifos.identity.api.v1.events.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/listener/AuthenticationEventListener.java b/component-test/src/main/java/listener/AuthenticationEventListener.java
index ab47c74..cda355d 100644
--- a/component-test/src/main/java/listener/AuthenticationEventListener.java
+++ b/component-test/src/main/java/listener/AuthenticationEventListener.java
@@ -18,9 +18,9 @@
*/
package listener;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
import io.mifos.identity.api.v1.events.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/listener/PermittableGroupEventListener.java b/component-test/src/main/java/listener/PermittableGroupEventListener.java
index 3fdb599..7df51d6 100644
--- a/component-test/src/main/java/listener/PermittableGroupEventListener.java
+++ b/component-test/src/main/java/listener/PermittableGroupEventListener.java
@@ -18,9 +18,9 @@
*/
package listener;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
import io.mifos.identity.api.v1.events.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/listener/RoleEventListener.java b/component-test/src/main/java/listener/RoleEventListener.java
index f9c7f85..15af1fe 100644
--- a/component-test/src/main/java/listener/RoleEventListener.java
+++ b/component-test/src/main/java/listener/RoleEventListener.java
@@ -18,9 +18,9 @@
*/
package listener;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
import io.mifos.identity.api.v1.events.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/listener/UserEventListener.java b/component-test/src/main/java/listener/UserEventListener.java
index 9eb8baa..2143e0a 100644
--- a/component-test/src/main/java/listener/UserEventListener.java
+++ b/component-test/src/main/java/listener/UserEventListener.java
@@ -18,9 +18,9 @@
*/
package listener;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
import io.mifos.identity.api.v1.events.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/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java b/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java
index 2e79f1d..25bf8b5 100644
--- a/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java
+++ b/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java
@@ -20,14 +20,14 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-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.identity.internal.util.IdentityConstants;
-import io.mifos.tool.crypto.config.EnableCrypto;
+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.crypto.config.EnableCrypto;
+import org.apache.fineract.cn.lang.config.EnableServiceException;
+import org.apache.fineract.cn.lang.config.EnableTenantContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
diff --git a/service/src/main/java/io/mifos/identity/internal/command/SetApplicationSignatureCommand.java b/service/src/main/java/io/mifos/identity/internal/command/SetApplicationSignatureCommand.java
index c25a588..bc2b384 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/SetApplicationSignatureCommand.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/SetApplicationSignatureCommand.java
@@ -18,7 +18,7 @@
*/
package io.mifos.identity.internal.command;
-import io.mifos.anubis.api.v1.domain.Signature;
+import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/internal/command/handler/ApplicationCommandHandler.java b/service/src/main/java/io/mifos/identity/internal/command/handler/ApplicationCommandHandler.java
index cd454d0..3aad1b6 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/handler/ApplicationCommandHandler.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/handler/ApplicationCommandHandler.java
@@ -18,16 +18,33 @@
*/
package io.mifos.identity.internal.command.handler;
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
-import io.mifos.core.command.annotation.EventEmitter;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.identity.api.v1.events.*;
-import io.mifos.identity.internal.command.*;
+import io.mifos.identity.api.v1.events.ApplicationCallEndpointSetEvent;
+import io.mifos.identity.api.v1.events.ApplicationPermissionEvent;
+import io.mifos.identity.api.v1.events.ApplicationPermissionUserEvent;
+import io.mifos.identity.api.v1.events.ApplicationSignatureEvent;
+import io.mifos.identity.api.v1.events.EventConstants;
+import io.mifos.identity.internal.command.ChangeApplicationCallEndpointSetCommand;
+import io.mifos.identity.internal.command.CreateApplicationCallEndpointSetCommand;
+import io.mifos.identity.internal.command.CreateApplicationPermissionCommand;
+import io.mifos.identity.internal.command.DeleteApplicationCallEndpointSetCommand;
+import io.mifos.identity.internal.command.DeleteApplicationCommand;
+import io.mifos.identity.internal.command.DeleteApplicationPermissionCommand;
+import io.mifos.identity.internal.command.SetApplicationPermissionUserEnabledCommand;
+import io.mifos.identity.internal.command.SetApplicationSignatureCommand;
import io.mifos.identity.internal.mapper.ApplicationCallEndpointSetMapper;
import io.mifos.identity.internal.mapper.PermissionMapper;
-import io.mifos.identity.internal.repository.*;
+import io.mifos.identity.internal.repository.ApplicationCallEndpointSetEntity;
+import io.mifos.identity.internal.repository.ApplicationCallEndpointSets;
+import io.mifos.identity.internal.repository.ApplicationPermissionEntity;
+import io.mifos.identity.internal.repository.ApplicationPermissionUsers;
+import io.mifos.identity.internal.repository.ApplicationPermissions;
+import io.mifos.identity.internal.repository.ApplicationSignatureEntity;
+import io.mifos.identity.internal.repository.ApplicationSignatures;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
+import org.apache.fineract.cn.command.annotation.EventEmitter;
+import org.apache.fineract.cn.lang.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/service/src/main/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandler.java b/service/src/main/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandler.java
index b779fde..8e6b319 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandler.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandler.java
@@ -20,23 +20,6 @@
import com.google.common.collect.Sets;
import com.google.gson.Gson;
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
-import io.mifos.anubis.api.v1.domain.TokenContent;
-import io.mifos.anubis.api.v1.domain.TokenPermission;
-import io.mifos.anubis.provider.InvalidKeyTimestampException;
-import io.mifos.anubis.provider.TenantRsaKeyProvider;
-import io.mifos.anubis.security.AmitAuthenticationException;
-import io.mifos.anubis.token.*;
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
-import io.mifos.core.lang.ApplicationName;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.core.lang.TenantContextHolder;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.lang.security.RsaPrivateKeyBuilder;
-import io.mifos.core.lang.security.RsaPublicKeyBuilder;
import io.mifos.identity.api.v1.events.EventConstants;
import io.mifos.identity.internal.command.AuthenticationCommandResponse;
import io.mifos.identity.internal.command.PasswordAuthenticationCommand;
@@ -44,7 +27,28 @@
import io.mifos.identity.internal.repository.*;
import io.mifos.identity.internal.service.RoleMapper;
import io.mifos.identity.internal.util.IdentityConstants;
-import io.mifos.tool.crypto.HashGenerator;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import org.apache.fineract.cn.anubis.api.v1.domain.TokenContent;
+import org.apache.fineract.cn.anubis.api.v1.domain.TokenPermission;
+import org.apache.fineract.cn.anubis.provider.InvalidKeyTimestampException;
+import org.apache.fineract.cn.anubis.provider.TenantRsaKeyProvider;
+import org.apache.fineract.cn.anubis.security.AmitAuthenticationException;
+import org.apache.fineract.cn.anubis.token.TenantAccessTokenSerializer;
+import org.apache.fineract.cn.anubis.token.TenantApplicationRsaKeyProvider;
+import org.apache.fineract.cn.anubis.token.TenantRefreshTokenSerializer;
+import org.apache.fineract.cn.anubis.token.TokenDeserializationResult;
+import org.apache.fineract.cn.anubis.token.TokenSerializationResult;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
+import org.apache.fineract.cn.crypto.HashGenerator;
+import org.apache.fineract.cn.lang.ApplicationName;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.apache.fineract.cn.lang.ServiceException;
+import org.apache.fineract.cn.lang.TenantContextHolder;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.lang.security.RsaPrivateKeyBuilder;
+import org.apache.fineract.cn.lang.security.RsaPublicKeyBuilder;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -187,7 +191,8 @@
private PrivateSignatureEntity checkedGetPrivateSignature() {
final Optional<PrivateSignatureEntity> privateSignature = signatures.getPrivateSignature();
if (!privateSignature.isPresent()) {
- logger.error("Authentication attempted on tenant with no valid signature{}.", TenantContextHolder.identifier());
+ logger.error("Authentication attempted on tenant with no valid signature{}.", TenantContextHolder
+ .identifier());
throw ServiceException.internalError("Tenant has no valid signature.");
}
return privateSignature.get();
diff --git a/service/src/main/java/io/mifos/identity/internal/command/handler/PermittableGroupCommandHandler.java b/service/src/main/java/io/mifos/identity/internal/command/handler/PermittableGroupCommandHandler.java
index 128f924..d63634d 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/handler/PermittableGroupCommandHandler.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/handler/PermittableGroupCommandHandler.java
@@ -18,23 +18,22 @@
*/
package io.mifos.identity.internal.command.handler;
-import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
-import io.mifos.core.command.annotation.EventEmitter;
import io.mifos.identity.api.v1.domain.PermittableGroup;
import io.mifos.identity.api.v1.events.EventConstants;
import io.mifos.identity.internal.command.CreatePermittableGroupCommand;
import io.mifos.identity.internal.repository.PermittableGroupEntity;
import io.mifos.identity.internal.repository.PermittableGroups;
import io.mifos.identity.internal.repository.PermittableType;
+import java.util.stream.Collectors;
+import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
+import org.apache.fineract.cn.command.annotation.EventEmitter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
-import java.util.stream.Collectors;
-
/**
* @author Myrle Krantz
*/
diff --git a/service/src/main/java/io/mifos/identity/internal/command/handler/Provisioner.java b/service/src/main/java/io/mifos/identity/internal/command/handler/Provisioner.java
index c19fa47..9f2374f 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/handler/Provisioner.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/handler/Provisioner.java
@@ -19,21 +19,27 @@
package io.mifos.identity.internal.command.handler;
import com.datastax.driver.core.exceptions.InvalidQueryException;
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.core.lang.TenantContextHolder;
-import io.mifos.core.lang.security.RsaKeyPairFactory;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.internal.mapper.SignatureMapper;
-import io.mifos.identity.internal.repository.*;
+import io.mifos.identity.internal.repository.AllowedOperationType;
+import io.mifos.identity.internal.repository.ApplicationCallEndpointSets;
+import io.mifos.identity.internal.repository.ApplicationPermissionUsers;
+import io.mifos.identity.internal.repository.ApplicationPermissions;
+import io.mifos.identity.internal.repository.ApplicationSignatures;
+import io.mifos.identity.internal.repository.PermissionType;
+import io.mifos.identity.internal.repository.Permissions;
+import io.mifos.identity.internal.repository.PermittableGroupEntity;
+import io.mifos.identity.internal.repository.PermittableGroups;
+import io.mifos.identity.internal.repository.PermittableType;
+import io.mifos.identity.internal.repository.PrivateTenantInfoEntity;
+import io.mifos.identity.internal.repository.RoleEntity;
+import io.mifos.identity.internal.repository.Roles;
+import io.mifos.identity.internal.repository.SignatureEntity;
+import io.mifos.identity.internal.repository.Signatures;
+import io.mifos.identity.internal.repository.Tenants;
+import io.mifos.identity.internal.repository.UserEntity;
+import io.mifos.identity.internal.repository.Users;
import io.mifos.identity.internal.util.IdentityConstants;
-import io.mifos.tool.crypto.SaltGenerator;
-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.stereotype.Component;
-
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
@@ -41,6 +47,16 @@
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import org.apache.fineract.cn.crypto.SaltGenerator;
+import org.apache.fineract.cn.lang.ServiceException;
+import org.apache.fineract.cn.lang.TenantContextHolder;
+import org.apache.fineract.cn.lang.security.RsaKeyPairFactory;
+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.stereotype.Component;
/**
* @author Myrle Krantz
@@ -111,7 +127,8 @@
if (latestSignature.isPresent()) {
final Optional<ByteBuffer> fixedSalt = tenant.getPrivateTenantInfo().map(PrivateTenantInfoEntity::getFixedSalt);
if (fixedSalt.isPresent()) {
- logger.info("Changing password for tenant '{}' instead of provisioning...", TenantContextHolder.checkedGetIdentifier());
+ logger.info("Changing password for tenant '{}' instead of provisioning...", TenantContextHolder
+ .checkedGetIdentifier());
final UserEntity suUser = userEntityCreator
.build(IdentityConstants.SU_NAME, IdentityConstants.SU_ROLE, initialPasswordHash, true,
fixedSalt.get().array(), timeToChangePasswordAfterExpirationInDays);
diff --git a/service/src/main/java/io/mifos/identity/internal/command/handler/RoleCommandHandler.java b/service/src/main/java/io/mifos/identity/internal/command/handler/RoleCommandHandler.java
index 51c042b..95e3a7b 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/handler/RoleCommandHandler.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/handler/RoleCommandHandler.java
@@ -18,10 +18,6 @@
*/
package io.mifos.identity.internal.command.handler;
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
-import io.mifos.core.command.annotation.EventEmitter;
import io.mifos.identity.api.v1.domain.Role;
import io.mifos.identity.api.v1.events.EventConstants;
import io.mifos.identity.internal.command.ChangeRoleCommand;
@@ -30,14 +26,17 @@
import io.mifos.identity.internal.mapper.PermissionMapper;
import io.mifos.identity.internal.repository.RoleEntity;
import io.mifos.identity.internal.repository.Roles;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
+import org.apache.fineract.cn.command.annotation.EventEmitter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
-import javax.annotation.Nonnull;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
/**
* @author Myrle Krantz
*/
diff --git a/service/src/main/java/io/mifos/identity/internal/command/handler/UserCommandHandler.java b/service/src/main/java/io/mifos/identity/internal/command/handler/UserCommandHandler.java
index 95dcdf0..e336644 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/handler/UserCommandHandler.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/handler/UserCommandHandler.java
@@ -18,17 +18,17 @@
*/
package io.mifos.identity.internal.command.handler;
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
-import io.mifos.core.command.annotation.EventEmitter;
-import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.events.EventConstants;
import io.mifos.identity.internal.command.ChangeUserPasswordCommand;
import io.mifos.identity.internal.command.ChangeUserRoleCommand;
import io.mifos.identity.internal.command.CreateUserCommand;
import io.mifos.identity.internal.repository.UserEntity;
import io.mifos.identity.internal.repository.Users;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
+import org.apache.fineract.cn.command.annotation.EventEmitter;
+import org.apache.fineract.cn.lang.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
diff --git a/service/src/main/java/io/mifos/identity/internal/command/handler/UserEntityCreator.java b/service/src/main/java/io/mifos/identity/internal/command/handler/UserEntityCreator.java
index 5107408..a26168f 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/handler/UserEntityCreator.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/handler/UserEntityCreator.java
@@ -19,21 +19,20 @@
package io.mifos.identity.internal.command.handler;
import com.datastax.driver.core.LocalDate;
-import io.mifos.core.lang.ServiceException;
import io.mifos.identity.internal.repository.PrivateTenantInfoEntity;
import io.mifos.identity.internal.repository.Tenants;
import io.mifos.identity.internal.repository.UserEntity;
import io.mifos.identity.internal.util.IdentityConstants;
import io.mifos.identity.internal.util.Time;
-import io.mifos.tool.crypto.HashGenerator;
-import io.mifos.tool.crypto.SaltGenerator;
+import java.nio.ByteBuffer;
+import java.util.Optional;
+import org.apache.fineract.cn.crypto.HashGenerator;
+import org.apache.fineract.cn.crypto.SaltGenerator;
+import org.apache.fineract.cn.lang.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.util.EncodingUtils;
import org.springframework.stereotype.Component;
-import java.nio.ByteBuffer;
-import java.util.Optional;
-
/**
* @author Myrle Krantz
*/
diff --git a/service/src/main/java/io/mifos/identity/internal/mapper/PermissionMapper.java b/service/src/main/java/io/mifos/identity/internal/mapper/PermissionMapper.java
index b7ce862..f2cb607 100644
--- a/service/src/main/java/io/mifos/identity/internal/mapper/PermissionMapper.java
+++ b/service/src/main/java/io/mifos/identity/internal/mapper/PermissionMapper.java
@@ -18,15 +18,14 @@
*/
package io.mifos.identity.internal.mapper;
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
import io.mifos.identity.api.v1.domain.Permission;
import io.mifos.identity.internal.repository.AllowedOperationType;
import io.mifos.identity.internal.repository.PermissionType;
-
-import javax.annotation.Nullable;
import java.util.Collections;
import java.util.Set;
import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/internal/mapper/SignatureMapper.java b/service/src/main/java/io/mifos/identity/internal/mapper/SignatureMapper.java
index cd6892d..e81514c 100644
--- a/service/src/main/java/io/mifos/identity/internal/mapper/SignatureMapper.java
+++ b/service/src/main/java/io/mifos/identity/internal/mapper/SignatureMapper.java
@@ -18,10 +18,10 @@
*/
package io.mifos.identity.internal.mapper;
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
-import io.mifos.anubis.api.v1.domain.Signature;
import io.mifos.identity.internal.repository.ApplicationSignatureEntity;
import io.mifos.identity.internal.repository.SignatureEntity;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/internal/repository/ApplicationCallEndpointSets.java b/service/src/main/java/io/mifos/identity/internal/repository/ApplicationCallEndpointSets.java
index 73e54d4..fa9d534 100644
--- a/service/src/main/java/io/mifos/identity/internal/repository/ApplicationCallEndpointSets.java
+++ b/service/src/main/java/io/mifos/identity/internal/repository/ApplicationCallEndpointSets.java
@@ -25,9 +25,9 @@
import com.datastax.driver.core.schemabuilder.Create;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
import com.datastax.driver.mapping.Mapper;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.core.TenantAwareCassandraMapperProvider;
-import io.mifos.core.cassandra.core.TenantAwareEntityTemplate;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareCassandraMapperProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareEntityTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
diff --git a/service/src/main/java/io/mifos/identity/internal/repository/ApplicationPermissionUsers.java b/service/src/main/java/io/mifos/identity/internal/repository/ApplicationPermissionUsers.java
index e1dfe37..89c5a99 100644
--- a/service/src/main/java/io/mifos/identity/internal/repository/ApplicationPermissionUsers.java
+++ b/service/src/main/java/io/mifos/identity/internal/repository/ApplicationPermissionUsers.java
@@ -21,8 +21,8 @@
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.schemabuilder.Create;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.core.TenantAwareEntityTemplate;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareEntityTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/service/src/main/java/io/mifos/identity/internal/repository/ApplicationPermissions.java b/service/src/main/java/io/mifos/identity/internal/repository/ApplicationPermissions.java
index 5f8a296..7a3154f 100644
--- a/service/src/main/java/io/mifos/identity/internal/repository/ApplicationPermissions.java
+++ b/service/src/main/java/io/mifos/identity/internal/repository/ApplicationPermissions.java
@@ -25,9 +25,9 @@
import com.datastax.driver.core.schemabuilder.Create;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
import com.datastax.driver.mapping.Mapper;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.core.TenantAwareCassandraMapperProvider;
-import io.mifos.core.cassandra.core.TenantAwareEntityTemplate;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareCassandraMapperProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareEntityTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/service/src/main/java/io/mifos/identity/internal/repository/ApplicationSignatures.java b/service/src/main/java/io/mifos/identity/internal/repository/ApplicationSignatures.java
index 43d6354..2de6687 100644
--- a/service/src/main/java/io/mifos/identity/internal/repository/ApplicationSignatures.java
+++ b/service/src/main/java/io/mifos/identity/internal/repository/ApplicationSignatures.java
@@ -28,9 +28,9 @@
import com.datastax.driver.core.schemabuilder.Create;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
import com.datastax.driver.mapping.Mapper;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.core.TenantAwareCassandraMapperProvider;
-import io.mifos.core.cassandra.core.TenantAwareEntityTemplate;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareCassandraMapperProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareEntityTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
diff --git a/service/src/main/java/io/mifos/identity/internal/repository/Permissions.java b/service/src/main/java/io/mifos/identity/internal/repository/Permissions.java
index 9cc6da5..59b0c66 100644
--- a/service/src/main/java/io/mifos/identity/internal/repository/Permissions.java
+++ b/service/src/main/java/io/mifos/identity/internal/repository/Permissions.java
@@ -20,8 +20,8 @@
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.util.CodecRegistry;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.util.CodecRegistry;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/service/src/main/java/io/mifos/identity/internal/repository/PermittableGroups.java b/service/src/main/java/io/mifos/identity/internal/repository/PermittableGroups.java
index 9911fdd..1a63d49 100644
--- a/service/src/main/java/io/mifos/identity/internal/repository/PermittableGroups.java
+++ b/service/src/main/java/io/mifos/identity/internal/repository/PermittableGroups.java
@@ -26,16 +26,15 @@
import com.datastax.driver.core.schemabuilder.CreateType;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
import com.datastax.driver.mapping.Mapper;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.core.TenantAwareCassandraMapperProvider;
-import io.mifos.core.cassandra.core.TenantAwareEntityTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.util.Assert;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareCassandraMapperProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareEntityTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/internal/repository/Roles.java b/service/src/main/java/io/mifos/identity/internal/repository/Roles.java
index 0082448..c8572ed 100644
--- a/service/src/main/java/io/mifos/identity/internal/repository/Roles.java
+++ b/service/src/main/java/io/mifos/identity/internal/repository/Roles.java
@@ -25,9 +25,9 @@
import com.datastax.driver.core.schemabuilder.Create;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
import com.datastax.driver.mapping.Mapper;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.core.TenantAwareCassandraMapperProvider;
-import io.mifos.core.cassandra.core.TenantAwareEntityTemplate;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareCassandraMapperProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareEntityTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
diff --git a/service/src/main/java/io/mifos/identity/internal/repository/Signatures.java b/service/src/main/java/io/mifos/identity/internal/repository/Signatures.java
index e7b037e..ebaa8d4 100644
--- a/service/src/main/java/io/mifos/identity/internal/repository/Signatures.java
+++ b/service/src/main/java/io/mifos/identity/internal/repository/Signatures.java
@@ -29,17 +29,16 @@
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
import com.datastax.driver.core.schemabuilder.SchemaStatement;
import com.datastax.driver.mapping.Mapper;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.core.TenantAwareCassandraMapperProvider;
-import io.mifos.core.lang.security.RsaKeyPairFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareCassandraMapperProvider;
+import org.apache.fineract.cn.lang.security.RsaKeyPairFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
/**
* All write accesses are synchronized. These occur only during provisioning or key rotation, so they are not
diff --git a/service/src/main/java/io/mifos/identity/internal/repository/Tenants.java b/service/src/main/java/io/mifos/identity/internal/repository/Tenants.java
index f836793..3988d6b 100644
--- a/service/src/main/java/io/mifos/identity/internal/repository/Tenants.java
+++ b/service/src/main/java/io/mifos/identity/internal/repository/Tenants.java
@@ -22,14 +22,13 @@
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.schemabuilder.Create;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.core.TenantAwareEntityTemplate;
import io.mifos.identity.internal.util.IdentityConstants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
import java.nio.ByteBuffer;
import java.util.Optional;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareEntityTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/internal/repository/Users.java b/service/src/main/java/io/mifos/identity/internal/repository/Users.java
index e925df8..3c7c280 100644
--- a/service/src/main/java/io/mifos/identity/internal/repository/Users.java
+++ b/service/src/main/java/io/mifos/identity/internal/repository/Users.java
@@ -25,9 +25,9 @@
import com.datastax.driver.core.schemabuilder.Create;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
import com.datastax.driver.mapping.Mapper;
-import io.mifos.core.cassandra.core.CassandraSessionProvider;
-import io.mifos.core.cassandra.core.TenantAwareCassandraMapperProvider;
-import io.mifos.core.cassandra.core.TenantAwareEntityTemplate;
+import org.apache.fineract.cn.cassandra.core.CassandraSessionProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareCassandraMapperProvider;
+import org.apache.fineract.cn.cassandra.core.TenantAwareEntityTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
diff --git a/service/src/main/java/io/mifos/identity/internal/service/ApplicationService.java b/service/src/main/java/io/mifos/identity/internal/service/ApplicationService.java
index e0d70ff..e7d6ba9 100644
--- a/service/src/main/java/io/mifos/identity/internal/service/ApplicationService.java
+++ b/service/src/main/java/io/mifos/identity/internal/service/ApplicationService.java
@@ -18,13 +18,13 @@
*/
package io.mifos.identity.internal.service;
-import io.mifos.anubis.api.v1.domain.Signature;
import io.mifos.identity.api.v1.domain.CallEndpointSet;
import io.mifos.identity.api.v1.domain.Permission;
import io.mifos.identity.internal.mapper.ApplicationCallEndpointSetMapper;
import io.mifos.identity.internal.mapper.PermissionMapper;
import io.mifos.identity.internal.mapper.SignatureMapper;
import io.mifos.identity.internal.repository.*;
+import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/service/src/main/java/io/mifos/identity/internal/service/PermittableGroupService.java b/service/src/main/java/io/mifos/identity/internal/service/PermittableGroupService.java
index 259f679..1bfdabc 100644
--- a/service/src/main/java/io/mifos/identity/internal/service/PermittableGroupService.java
+++ b/service/src/main/java/io/mifos/identity/internal/service/PermittableGroupService.java
@@ -18,16 +18,15 @@
*/
package io.mifos.identity.internal.service;
-import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
import io.mifos.identity.api.v1.domain.PermittableGroup;
-import io.mifos.identity.internal.repository.PermittableType;
import io.mifos.identity.internal.repository.PermittableGroupEntity;
import io.mifos.identity.internal.repository.PermittableGroups;
-import org.springframework.stereotype.Service;
-
+import io.mifos.identity.internal.repository.PermittableType;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
+import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
+import org.springframework.stereotype.Service;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/internal/service/RoleMapper.java b/service/src/main/java/io/mifos/identity/internal/service/RoleMapper.java
index c19e0f8..cd8eee9 100644
--- a/service/src/main/java/io/mifos/identity/internal/service/RoleMapper.java
+++ b/service/src/main/java/io/mifos/identity/internal/service/RoleMapper.java
@@ -18,14 +18,13 @@
*/
package io.mifos.identity.internal.service;
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
import io.mifos.identity.api.v1.domain.Permission;
-import io.mifos.identity.internal.repository.PermissionType;
import io.mifos.identity.internal.repository.AllowedOperationType;
-
+import io.mifos.identity.internal.repository.PermissionType;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/internal/service/TenantService.java b/service/src/main/java/io/mifos/identity/internal/service/TenantService.java
index 05c1f05..0247f27 100644
--- a/service/src/main/java/io/mifos/identity/internal/service/TenantService.java
+++ b/service/src/main/java/io/mifos/identity/internal/service/TenantService.java
@@ -18,22 +18,21 @@
*/
package io.mifos.identity.internal.service;
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
-import io.mifos.anubis.api.v1.domain.Signature;
-import io.mifos.anubis.config.TenantSignatureRepository;
-import io.mifos.core.lang.security.RsaKeyPairFactory;
-import io.mifos.core.lang.security.RsaPrivateKeyBuilder;
import io.mifos.identity.internal.mapper.SignatureMapper;
import io.mifos.identity.internal.repository.PrivateSignatureEntity;
import io.mifos.identity.internal.repository.SignatureEntity;
import io.mifos.identity.internal.repository.Signatures;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
import java.security.PrivateKey;
import java.security.interfaces.RSAPrivateKey;
import java.util.List;
import java.util.Optional;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
+import org.apache.fineract.cn.anubis.config.TenantSignatureRepository;
+import org.apache.fineract.cn.lang.security.RsaKeyPairFactory;
+import org.apache.fineract.cn.lang.security.RsaPrivateKeyBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/internal/service/UserService.java b/service/src/main/java/io/mifos/identity/internal/service/UserService.java
index 3a22681..ad5095c 100644
--- a/service/src/main/java/io/mifos/identity/internal/service/UserService.java
+++ b/service/src/main/java/io/mifos/identity/internal/service/UserService.java
@@ -18,11 +18,11 @@
*/
package io.mifos.identity.internal.service;
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.domain.Permission;
import io.mifos.identity.api.v1.domain.User;
import io.mifos.identity.internal.repository.*;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/service/src/main/java/io/mifos/identity/rest/ApplicationCallEndpointSetRestController.java b/service/src/main/java/io/mifos/identity/rest/ApplicationCallEndpointSetRestController.java
index 9d399b9..34e39cf 100644
--- a/service/src/main/java/io/mifos/identity/rest/ApplicationCallEndpointSetRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/ApplicationCallEndpointSetRestController.java
@@ -18,15 +18,15 @@
*/
package io.mifos.identity.rest;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.domain.CallEndpointSet;
import io.mifos.identity.internal.command.ChangeApplicationCallEndpointSetCommand;
import io.mifos.identity.internal.command.CreateApplicationCallEndpointSetCommand;
import io.mifos.identity.internal.command.DeleteApplicationCallEndpointSetCommand;
import io.mifos.identity.internal.service.ApplicationService;
+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.apache.fineract.cn.lang.ServiceException;
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/identity/rest/ApplicationPermissionUserRestController.java b/service/src/main/java/io/mifos/identity/rest/ApplicationPermissionUserRestController.java
index 2e1b6ba..5f74e13 100644
--- a/service/src/main/java/io/mifos/identity/rest/ApplicationPermissionUserRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/ApplicationPermissionUserRestController.java
@@ -18,20 +18,24 @@
*/
package io.mifos.identity.rest;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.internal.command.SetApplicationPermissionUserEnabledCommand;
import io.mifos.identity.internal.service.ApplicationService;
import io.mifos.identity.internal.service.UserService;
+import javax.annotation.Nonnull;
+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.apache.fineract.cn.lang.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Nonnull;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/rest/ApplicationRestController.java b/service/src/main/java/io/mifos/identity/rest/ApplicationRestController.java
index 9e72489..2115c92 100644
--- a/service/src/main/java/io/mifos/identity/rest/ApplicationRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/ApplicationRestController.java
@@ -19,12 +19,6 @@
package io.mifos.identity.rest;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.anubis.api.v1.domain.Signature;
-import io.mifos.anubis.api.v1.validation.ValidKeyTimestamp;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.domain.Permission;
import io.mifos.identity.internal.command.CreateApplicationPermissionCommand;
@@ -33,6 +27,12 @@
import io.mifos.identity.internal.command.SetApplicationSignatureCommand;
import io.mifos.identity.internal.service.ApplicationService;
import io.mifos.identity.internal.service.PermittableGroupService;
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
+import org.apache.fineract.cn.anubis.api.v1.validation.ValidKeyTimestamp;
+import org.apache.fineract.cn.command.gateway.CommandGateway;
+import org.apache.fineract.cn.lang.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@@ -97,7 +97,8 @@
@PathVariable("timestamp") @ValidKeyTimestamp String timestamp) {
return service.getSignatureForApplication(applicationIdentifier, timestamp)
.map(ResponseEntity::ok)
- .orElseThrow(() -> ServiceException.notFound("Signature for application ''" + applicationIdentifier + "'' and key timestamp ''" + timestamp + "'' doesn''t exist."));
+ .orElseThrow(() -> ServiceException
+ .notFound("Signature for application ''" + applicationIdentifier + "'' and key timestamp ''" + timestamp + "'' doesn''t exist."));
}
@RequestMapping(value = "/{applicationidentifier}", method = RequestMethod.DELETE,
diff --git a/service/src/main/java/io/mifos/identity/rest/AuthorizationRestController.java b/service/src/main/java/io/mifos/identity/rest/AuthorizationRestController.java
index 787735a..964927e 100644
--- a/service/src/main/java/io/mifos/identity/rest/AuthorizationRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/AuthorizationRestController.java
@@ -18,14 +18,6 @@
*/
package io.mifos.identity.rest;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.anubis.api.v1.TokenConstants;
-import io.mifos.anubis.security.AmitAuthenticationException;
-import io.mifos.core.command.domain.CommandCallback;
-import io.mifos.core.command.domain.CommandProcessingException;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.client.IdentityManager;
import io.mifos.identity.api.v1.domain.Authentication;
@@ -33,6 +25,14 @@
import io.mifos.identity.internal.command.PasswordAuthenticationCommand;
import io.mifos.identity.internal.command.RefreshTokenAuthenticationCommand;
import io.mifos.identity.internal.util.IdentityConstants;
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.anubis.api.v1.TokenConstants;
+import org.apache.fineract.cn.anubis.security.AmitAuthenticationException;
+import org.apache.fineract.cn.command.domain.CommandCallback;
+import org.apache.fineract.cn.command.domain.CommandProcessingException;
+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;
diff --git a/service/src/main/java/io/mifos/identity/rest/InitializeRestController.java b/service/src/main/java/io/mifos/identity/rest/InitializeRestController.java
index 348ba37..c792a50 100644
--- a/service/src/main/java/io/mifos/identity/rest/InitializeRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/InitializeRestController.java
@@ -18,16 +18,20 @@
*/
package io.mifos.identity.rest;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
import io.mifos.identity.internal.command.handler.Provisioner;
import io.mifos.identity.internal.service.TenantService;
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/rest/PermittableGroupRestController.java b/service/src/main/java/io/mifos/identity/rest/PermittableGroupRestController.java
index e434f57..ae46533 100644
--- a/service/src/main/java/io/mifos/identity/rest/PermittableGroupRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/PermittableGroupRestController.java
@@ -18,14 +18,14 @@
*/
package io.mifos.identity.rest;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.domain.PermittableGroup;
import io.mifos.identity.internal.service.PermittableGroupService;
import io.mifos.identity.internal.command.CreatePermittableGroupCommand;
+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.apache.fineract.cn.lang.ServiceException;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
diff --git a/service/src/main/java/io/mifos/identity/rest/RoleRestController.java b/service/src/main/java/io/mifos/identity/rest/RoleRestController.java
index 7c90969..013fe7e 100644
--- a/service/src/main/java/io/mifos/identity/rest/RoleRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/RoleRestController.java
@@ -18,10 +18,6 @@
*/
package io.mifos.identity.rest;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.domain.Role;
import io.mifos.identity.api.v1.validation.CheckRoleChangeable;
@@ -29,14 +25,22 @@
import io.mifos.identity.internal.command.CreateRoleCommand;
import io.mifos.identity.internal.command.DeleteRoleCommand;
import io.mifos.identity.internal.service.RoleService;
+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.command.gateway.CommandGateway;
+import org.apache.fineract.cn.lang.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
/**
diff --git a/service/src/main/java/io/mifos/identity/rest/UserRestController.java b/service/src/main/java/io/mifos/identity/rest/UserRestController.java
index 5bc2c39..198b9c8 100644
--- a/service/src/main/java/io/mifos/identity/rest/UserRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/UserRestController.java
@@ -18,17 +18,17 @@
*/
package io.mifos.identity.rest;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.api.util.UserContextHolder;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.domain.*;
import io.mifos.identity.internal.command.ChangeUserRoleCommand;
import io.mifos.identity.internal.command.ChangeUserPasswordCommand;
import io.mifos.identity.internal.command.CreateUserCommand;
import io.mifos.identity.internal.service.UserService;
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.api.util.UserContextHolder;
+import org.apache.fineract.cn.command.gateway.CommandGateway;
+import org.apache.fineract.cn.lang.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
diff --git a/service/src/test/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandlerTest.java b/service/src/test/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandlerTest.java
index 3cf9c71..b21e882 100644
--- a/service/src/test/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandlerTest.java
+++ b/service/src/test/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandlerTest.java
@@ -19,20 +19,20 @@
package io.mifos.identity.internal.command.handler;
import com.google.gson.Gson;
-import io.mifos.anubis.provider.TenantRsaKeyProvider;
-import io.mifos.anubis.token.TenantAccessTokenSerializer;
-import io.mifos.anubis.token.TenantRefreshTokenSerializer;
-import io.mifos.anubis.token.TokenDeserializationResult;
-import io.mifos.anubis.token.TokenSerializationResult;
-import io.mifos.core.lang.ApplicationName;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.core.lang.security.RsaKeyPairFactory;
import io.mifos.identity.internal.command.AuthenticationCommandResponse;
import io.mifos.identity.internal.command.PasswordAuthenticationCommand;
import io.mifos.identity.internal.command.RefreshTokenAuthenticationCommand;
import io.mifos.identity.internal.repository.*;
-import io.mifos.tool.crypto.HashGenerator;
-import io.mifos.tool.crypto.SaltGenerator;
+import org.apache.fineract.cn.anubis.provider.TenantRsaKeyProvider;
+import org.apache.fineract.cn.anubis.token.TenantAccessTokenSerializer;
+import org.apache.fineract.cn.anubis.token.TenantRefreshTokenSerializer;
+import org.apache.fineract.cn.anubis.token.TokenDeserializationResult;
+import org.apache.fineract.cn.anubis.token.TokenSerializationResult;
+import org.apache.fineract.cn.crypto.HashGenerator;
+import org.apache.fineract.cn.crypto.SaltGenerator;
+import org.apache.fineract.cn.lang.ApplicationName;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.apache.fineract.cn.lang.security.RsaKeyPairFactory;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
