Refactor method name

kiwigrid · Jul 26, 2021 · 2a5627d · 2a5627d
1 parent 832f3c2
commit 2a5627d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/com/kiwigrid/keycloak/controller/client/ClientController.java b/src/main/java/com/kiwigrid/keycloak/controller/client/ClientController.java
@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 import java.util.Objects;
@@ -19,8 +18,6 @@
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;
 import org.keycloak.admin.client.resource.RealmResource;
-import org.keycloak.admin.client.resource.RoleMappingResource;
-import org.keycloak.admin.client.resource.RolesResource;
 import org.keycloak.representations.idm.ClientRepresentation;
 import org.keycloak.representations.idm.ProtocolMapperRepresentation;
 import org.keycloak.representations.idm.RoleRepresentation;
@@ -97,6 +94,7 @@ public void apply(ClientResource clientResource) {
 
 			if (clientResource.getSpec().getServiceAccountsEnabled() == Boolean.TRUE) {
 				manageServiceAccountRealmRoles(realmResource, clientUuid, clientResource);
+
 			}
 			updateStatus(clientResource, null);
 		} catch (RuntimeException e) {
@@ -368,7 +366,7 @@ void manageMapper(RealmResource realmResource, String clientUuid, ClientResource
 
 	private void manageServiceAccountRealmRoles(RealmResource realmResource, String clientUuid, ClientResource clientResource) {
 
-		this.serviceAccountRoleAssignmentSynchronizer.manageServiceAccountRealmRoles(realmResource, clientResource, clientUuid);
+		this.serviceAccountRoleAssignmentSynchronizer.synchronizeServiceAccountRealmRoles(realmResource, clientResource, clientUuid);
 
 	}
 

diff --git a/...ava/com/kiwigrid/keycloak/controller/client/ServiceAccountRoleAssignmentSynchronizer.java b/...ava/com/kiwigrid/keycloak/controller/client/ServiceAccountRoleAssignmentSynchronizer.java
@@ -19,7 +19,7 @@ public ServiceAccountRoleAssignmentSynchronizer(ServiceAccountRoleAssignment ser
 		this.serviceAccountRoleAssignment = serviceAccountRoleAssignment;
 	}
 
-	public void manageServiceAccountRealmRoles(RealmResource realmResource, ClientResource clientResourceDefinition, String clientUuid) {
+	public void synchronizeServiceAccountRealmRoles(RealmResource realmResource, ClientResource clientResourceDefinition, String clientUuid) {
 		var keycloak = clientResourceDefinition.getSpec().getKeycloak();
 		var realm = clientResourceDefinition.getSpec().getRealm();
 		var clientId = clientResourceDefinition.getSpec().getClientId();

diff --git a/...com/kiwigrid/keycloak/controller/client/ServiceAccountRoleAssignmentSynchronizerTest.java b/...com/kiwigrid/keycloak/controller/client/ServiceAccountRoleAssignmentSynchronizerTest.java
@@ -56,7 +56,7 @@ public void givenAssignedRolesAreNotUnassignedAndCreatedAndReassignedIgnoringCas
 				serviceAccountRoleAssignment);
 
 		// Act
-		synchronizer.manageServiceAccountRealmRoles(realmResource, k8sClientResourceDefinition, CLIENT_UUID);
+		synchronizer.synchronizeServiceAccountRealmRoles(realmResource, k8sClientResourceDefinition, CLIENT_UUID);
 
 		// Assert/Verify
 		verifyNoInteractions(rolesResource, roleScopeResource);
@@ -91,7 +91,7 @@ public void givenUnassignedRoleToAssignThatDoesNotExistInRealmIsCreatedAndAssign
 		var synchronizer = new ServiceAccountRoleAssignmentSynchronizer(serviceAccountRoleAssignment);
 
 		// Act
-		synchronizer.manageServiceAccountRealmRoles(realmResource, k8sClientResource, CLIENT_UUID);
+		synchronizer.synchronizeServiceAccountRealmRoles(realmResource, k8sClientResource, CLIENT_UUID);
 
 		// Assert
 		InOrder inOrder = Mockito.inOrder(roleScopeResource, rolesResource);
@@ -135,7 +135,7 @@ public void givenUnassignedRoleToAssignThatExistsInRealmIsNotCreatedButAssignedI
 				serviceAccountRoleAssignment);
 
 		// Act
-		synchronizer.manageServiceAccountRealmRoles(realmResource, k8sClientResourceDefinition, CLIENT_UUID);
+		synchronizer.synchronizeServiceAccountRealmRoles(realmResource, k8sClientResourceDefinition, CLIENT_UUID);
 
 		InOrder inOrder = Mockito.inOrder(roleScopeResource, rolesResource);
 		inOrder.verify(roleScopeResource, times(0)).remove(anyList());