Merge branch 'OZG-4453-SearchIndexOperator' of...

Merge branch 'OZG-4453-SearchIndexOperator' of git.ozg-sh.de:ozgcloud-devops/operator into OZG-4453-SearchIndexOperator

ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/ProtocolMapperRepresentationHelper.java

@@ -2,15 +2,14 @@ package de.ozgcloud.operator.keycloak.client;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
 
 import org.apache.commons.lang3.StringUtils;
 import org.keycloak.representations.idm.ProtocolMapperRepresentation;
 import org.springframework.stereotype.Component;
 
-import lombok.extern.java.Log;
+import lombok.extern.log4j.Log4j2;
 
-@Log
+@Log4j2
 @Component
 class ProtocolMapperRepresentationHelper {
 
@@ -37,7 +36,7 @@ class ProtocolMapperRepresentationHelper {
 	static final String CLIENT_ROLES_MAPPER_NAME = "client roles";
 
 	public ProtocolMapperRepresentation createOrganisationsEinheitIdMapper() {
-		log.log(Level.FINE, "Create createOrganisationsEinheitIdMapper...");
+		LOG.debug("Create createOrganisationsEinheitIdMapper...");
 		return createUserAttributeMapper(ORGANISATIONS_EINHEIT_ID_MAPPER_NAME, buildOrganisationsEinheitIdMapperConfig());
 	}
 
@@ -55,7 +54,7 @@ class ProtocolMapperRepresentationHelper {
 	}
 
 	public ProtocolMapperRepresentation createOzgCloudUserIdMapper() {
-		log.log(Level.FINE, "Create createOzgCloudUserIdMapper...");
+		LOG.debug("Create createOzgCloudUserIdMapper...");
 		return createUserAttributeMapper(OZGCLOUD_USER_ID_MAPPER_NAME, buildOzgCloudUserIdMapperConfig());
 	}
 
@@ -73,7 +72,7 @@ class ProtocolMapperRepresentationHelper {
 	}
 
 	public ProtocolMapperRepresentation createOrganisationeEinheitIdLdapMapper() {
-		log.log(Level.FINE, "Create createOrganisationeEinheitIdLdapMapper...");
+		LOG.debug("Create createOrganisationeEinheitIdLdapMapper...");
 		return createUserAttributeMapper(ORGANISATIONS_EINHEIT_ID_LDAP_MAPPER_NAME, buildOrganisationsEinheitIdLdapMapperConfig());
 	}
 
@@ -101,7 +100,7 @@ class ProtocolMapperRepresentationHelper {
 	}
 
 	public ProtocolMapperRepresentation createClientRolesMapper() {
-		log.log(Level.FINE, "Create createClientRolesMapper...");
+		LOG.debug("Create createOrganisationeEinheitIdLdapMapper...");
 		return createUserClientRoleMapper(CLIENT_ROLES_MAPPER_NAME, buildClientRolesMapperConfig());
 	}
 

ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KubernetesRemoteService.java

@@ -6,17 +6,17 @@ import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.java.Log;
+import lombok.extern.log4j.Log4j2;
 
 @RequiredArgsConstructor
-@Log
+@Log4j2
 @Component
 class KubernetesRemoteService {
 
 	private final KubernetesClient kubernetesClient;
 
 	public Resource<Secret> getSecret(String namespace, String name) {
-		log.info(String.format("KubernetesClient: Get %s secret from %s namespace.", name, namespace));
+		LOG.info("KubernetesClient: Get {} secret from {} namespace.", name, namespace);
 		return kubernetesClient.secrets().inNamespace(namespace).withName(name);
 	}
 }