OZG-6177 clean up after testing refactoring

src/main/java/de/ozgcloud/operator/elstertransfer/user/ConfigMapUserList.java

 package de.ozgcloud.operator.elstertransfer.user;
 
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
 
 public class ConfigMapUserList {
 
@@ -24,16 +22,6 @@ public class ConfigMapUserList {
 		return false;
 	}
 
-	//TODO Lösche diese Stelle, wenn sie im Service nicht mehr gebraucht wird
-//	boolean existsUSer2(String login){
-//		List<Map<String, Object>> users = getUsersListFromMap(yamlMap);
-//		for (Map<String, Object> user : users) {
-//			if (userLogin.equals(user.get("login"))) {
-//				LOG.info("User with login '{}' exists in ConfigMap '{}'", userLogin, configMapName);
-//				return true;
-//			}
-//		}
-//	}
 
 	void addUserToList(String login, String passwordHash, String role) {
 		Map<String, Object> formattedUser = Map.of(

src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java

@@ -61,7 +61,7 @@ public class OzgCloudElsterTransferUserRemoteService {
 	}
 
 
-	public void createSecret(String namespace, String userPassword, String secretName) {
+	public void createOrUpdateSecret(String namespace, String userPassword, String secretName) {
 		Secret secret = new SecretBuilder()
 				.withNewMetadata()
 				.withName(secretName)

src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java

@@ -34,7 +34,7 @@ public class OzgCloudElsterTransferUserService {
 			LOG.info("Restarting Deployment");
 			restartDeployment(ETR_NAMESPACE, ETR_DEPLOYMENT_NAME);
 			LOG.info("Creating Secret");
-			createSecret(namespace, userPassword,MUK_USER_SECRET_NAME);
+			createOrUpdateSecret(namespace, userPassword,MUK_USER_SECRET_NAME);
 		}
 	}
 
@@ -51,7 +51,7 @@ public class OzgCloudElsterTransferUserService {
 
 		// use namespace as user "login" and "group"
 		if (userExistsInList(users, namespace)) {
-			LOG.error("User with login '{}' already exists in ConfigMap '{}'.", namespace, configMapName);
+			LOG.warn("User with login '{}' already exists in ConfigMap '{}'.", namespace, configMapName);
 		} else {
 			userPassword = generatePassword();
 			String passwordHash = hashPassword(userPassword);
@@ -89,25 +89,6 @@ public class OzgCloudElsterTransferUserService {
 		LOG.info("User with login '{}' exists in ConfigMap '{}'", userLogin, configMapName);
 		return userExists;
 
-		//TODO: Löschen, wenn der ober Code diese Funktion erfüllt
-		//		Map<String, Object> yamlMap = getUsersMapFromConfigMap(configMap);
-		//
-		//		if (!yamlMap.isEmpty()) {
-		//			//code refactoren mit ConfigMapUserList Objekt (???)
-		//
-		//			getUsersFromYaml(yamlMap);
-		//
-		//			List<Map<String, Object>> users = getUsersListFromMap(yamlMap);
-		//			for (Map<String, Object> user : users) {
-		//				if (userLogin.equals(user.get("login"))) {
-		//					LOG.info("User with login '{}' exists in ConfigMap '{}'", userLogin, configMapName);
-		//					return true;
-		//				}
-		//			}
-		//		}
-
-		//		LOG.debug("User with login '{}' does not exist in ConfigMap '{}'", userLogin, configMapName);
-		//		return false;
 	}
 
 	void deleteUser(String userLogin, String configMapName) {
@@ -136,27 +117,11 @@ public class OzgCloudElsterTransferUserService {
 		}
 	}
 
-	void createSecret(String namespace, String userPassword, String secretName) {
-		remoteService.createSecret(namespace, userPassword, secretName);
+	void createOrUpdateSecret(String namespace, String userPassword, String secretName) {
+		remoteService.createOrUpdateSecret(namespace, userPassword, secretName);
 		LOG.info("Secret for user in namespace '{}' created successfully", namespace);
 	}
 
-	//TODO: Löschen wenn Code woanders korrekt
-//	Map<String, Object> getUsersMapFromConfigMap(ConfigMap configMap) {
-//		String usersYaml = configMap.getData().get(USERS_KEY);
-//
-//		Map<String, Object> usersMap = new HashMap<>();
-//		if (usersYaml != null && !usersYaml.isEmpty()) {
-//			usersMap = new Yaml().load(usersYaml);
-//		}
-//		return usersMap;
-//	}
-
-	//TODO: Löschen wenn Code woanders korrekt
-	//	List<Map<String, Object>> getUsersListFromMap(Map<String, Object> usersMap) {
-	//		List<Map<String, Object>> usersList = (List<Map<String, Object>>) usersMap.get("users");
-	//		return usersList != null ? usersList : new ArrayList<>();
-	//	}
 
 	ConfigMapUserList getUsersFromYaml(ConfigMap configMap) {
 		String usersYaml = configMap.getData().get(USERS_KEY);
@@ -165,16 +130,6 @@ public class OzgCloudElsterTransferUserService {
 		return new ConfigMapUserList(usersList);
 	}
 
-	//TODO: Löschen
-	//	boolean userExistsInList2(List<Map<String, Object>> usersList, String login) {
-	//		for (Map<String, Object> existingUser : usersList) {
-	//			if (login.equals(existingUser.get("login"))) {
-	//				return true;
-	//			}
-	//		}
-	//		return false;
-	//	}
-
 	boolean userExistsInList(ConfigMapUserList usersList, String login) {
 		return usersList.existsUser(login);
 	}
@@ -183,16 +138,6 @@ public class OzgCloudElsterTransferUserService {
 		usersList.addUserToList(login, passwordHash, USER_ROLE);
 	}
 
-	//TODO: Löschen
-	//	void addUserToList(List<Map<String, Object>> usersList, String login, String passwordHash) {
-	//		Map<String, Object> formattedUser = Map.of(
-	//				"login", login,
-	//				"rolle", USER_ROLE,
-	//				"credentials", Map.of("passwortHash", passwordHash),
-	//				"gruppe", login);
-	//		usersList.add(formattedUser);
-	//	}
-
 	private String generatePassword() {
 		return UUID.randomUUID().toString();
 	}