fixed build issue

apache · Mar 20, 2017 · b88a000 · b88a000
1 parent 6198dfc
commit b88a000
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,6 @@ gradle-app.setting
 
 *.iml
 
-*.log
+*.log
+
+*.toDelete
diff --git a/...onent-test/src/main/java/io/mifos/provisioner/tenant/TestTenantApplicationAssignment.java b/...onent-test/src/main/java/io/mifos/provisioner/tenant/TestTenantApplicationAssignment.java
@@ -26,7 +26,7 @@
 import io.mifos.core.api.util.ApiFactory;
 import io.mifos.core.lang.AutoTenantContext;
 import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.identity.api.v1.client.IdentityService;
+import io.mifos.identity.api.v1.client.IdentityManager;
 import io.mifos.identity.api.v1.domain.PermittableGroup;
 import io.mifos.provisioner.ProvisionerCassandraInitializer;
 import io.mifos.provisioner.ProvisionerMariaDBInitializer;
@@ -259,8 +259,8 @@ public void testTenantApplicationAssignment() throws InterruptedException {
     identityServiceAssigned.setName("identity-v1");
 
 
-    final IdentityService identityServiceMock = Mockito.mock(IdentityService.class);
-    when(applicationCallContextProviderSpy.getApplication(IdentityService.class, "http://xyz.identity:2020/v1")).thenReturn(identityServiceMock);
+    final IdentityManager identityServiceMock = Mockito.mock(IdentityManager.class);
+    when(applicationCallContextProviderSpy.getApplication(IdentityManager.class, "http://xyz.identity:2020/v1")).thenReturn(identityServiceMock);
 
     final VerifyIsisInitializeContext verifyInitializeContextAndReturnSignature;
     try (final AutoTenantContext ignored = new AutoTenantContext(Fixture.TENANT_IDENTIFIER)) {

diff --git a/...n/java/io/mifos/provisioner/internal/service/applications/IdentityServiceInitializer.java b/...n/java/io/mifos/provisioner/internal/service/applications/IdentityServiceInitializer.java
@@ -19,7 +19,7 @@
 import io.mifos.anubis.api.v1.client.Anubis;
 import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
 import io.mifos.anubis.api.v1.domain.Signature;
-import io.mifos.identity.api.v1.client.IdentityService;
+import io.mifos.identity.api.v1.client.IdentityManager;
 import io.mifos.identity.api.v1.client.PermittableGroupAlreadyExistsException;
 import io.mifos.identity.api.v1.client.TenantAlreadyInitializedException;
 import io.mifos.identity.api.v1.domain.PermittableGroup;
@@ -91,7 +91,7 @@ public IdentityServiceInitializationResult initializeIsis(
     try (final AutoCloseable ignored
                  = applicationCallContextProvider.getApplicationCallContext(tenantIdentifier, applicationName))
     {
-      final IdentityService identityService = applicationCallContextProvider.getApplication(IdentityService.class, identityManagerUri);
+      final IdentityManager identityService = applicationCallContextProvider.getApplication(IdentityManager.class, identityManagerUri);
       try {
         final String randomPassword = RandomStringUtils.random(8, true, true);
 
@@ -134,7 +134,7 @@ public void postPermittableGroups(
     try (final AutoCloseable ignored
                  = applicationCallContextProvider.getApplicationCallContext(tenantIdentifier, identityManagerApplicationName))
     {
-      final IdentityService identityService = applicationCallContextProvider.getApplication(IdentityService.class, identityManagerApplicationUri);
+      final IdentityManager identityService = applicationCallContextProvider.getApplication(IdentityManager.class, identityManagerApplicationUri);
 
       final List<PermittableGroup> permittableGroups = getPermittableGroups(permittables);
 
@@ -169,7 +169,7 @@ static List<PermittableGroup> getPermittableGroups(final @Nonnull List<Permittab
   }
 
   void createOrFindPermittableGroup(
-          final @Nonnull IdentityService identityService,
+          final @Nonnull IdentityManager identityService,
           final @Nonnull PermittableGroup permittableGroup) {
     try {
       identityService.createPermittableGroup(permittableGroup);