Change package names from mifos to apache fineract.

apache · Apr 13, 2018 · 923455461140e818f81bbe6aea5357927dbe846a · 9234554
1 parent f4619e3
commit 923455461140e818f81bbe6aea5357927dbe846a
Showing 86 changed files with 328 additions and 304 deletions.
diff --git a/...io/mifos/anubis/api/v1/RoleConstants.java → ...eract/cn/anubis/api/v1/RoleConstants.java b/...io/mifos/anubis/api/v1/RoleConstants.java → ...eract/cn/anubis/api/v1/RoleConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1;
+package org.apache.fineract.cn.anubis.api.v1;
 
 /**
  * @author Myrle Krantz

diff --git a/...o/mifos/anubis/api/v1/TokenConstants.java → ...ract/cn/anubis/api/v1/TokenConstants.java b/...o/mifos/anubis/api/v1/TokenConstants.java → ...ract/cn/anubis/api/v1/TokenConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1;
+package org.apache.fineract.cn.anubis.api.v1;
 
 /**
  * @author Myrle Krantz

diff --git a/...io/mifos/anubis/api/v1/client/Anubis.java → ...eract/cn/anubis/api/v1/client/Anubis.java b/...io/mifos/anubis/api/v1/client/Anubis.java → ...eract/cn/anubis/api/v1/client/Anubis.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.client;
+package org.apache.fineract.cn.anubis.api.v1.client;
 
-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.api.v1.validation.ValidKeyTimestamp;
+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.api.v1.validation.ValidKeyTimestamp;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;

diff --git a/...nubis/api/v1/client/AnubisApiFactory.java → ...nubis/api/v1/client/AnubisApiFactory.java b/...nubis/api/v1/client/AnubisApiFactory.java → ...nubis/api/v1/client/AnubisApiFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.client;
+package org.apache.fineract.cn.anubis.api.v1.client;
 
 import feign.Feign;
 import feign.gson.GsonDecoder;

diff --git a/...nubis/api/v1/domain/AllowedOperation.java → ...nubis/api/v1/domain/AllowedOperation.java b/...nubis/api/v1/domain/AllowedOperation.java → ...nubis/api/v1/domain/AllowedOperation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.domain;
+package org.apache.fineract.cn.anubis.api.v1.domain;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/...pi/v1/domain/ApplicationSignatureSet.java → ...pi/v1/domain/ApplicationSignatureSet.java b/...pi/v1/domain/ApplicationSignatureSet.java → ...pi/v1/domain/ApplicationSignatureSet.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.domain;
+package org.apache.fineract.cn.anubis.api.v1.domain;
 
-import io.mifos.anubis.api.v1.validation.ValidKeyTimestamp;
+import org.apache.fineract.cn.anubis.api.v1.validation.ValidKeyTimestamp;
 
 import javax.validation.Valid;
 import java.util.Objects;

diff --git a/...is/api/v1/domain/PermittableEndpoint.java → ...is/api/v1/domain/PermittableEndpoint.java b/...is/api/v1/domain/PermittableEndpoint.java → ...is/api/v1/domain/PermittableEndpoint.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.domain;
+package org.apache.fineract.cn.anubis.api.v1.domain;
 
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotBlank;

diff --git a/...mifos/anubis/api/v1/domain/Signature.java → ...ct/cn/anubis/api/v1/domain/Signature.java b/...mifos/anubis/api/v1/domain/Signature.java → ...ct/cn/anubis/api/v1/domain/Signature.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.domain;
+package org.apache.fineract.cn.anubis.api.v1.domain;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigInteger;

diff --git a/...os/anubis/api/v1/domain/TokenContent.java → ...cn/anubis/api/v1/domain/TokenContent.java b/...os/anubis/api/v1/domain/TokenContent.java → ...cn/anubis/api/v1/domain/TokenContent.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.domain;
+package org.apache.fineract.cn.anubis.api.v1.domain;
 
 import java.util.List;
 import java.util.Objects;

diff --git a/...anubis/api/v1/domain/TokenPermission.java → ...anubis/api/v1/domain/TokenPermission.java b/...anubis/api/v1/domain/TokenPermission.java → ...anubis/api/v1/domain/TokenPermission.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.domain;
+package org.apache.fineract.cn.anubis.api.v1.domain;
 
 import java.util.Objects;
 import java.util.Set;

diff --git a/.../api/v1/validation/CheckKeyTimestamp.java → .../api/v1/validation/CheckKeyTimestamp.java b/.../api/v1/validation/CheckKeyTimestamp.java → .../api/v1/validation/CheckKeyTimestamp.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.validation;
+package org.apache.fineract.cn.anubis.api.v1.validation;
 
 
 import javax.validation.ConstraintValidator;

diff --git a/.../api/v1/validation/ValidKeyTimestamp.java → .../api/v1/validation/ValidKeyTimestamp.java b/.../api/v1/validation/ValidKeyTimestamp.java → .../api/v1/validation/ValidKeyTimestamp.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.validation;
+package org.apache.fineract.cn.anubis.api.v1.validation;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

diff --git a/.../v1/validation/CheckKeyTimestampTest.java → .../v1/validation/CheckKeyTimestampTest.java b/.../v1/validation/CheckKeyTimestampTest.java → .../v1/validation/CheckKeyTimestampTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis.api.v1.validation;
+package org.apache.fineract.cn.anubis.api.v1.validation;
 
 import org.apache.fineract.cn.lang.DateConverter;
 import org.junit.Assert;

diff --git a/...ifos/anubis/AbstractNoInitializeTest.java → ...t/cn/anubis/AbstractNoInitializeTest.java b/...ifos/anubis/AbstractNoInitializeTest.java → ...t/cn/anubis/AbstractNoInitializeTest.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis;
+package org.apache.fineract.cn.anubis;
 
-import io.mifos.anubis.example.noinitialize.Example;
-import io.mifos.anubis.example.noinitialize.ExampleConfiguration;
-import io.mifos.anubis.suites.SuiteTestEnvironment;
+import org.apache.fineract.cn.anubis.example.noinitialize.Example;
+import org.apache.fineract.cn.anubis.example.noinitialize.ExampleConfiguration;
+import org.apache.fineract.cn.anubis.suites.SuiteTestEnvironment;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,7 +43,7 @@
 public class AbstractNoInitializeTest extends SuiteTestEnvironment {
   private static final String LOGGER_QUALIFIER = "test-logger";
   @Configuration
-  @EnableFeignClients(basePackages = {"io.mifos.anubis.example.noinitialize"})
+  @EnableFeignClients(basePackages = {"org.apache.fineract.cn.anubis.example.noinitialize"})
   @RibbonClient(name = APP_NAME)
   @Import({ExampleConfiguration.class})
   static public class TestConfiguration {

diff --git a/...ifos/anubis/AbstractNoKeyStorageTest.java → ...t/cn/anubis/AbstractNoKeyStorageTest.java b/...ifos/anubis/AbstractNoKeyStorageTest.java → ...t/cn/anubis/AbstractNoKeyStorageTest.java
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis;
+package org.apache.fineract.cn.anubis;
 
-import io.mifos.anubis.example.nokeystorage.Example;
-import io.mifos.anubis.example.nokeystorage.ExampleConfiguration;
-import io.mifos.anubis.example.simple.MetricsFeignClient;
-import io.mifos.anubis.suites.SuiteTestEnvironment;
+import org.apache.fineract.cn.anubis.example.nokeystorage.Example;
+import org.apache.fineract.cn.anubis.example.nokeystorage.ExampleConfiguration;
+import org.apache.fineract.cn.anubis.example.simple.MetricsFeignClient;
+import org.apache.fineract.cn.anubis.suites.SuiteTestEnvironment;
+import org.apache.fineract.cn.anubis.suites.SuiteTestEnvironment;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,7 +53,7 @@ public class AbstractNoKeyStorageTest extends SuiteTestEnvironment {
   private static final String LOGGER_QUALIFIER = "test-logger";
 
   @Configuration
-  @EnableFeignClients(clients = {io.mifos.anubis.example.nokeystorage.Example.class, MetricsFeignClient.class})
+  @EnableFeignClients(clients = {org.apache.fineract.cn.anubis.example.nokeystorage.Example.class, MetricsFeignClient.class})
   @RibbonClient(name = APP_NAME)
   @Import({ExampleConfiguration.class})
   static public class TestConfiguration {

diff --git a/...a/io/mifos/anubis/AbstractSimpleTest.java → ...ineract/cn/anubis/AbstractSimpleTest.java b/...a/io/mifos/anubis/AbstractSimpleTest.java → ...ineract/cn/anubis/AbstractSimpleTest.java
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis;
+package org.apache.fineract.cn.anubis;
 
-import io.mifos.anubis.example.simple.Example;
-import io.mifos.anubis.example.simple.ExampleConfiguration;
-import io.mifos.anubis.suites.SuiteTestEnvironment;
-import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+import org.apache.fineract.cn.anubis.example.simple.Example;
+import org.apache.fineract.cn.anubis.example.simple.ExampleConfiguration;
+import org.apache.fineract.cn.anubis.suites.SuiteTestEnvironment;
+import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+import org.apache.fineract.cn.anubis.suites.SuiteTestEnvironment;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -46,7 +47,7 @@ public class AbstractSimpleTest extends SuiteTestEnvironment {
   private static final String LOGGER_QUALIFIER = "test-logger";
 
   @Configuration
-  @EnableFeignClients(basePackages = {"io.mifos.anubis.example.simple"})
+  @EnableFeignClients(basePackages = {"org.apache.fineract.cn.anubis.example.simple"})
   @RibbonClient(name = APP_NAME)
   @Import({ExampleConfiguration.class})
   public static class TestConfiguration {

diff --git a/...io/mifos/anubis/TestAnubisInitialize.java → ...eract/cn/anubis/TestAnubisInitialize.java b/...io/mifos/anubis/TestAnubisInitialize.java → ...eract/cn/anubis/TestAnubisInitialize.java
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis;
-
-import io.mifos.anubis.api.v1.client.Anubis;
-import io.mifos.anubis.api.v1.client.AnubisApiFactory;
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
-import io.mifos.anubis.api.v1.domain.Signature;
-import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+package org.apache.fineract.cn.anubis;
+
+import org.apache.fineract.cn.anubis.api.v1.client.Anubis;
+import org.apache.fineract.cn.anubis.api.v1.client.AnubisApiFactory;
+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.anubis.suites.SuiteTestEnvironment;
 import org.apache.fineract.cn.api.context.AutoSeshat;
 import org.apache.fineract.cn.api.context.AutoUserContext;
 import org.apache.fineract.cn.api.util.InvalidTokenException;
@@ -42,17 +43,18 @@ public class TestAnubisInitialize extends AbstractSimpleTest {
   @Test
   public void testBrokenToken()
   {
-    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(cassandraInitializer)) {
+    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(SuiteTestEnvironment.cassandraInitializer)) {
       example.uninitialize(); //make sure the internal initialize variable isn't set before we start.
 
       final String brokenSeshatToken = "hmmmm, this doesn't look like a token?";
 
       try {
 
-        final Anubis anubis = AnubisApiFactory.create(testEnvironment.serverURI(), logger);
+        final Anubis anubis = AnubisApiFactory.create(SuiteTestEnvironment.testEnvironment.serverURI(), logger);
 
         try (final AutoSeshat ignored2 = new AutoSeshat(brokenSeshatToken)) {
-          final TenantApplicationSecurityEnvironmentTestRule securityMock = new TenantApplicationSecurityEnvironmentTestRule(testEnvironment);
+          final TenantApplicationSecurityEnvironmentTestRule securityMock = new TenantApplicationSecurityEnvironmentTestRule(
+              SuiteTestEnvironment.testEnvironment);
 
           final String keyTimestamp = securityMock.getSystemSecurityEnvironment().tenantKeyTimestamp();
           final RSAPublicKey publicKey = securityMock.getSystemSecurityEnvironment().tenantPublicKey();
@@ -71,14 +73,16 @@ public void testBrokenToken()
 
   @Test
   public void testHappyCase() {
-    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(cassandraInitializer)) {
+    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(
+        SuiteTestEnvironment.cassandraInitializer)) {
       initialize();
     }
   }
 
   @Test
   public void testReinitialize() {
-    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(cassandraInitializer)) {
+    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(
+        SuiteTestEnvironment.cassandraInitializer)) {
 
       initialize();
 
@@ -89,11 +93,13 @@ public void testReinitialize() {
   @Test
   public void testTwoTenants() {
 
-    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(cassandraInitializer)) {
+    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(
+        SuiteTestEnvironment.cassandraInitializer)) {
       initialize();
     }
 
-    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(cassandraInitializer)) {
+    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(
+        SuiteTestEnvironment.cassandraInitializer)) {
       initialize();
     }
   }
@@ -114,10 +120,12 @@ public void testNonExistentTenant() {
 
   @Test(expected = InvalidTokenException.class)
   public void testAuthenticateWithoutInitialize() {
-    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(cassandraInitializer)) {
+    try (final TenantDataStoreTestContext ignored = TenantDataStoreTestContext.forRandomTenantName(
+        SuiteTestEnvironment.cassandraInitializer)) {
 
       final TenantApplicationSecurityEnvironmentTestRule tenantApplicationSecurityEnvironment
-              = new TenantApplicationSecurityEnvironmentTestRule(testEnvironment);
+              = new TenantApplicationSecurityEnvironmentTestRule(
+          SuiteTestEnvironment.testEnvironment);
       final String permissionToken = tenantApplicationSecurityEnvironment.getPermissionToken("bubba", "foo", AllowedOperation.READ);
       try (final AutoUserContext ignored2 = new AutoUserContext("bubba", permissionToken)) {
         Assert.assertFalse(example.foo());
@@ -128,7 +136,7 @@ public void testAuthenticateWithoutInitialize() {
 
   private void initialize() {
     final TenantApplicationSecurityEnvironmentTestRule tenantApplicationSecurityEnvironment
-            = new TenantApplicationSecurityEnvironmentTestRule(testEnvironment);
+            = new TenantApplicationSecurityEnvironmentTestRule(SuiteTestEnvironment.testEnvironment);
     tenantApplicationSecurityEnvironment.initializeTenantInApplication();
 
     try (final AutoUserContext ignored = tenantApplicationSecurityEnvironment.createAutoUserContext("x")) {

diff --git a/...WithSpecialTenantSignatureRepository.java → ...WithSpecialTenantSignatureRepository.java b/...WithSpecialTenantSignatureRepository.java → ...WithSpecialTenantSignatureRepository.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis;
+package org.apache.fineract.cn.anubis;
 
-import io.mifos.anubis.example.simple.Metrics;
-import io.mifos.anubis.example.simple.MetricsFeignClient;
-import io.mifos.anubis.test.v1.SystemSecurityEnvironment;
+import org.apache.fineract.cn.anubis.example.simple.Metrics;
+import org.apache.fineract.cn.anubis.example.simple.MetricsFeignClient;
+import org.apache.fineract.cn.anubis.test.v1.SystemSecurityEnvironment;
 import org.apache.fineract.cn.api.context.AutoGuest;
 import org.apache.fineract.cn.api.context.AutoSeshat;
 import org.apache.fineract.cn.api.context.AutoUserContext;

diff --git a/...nubisInitializeWithoutServiceBacking.java → ...nubisInitializeWithoutServiceBacking.java b/...nubisInitializeWithoutServiceBacking.java → ...nubisInitializeWithoutServiceBacking.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis;
+package org.apache.fineract.cn.anubis;
 
-import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
-import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/...o/mifos/anubis/TestAnubisKeyRotation.java → ...ract/cn/anubis/TestAnubisKeyRotation.java b/...o/mifos/anubis/TestAnubisKeyRotation.java → ...ract/cn/anubis/TestAnubisKeyRotation.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis;
+package org.apache.fineract.cn.anubis;
 
-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 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.AutoSeshat;
 import org.apache.fineract.cn.api.util.NotFoundException;
 import org.apache.fineract.cn.lang.security.RsaKeyPairFactory;

diff --git a/...s/anubis/TestAnubisTenantPermissions.java → ...n/anubis/TestAnubisTenantPermissions.java b/...s/anubis/TestAnubisTenantPermissions.java → ...n/anubis/TestAnubisTenantPermissions.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis;
+package org.apache.fineract.cn.anubis;
 
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
-import io.mifos.anubis.example.noinitialize.UserContext;
-import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import org.apache.fineract.cn.anubis.example.noinitialize.UserContext;
+import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
 import org.apache.fineract.cn.api.context.AutoSeshat;
 import org.apache.fineract.cn.api.context.AutoUserContext;
 import org.apache.fineract.cn.api.util.InvalidTokenException;

diff --git a/...ifos/anubis/TestPermittableEndpoints.java → ...t/cn/anubis/TestPermittableEndpoints.java b/...ifos/anubis/TestPermittableEndpoints.java → ...t/cn/anubis/TestPermittableEndpoints.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.anubis;
+package org.apache.fineract.cn.anubis;
 
-import io.mifos.anubis.api.v1.client.Anubis;
-import io.mifos.anubis.api.v1.client.AnubisApiFactory;
-import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
+import org.apache.fineract.cn.anubis.api.v1.client.Anubis;
+import org.apache.fineract.cn.anubis.api.v1.client.AnubisApiFactory;
+import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
 import org.junit.Assert;
 import org.junit.Test;