OZG-3961 fix visibility, minor refactoring

src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java

@@ -43,7 +43,7 @@ class KeycloakUserService {
 
 	public void createOrUpdateUser(OzgKeycloakUserSpec userSpec, String namespace) {
 
-		if (userSpecHasNoPassword(userSpec, namespace)) {
+		if (userHasNoPassword(userSpec, namespace)) {
 			var secret = userSecretService.getOrCreateClusterSecret(userSpec, namespace);
 			userSpec.getKeycloakUser().setPassword(userSecretService.getPasswordFromSecret(secret));
 		}
@@ -53,7 +53,7 @@ class KeycloakUserService {
 						() -> remoteService.createUser(userMapper.map(userSpec), namespace));
 	}
 
-	boolean userSpecHasNoPassword(OzgKeycloakUserSpec userSpec, String namespace) {
+	boolean userHasNoPassword(OzgKeycloakUserSpec userSpec, String namespace) {
 		return StringUtils.isEmpty(userSpec.getKeycloakUser().getPassword());
 	}
 

src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretBuilder.java

@@ -15,7 +15,7 @@ class UserSecretBuilder {
 	static final String SECRET_PASSWORD_FIELD = "password";
 	static final String SECRET_NAME_FIELD = "name";
 
-	Secret build(String name, KeycloakUserSpecUser userSpec, String namespace) {
+	public Secret build(String name, KeycloakUserSpecUser userSpec, String namespace) {
 		return new SecretBuilder()
 				.withType(SECRET_TYPE)
 				.withMetadata(createMetaData(name, namespace))

src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretService.java

@@ -42,11 +42,11 @@ class UserSecretService {
 		return kubernetesRemoteService.getSecret(namespace, secretName);
 	}
 
-	String getPasswordFromSecret(Secret secret) {
+	public String getPasswordFromSecret(Secret secret) {
 		return secretReader.getPasswortFromSecret(secret);
 	}
 
-	Secret getOrCreateClusterSecret(OzgKeycloakUserSpec userSpec, String namespace) {
+	public Secret getOrCreateClusterSecret(OzgKeycloakUserSpec userSpec, String namespace) {
 		return Optional.ofNullable(getUserSecret(userSpec, namespace)).map(Resource::get)
 				.orElseGet(() -> create(userSpec, namespace));
 	}

src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java

@@ -67,6 +67,7 @@ class KeycloakLivelTest {
 //		remoteService.updateClientRole(remoteRole.get(), createClient().getClientId(), realm);
 	}
 
+	@SuppressWarnings("unused")
 	private RoleRepresentation createRoles() {
 		return mapper.mapRole(OzgKeycloakClientSpecTestFactory.ROLE1);
 	}

src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java

@@ -28,7 +28,6 @@ import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Optional;
-import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
@@ -81,7 +80,7 @@ class KeycloakUserServiceTest {
 
 			@BeforeEach
 			void mock() {
-				doReturn(true).when(service).userSpecHasNoPassword(any(), eq(TEST_NAMESPACE));
+				doReturn(true).when(service).userHasNoPassword(any(), eq(TEST_NAMESPACE));
 			}
 
 			@Test
@@ -93,15 +92,14 @@ class KeycloakUserServiceTest {
 
 			@Test
 			void shouldUpdateUserPassword() {
-				var password = UUID.randomUUID().toString();
 				var userWithoutPassword = OzgKeycloakUserSpecTestFactory.createBuilder()
 						.keycloakUser(KeycloakUserSpecUserTestFactory.createBuiler().password(StringUtils.EMPTY).build()).build();
-				when(userSecretService.getPasswordFromSecret(any())).thenReturn(password);
+				when(userSecretService.getPasswordFromSecret(any())).thenReturn(KeycloakUserSpecUserTestFactory.PASSWORD);
 
 				service.createOrUpdateUser(userWithoutPassword, TEST_NAMESPACE);
 
 				verify(userMapper).map(ozgKeycloakUserSpecCaptor.capture());
-				assertThat(ozgKeycloakUserSpecCaptor.getValue().getKeycloakUser().getPassword()).isNotEmpty();
+				assertThat(ozgKeycloakUserSpecCaptor.getValue().getKeycloakUser().getPassword()).isEqualTo(KeycloakUserSpecUserTestFactory.PASSWORD);
 			}
 		}
 
@@ -111,7 +109,7 @@ class KeycloakUserServiceTest {
 
 			@BeforeEach
 			void mock() {
-				doReturn(false).when(service).userSpecHasNoPassword(any(), any());
+				doReturn(false).when(service).userHasNoPassword(any(), any());
 			}
 
 			@Test
@@ -126,7 +124,7 @@ class KeycloakUserServiceTest {
 		void shouldCallUserHasNoPassword() {
 			service.createOrUpdateUser(userSpec, TEST_NAMESPACE);
 
-			verify(service).userSpecHasNoPassword(userSpec, TEST_NAMESPACE);
+			verify(service).userHasNoPassword(userSpec, TEST_NAMESPACE);
 		}
 
 		@Test
@@ -177,7 +175,7 @@ class KeycloakUserServiceTest {
 		void testUserHasNoPasswordTrue() {
 			OzgKeycloakUserSpec user = OzgKeycloakUserSpecTestFactory.create();
 
-			boolean userHasNoPassword = service.userSpecHasNoPassword(user, TEST_NAMESPACE);
+			boolean userHasNoPassword = service.userHasNoPassword(user, TEST_NAMESPACE);
 
 			assertThat(userHasNoPassword).isFalse();
 		}
@@ -186,7 +184,7 @@ class KeycloakUserServiceTest {
 		void testUserHasNoPasswordFalse() {
 			OzgKeycloakUserSpec user = createUserWithoutPassword();
 
-			boolean userHasNoPassword = service.userSpecHasNoPassword(user, TEST_NAMESPACE);
+			boolean userHasNoPassword = service.userHasNoPassword(user, TEST_NAMESPACE);
 
 			assertThat(userHasNoPassword).isTrue();
 		}

src/test/java/de/ozgcloud/operator/keycloak/user/SecretTestFactory.java

@@ -24,11 +24,15 @@
 
 package de.ozgcloud.operator.keycloak.user;
 
+import java.util.UUID;
+
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretBuilder;
 
 public class SecretTestFactory {
 
+	public static final String PASSWORD = UUID.randomUUID().toString();
+
 	public static Secret create() {
 		return createBuilder().build();
 	}

src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretBuilderTest.java

@@ -48,12 +48,11 @@ public class UserSecretBuilderTest {
 
 		@Test
 		void shouldHavePassword() {
-			final String password = "PASSWORD";
-			doReturn(password).when(builder).generatePassword();
+			doReturn(SecretTestFactory.PASSWORD).when(builder).generatePassword();
 
 			var secret = builder.build(NAME, userSpec, NAMESPACE);
 
-			assertThat(secret.getStringData()).containsEntry(UserSecretBuilder.SECRET_PASSWORD_FIELD, password);
+			assertThat(secret.getStringData()).containsEntry(UserSecretBuilder.SECRET_PASSWORD_FIELD, SecretTestFactory.PASSWORD);
 		}
 
 		@DisplayName("metadata")

src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretReaderTest.java

@@ -27,7 +27,6 @@ package de.ozgcloud.operator.keycloak.user;
 import static org.assertj.core.api.Assertions.*;
 
 import java.util.Map;
-import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.Spy;
@@ -37,8 +36,6 @@ import io.fabric8.kubernetes.api.model.SecretBuilder;
 
 class UserSecretReaderTest {
 
-	private static final String PASSWORD = UUID.randomUUID().toString();
-
 	@Spy
 	private UserSecretReader reader;
 
@@ -48,10 +45,10 @@ class UserSecretReaderTest {
 
 		String password = reader.getPasswortFromSecret(secret);
 
-		assertThat(password).isEqualTo(PASSWORD);
+		assertThat(password).isEqualTo(SecretTestFactory.PASSWORD);
 	}
 
 	private Secret buildSecret() {
-		return new SecretBuilder().addToStringData(Map.of(UserSecretBuilder.SECRET_PASSWORD_FIELD, PASSWORD)).build();
+		return new SecretBuilder().addToStringData(Map.of(UserSecretBuilder.SECRET_PASSWORD_FIELD, SecretTestFactory.PASSWORD)).build();
 	}
 }