OZG-3961 cleanup

pom.xml

@@ -3,47 +3,26 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
-<!--	<parent>-->
-<!--		<groupId>de.itvsh.kop.common</groupId>-->
-<!--		<artifactId>kop-common-parent</artifactId>-->
-<!--		<version>2.1.0</version>-->
-<!--		<relativePath/>  lookup parent from repository -->
-<!--	</parent>-->
-
-<!--	<parent>-->
-<!--		<groupId>de.itvsh.kop.common</groupId>-->
-<!--		<artifactId>kop-common-dependency</artifactId>-->
-<!--		<version>2.1.0</version>-->
-<!--		<relativePath/>  lookup parent from repository -->
-<!--	</parent>-->
-
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>3.1.1</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<relativePath/>
 	</parent>
 
-
-
 	<groupId>de.ozgcloud</groupId>
 	<artifactId>ozg-operator</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<name>OZG Cloud Operator</name>
 	<description>OZG Cloud Operator</description>
+	
 	<properties>
 		<operator-sdk.version>5.0.0</operator-sdk.version>
 		<spring-boot.build-image.imageName>docker.ozg-sh.de/ozg-operator:build-latest</spring-boot.build-image.imageName>
-		
 		<mapstruct.version>1.5.5.Final</mapstruct.version>
 		<keycloak-adapter.version>20.0.5</keycloak-adapter.version>
-		
-<!--		        <resteasy.version>4.7.7.Final</resteasy.version>-->
-
-<!--		<resteasy-legacy.version>5.0.7.Final</resteasy-legacy.version>-->
-<!--		<resteasy.version>5.0.7.Final</resteasy.version>-->
-        <resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
 	</properties>
+	
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -53,45 +32,17 @@
 		    <groupId>org.keycloak</groupId>
 		    <artifactId>keycloak-admin-client</artifactId>
 		    <version>${keycloak-adapter.version}</version>
-<!--		    <exclusions>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>org.jboss.resteasy</groupId>-->
-<!--               			 <artifactId>resteasy-client</artifactId>-->
-<!--                    </exclusion>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>org.jboss.resteasy</groupId>-->
-<!--                		<artifactId>resteasy-multipart-provider</artifactId>-->
-<!--                    </exclusion>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>org.jboss.resteasy</groupId>-->
-<!--                		<artifactId>resteasy-jackson2-provider</artifactId>-->
-<!--                    </exclusion>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>org.jboss.resteasy</groupId>-->
-<!--                		<artifactId>resteasy-jaxb-provider</artifactId>-->
-<!--                    </exclusion>-->
-<!--                </exclusions>-->
 		</dependency>
 		<dependency>
 		    <groupId>org.mapstruct</groupId>
 		    <artifactId>mapstruct</artifactId>
 		    <version>${mapstruct.version}</version>
 		</dependency>
-		
 		<dependency>
 			<groupId>io.javaoperatorsdk</groupId>
 			<artifactId>operator-framework-spring-boot-starter</artifactId>
 			<version>${operator-sdk.version}</version>
 		</dependency>
-		
-<!--		<dependency>-->
-<!--			<groupId>org.jboss.resteasy</groupId>-->
-<!--			<artifactId>resteasy-jaxrs</artifactId>-->
-<!--    		<version>3.15.6.Final</version>		-->
-<!--    	</dependency>-->
-		<!-- Thanks for using https://jar-download.com -->
-
-
 		<dependency>
 	    	<groupId>javax.validation</groupId>
 	    	<artifactId>validation-api</artifactId>
@@ -101,71 +52,6 @@
 		    <groupId>jakarta.xml.bind</groupId>
 		    <artifactId>jakarta.xml.bind-api</artifactId>
 		</dependency>
-
-
-<!--		 start https://github.com/keycloak/keycloak/blob/main/pom.xml -->
-<!--		<dependency>-->
-<!--                <groupId>org.jboss.resteasy</groupId>-->
-<!--                <artifactId>resteasy-core</artifactId>-->
-<!--                <version>${resteasy.version}</version>-->
-<!--                <exclusions>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>log4j</groupId>-->
-<!--                        <artifactId>log4j</artifactId>-->
-<!--                    </exclusion>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>org.slf4j</groupId>-->
-<!--                        <artifactId>slf4j-api</artifactId>-->
-<!--                    </exclusion>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>org.slf4j</groupId>-->
-<!--                        <artifactId>slf4j-simple</artifactId>-->
-<!--                    </exclusion>-->
-<!--                </exclusions>-->
-<!--            </dependency>-->
-<!--            <dependency>-->
-<!--                <groupId>org.jboss.resteasy</groupId>-->
-<!--                <artifactId>resteasy-multipart-provider</artifactId>-->
-<!--                <version>${resteasy.version}</version>-->
-<!--            </dependency>-->
-<!--            <dependency>-->
-<!--                <groupId>org.jboss.resteasy</groupId>-->
-<!--                <artifactId>resteasy-jackson2-provider</artifactId>-->
-<!--                <version>${resteasy.version}</version>-->
-<!--            </dependency>-->
-<!--            <dependency>-->
-<!--                <groupId>org.jboss.resteasy</groupId>-->
-<!--                <artifactId>resteasy-jaxb-provider</artifactId>-->
-<!--                <version>${resteasy.version}</version>-->
-<!--            </dependency>-->
-<!--            <dependency>-->
-<!--                <groupId>org.jboss.resteasy</groupId>-->
-<!--                <artifactId>resteasy-client</artifactId>-->
-<!--                <version>${resteasy.version}</version>-->
-<!--            </dependency>-->
-<!--            <dependency>-->
-<!--                <groupId>org.jboss.resteasy</groupId>-->
-<!--                <artifactId>resteasy-undertow</artifactId>-->
-<!--                <version>${resteasy.undertow.version}</version>-->
-<!--                <exclusions>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>io.undertow</groupId>-->
-<!--                        <artifactId>undertow-servlet</artifactId>-->
-<!--                    </exclusion>-->
-<!--                    <exclusion>-->
-<!--                        <groupId>io.undertow</groupId>-->
-<!--                        <artifactId>undertow-core</artifactId>-->
-<!--                    </exclusion>-->
-<!--                </exclusions>-->
-<!--            </dependency>-->
-            <!-- ende https://github.com/keycloak/keycloak/blob/main/pom.xml -->
-
-
-<!--		<dependency>-->
-<!--			<groupId>io.javaoperatorsdk</groupId>-->
-<!--			<artifactId>operator-framework-spring-boot-starter</artifactId>-->
-<!--			<version>${operator-sdk.version}</version>-->
-<!--		</dependency>-->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -176,7 +62,6 @@
 		    <version>0.10.2</version>
 		</dependency>
 		
-		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -206,43 +91,35 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-<!--			<plugin>-->
-<!--				<groupId>org.graalvm.buildtools</groupId>-->
-<!--				<artifactId>native-maven-plugin</artifactId>-->
-<!--			</plugin>-->
-			
+			</plugin>			
 			<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<fork>true</fork>
-						<annotationProcessorPaths>
-							<path>
-								<groupId>org.projectlombok</groupId>
-								<artifactId>lombok</artifactId>
-								<version>${lombok.version}</version>
-							</path>
-							<path>
-								<groupId>org.mapstruct</groupId>
-								<artifactId>mapstruct-processor</artifactId>
-								<version>${mapstruct.version}</version>
-							</path>
-							<!-- other annotation processors -->
-						</annotationProcessorPaths>
-
-						<showWarnings>true</showWarnings>
-						<compilerArgs>
-							<compilerArg>
-								-Amapstruct.defaultComponentModel=spring
-							</compilerArg>
-							<compilerArg>
-								-Amapstruct.unmappedTargetPolicy=WARN
-							</compilerArg>
-						</compilerArgs>
-					</configuration>
-				</plugin>
-
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<fork>true</fork>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+							<version>${lombok.version}</version>
+						</path>
+						<path>
+							<groupId>org.mapstruct</groupId>
+							<artifactId>mapstruct-processor</artifactId>
+							<version>${mapstruct.version}</version>
+						</path>
+					</annotationProcessorPaths>
+					<showWarnings>true</showWarnings>
+					<compilerArgs>
+						<compilerArg>
+							-Amapstruct.defaultComponentModel=spring
+						</compilerArg>
+						<compilerArg>
+							-Amapstruct.unmappedTargetPolicy=WARN
+						</compilerArg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -258,4 +135,5 @@
 			<url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
 		</snapshotRepository>
 	</distributionManagement>
-</project>
+	
+</project>
\ No newline at end of file

src/main/java/de/ozgcloud/operator/Config.java

@@ -37,11 +37,6 @@ public class Config {
 	public static final int RECONCILER_RETRY_SECONDS = 20;
 	public static final int RECONCILER_RETRY_SECONDS_ON_ERROR = 60;
 
-//	@Bean
-//	KeycloakUserReconciler customServiceController(KeycloakUserService keycloakUserService) {
-//		return new KeycloakUserReconciler(keycloakUserService);
-//	}
-
 	@Bean(initMethod = "start", destroyMethod = "stop")
 	@SuppressWarnings("rawtypes")
 	Operator operator(List<Reconciler> controllers) {
@@ -49,15 +44,4 @@ public class Config {
 		controllers.forEach(operator::register);
 		return operator;
 	}
-
-//	@Bean
-//	KubernetesClient kubernetesClient() {
-//		io.fabric8.kubernetes.client.Config config = new ConfigBuilder().withMasterUrl("https://mymaster.com").build();
-//		return new KubernetesClientBuilder().withConfig(config).build();
-//	}
-
-//	@Bean
-//	KubernetesClient kubernetesClient() {
-//		return new KubernetesClientBuilder().build();
-//	}
 }
\ No newline at end of file

src/main/java/de/ozgcloud/operator/OzgOperatorApplication.java

@@ -27,7 +27,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-//@ImportRuntimeHints(KubernetesClientImpl.class)
 public class OzgOperatorApplication {
 
 	public static void main(String[] args) {

src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java

@@ -38,8 +38,6 @@ import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.NamedCluster;
 import lombok.extern.slf4j.Slf4j;
 
-//@Configuration
-//@ImportRuntimeHints(SpringNativeConfiguration.KuberenetesCLientImplHints.class)
 @Slf4j
 public class SpringNativeConfiguration {
 
@@ -50,7 +48,6 @@ public class SpringNativeConfiguration {
 
 		@Override
 		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-			// https://github.com/kubernetes-native-java/fabric8-spring-native/
 			var subtypesOfKubernetesResource = reflections.getSubTypesOf(KubernetesResource.class);
 
 			var combined = new HashSet<Class<?>>();
@@ -59,15 +56,6 @@ public class SpringNativeConfiguration {
 			combined.add(io.fabric8.kubernetes.client.impl.KubernetesClientImpl.class);
 			combined.add(io.javaoperatorsdk.operator.processing.retry.GenericRetry.class);
 			combined.add(io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter.class);
-//			Class.forName("io.fabric8.kubernetes.client.okhttp.OkHttpClientBuilderImpl");
-//			reflections.getSubTypesOf(io.fabric8.kubernetes.client.okhttp.OkHttpClientBuilderImpl.class);
-
-//			combined.add(OzgKeycloakUser.class);
-//			combined.add(OzgKeycloakUserSpec.class);
-//			combined.add(OzgKeycloakUserSpec.KeycloakUserSpecUser.class);
-//			combined.add(OzgKeycloakUserSpec.KeycloakUserSpecClientRole.class);
-//			combined.add(OzgKeycloakUserSpec.KeycloakUserSpecUserGroup.class);
-//			combined.add(OzgKeycloakUserStatus.class);
 
 			combined.add(Keycloak.class);
 			combined.add(org.keycloak.admin.client.spi.ResteasyClientClassicProvider.class);
@@ -104,20 +92,14 @@ public class SpringNativeConfiguration {
 			combined.add(ThreadPoolExecutor.class);
 			combined.addAll(reflections.getSubTypesOf(ExecutorService.class));
 
-			combined
-					.stream()
-					.filter(Objects::nonNull)
-					.forEach(c -> {
-						if (log.isDebugEnabled()) {
-							log.debug("trying to register " + c.getName() + " for reflection");
-						}
-						hints.reflection().registerType(c, MemberCategory.values());
-
-//						registry.reflection().forType(c).withAccess(TypeAccess.values()).build();
-					});
-//			hints.reflection().registerType(clazz, null)
-//					.registerType(KubernetesClientImpl.class, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);
+			combined.stream().filter(Objects::nonNull).forEach(clazz -> register(hints, clazz));
+		}
 
+		private void register(RuntimeHints hints, Class<?> clazz) {
+			if (log.isDebugEnabled()) {
+				log.debug("trying to register " + clazz.getName() + " for reflection");
+			}
+			hints.reflection().registerType(clazz, MemberCategory.values());
 		}
 	}
 }

src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java

@@ -24,7 +24,6 @@
 package de.ozgcloud.operator.keycloak;
 
 import java.util.Base64;
-import java.util.logging.Level;
 
 import org.keycloak.admin.client.Keycloak;
 import org.keycloak.admin.client.KeycloakBuilder;
@@ -36,9 +35,7 @@ import org.springframework.context.annotation.Scope;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import lombok.extern.java.Log;
 
-@Log
 @Configuration
 public class KeycloakClient {
 
@@ -76,9 +73,6 @@ public class KeycloakClient {
 	}
 
 	String decodeBase64(String base64String) {
-		log.log(Level.INFO, "base64String to decode: " + base64String);
-		var decoded = Base64.getDecoder().decode(base64String);
-		log.log(Level.INFO, "decoded string: " + decoded);
-		return new String(decoded);
+		return new String(Base64.getDecoder().decode(base64String));
 	}
 }

src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapper.java

@@ -62,8 +62,7 @@ interface KeycloakClientMapper {
 
 	@Named("mapAttributes")
 	default Map<String, String> mapAttributes(OzgKeycloakClientSpec client) {
-		return Map.of(
-				ATTRIBUTE_NAME_POST_LOGOUT_REDIRECT_URIS, ATTRIBUTE_VALUE_POST_LOGOUT_REDIRECT_URIS);
+		return Map.of(ATTRIBUTE_NAME_POST_LOGOUT_REDIRECT_URIS, ATTRIBUTE_VALUE_POST_LOGOUT_REDIRECT_URIS);
 	}
 
 	RoleRepresentation mapRole(OzgKeycloakClientSpec.ClientRole spec);

src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapper.java

@@ -42,7 +42,6 @@ interface KeycloakGroupMapper {
 
 	@Named("mapAttributes")
 	default Map<String, List<String>> mapAttributes(List<OzgKeycloakGroupSpec.Attribute> attributes) {
-		return attributes.stream()
-				.collect(Collectors.toMap(OzgKeycloakGroupSpec.Attribute::getName, attribute -> List.of(attribute.getValue())));
+		return attributes.stream().collect(Collectors.toMap(OzgKeycloakGroupSpec.Attribute::getName, attribute -> List.of(attribute.getValue())));
 	}
 }

src/main/resources/application.yml

-
-#management:
-#  server:
-#    port: 8081
-#  health:
-#    livenessState:
-#      enabled: true
-#    readinessState:
-#      enabled: true
-#  endpoint:
-#    health:
-#      group:
-#        readiness:
-#          include:
-#          - readinessState
-#      probes.enabled: true
-#    prometheus:
-#      enabled: true
-#  endpoints:
-#    web:
-#      exposure:
-#        include: health,prometheus

src/test/java/de/ozgcloud/operator/keycloak/KeycloakClientTest.java

@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
 class KeycloakClientTest {
 
 	@Test
-	void test() {
+	void shouldInitKeycloakClient() {
 		new KeycloakClient();
 	}
 }

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

@@ -25,11 +25,9 @@ package de.ozgcloud.operator.keycloak.client;
 
 import org.keycloak.representations.idm.ClientRepresentation;
 
-class ClientRepresentationTestFactory {
+public class ClientRepresentationTestFactory {
 
 	public static ClientRepresentation create() {
-		var client = new ClientRepresentation();
-
-		return client;
+		return new ClientRepresentation();
 	}
 }

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

@@ -34,7 +34,7 @@ import org.mockito.Spy;
 class KeycloakClientMapperTest {
 
 	@Spy
-	private KeycloakClientMapper mapper = Mappers.getMapper(KeycloakClientMapper.class);
+	private final KeycloakClientMapper mapper = Mappers.getMapper(KeycloakClientMapper.class);
 
 	@Nested
 	class TestMap {

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

@@ -28,8 +28,9 @@ import org.keycloak.representations.idm.RoleRepresentation;
 public class RoleRepresentationTestFactory {
 
 	public static RoleRepresentation create() {
-		RoleRepresentation role = new RoleRepresentation();
+		var role = new RoleRepresentation();
 		role.setName(OzgKeycloakClientSpecTestFactory.ROLE_NAME_1);
+
 		return role;
 	}
 }

src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java

@@ -28,8 +28,9 @@ import org.keycloak.representations.idm.GroupRepresentation;
 public class GroupRepresentationTestFactory {
 
 	public static GroupRepresentation create() {
-		GroupRepresentation group = new GroupRepresentation();
+		var group = new GroupRepresentation();
 		group.setName(OzgKeycloakGroupSpecTestFactory.NAME);
+
 		return group;
 	}
 }

src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java

@@ -35,7 +35,7 @@ import org.mockito.Spy;
 class KeycloakGroupMapperTest {
 
 	@Spy
-	private KeycloakGroupMapper mapper = Mappers.getMapper(KeycloakGroupMapper.class);
+	private final KeycloakGroupMapper mapper = Mappers.getMapper(KeycloakGroupMapper.class);
 
 	@Nested
 	class TestMap {

src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupTestFactory.java

@@ -25,16 +25,12 @@ package de.ozgcloud.operator.keycloak.group;
 
 public class OzgKeycloakGroupTestFactory {
 
-	public static final OzgKeycloakGroupSpec SPEC = OzgKeycloakGroupSpecTestFactory.create();
-	public static final OzgKeycloakGroupStatus STATUS = OzgKeycloakGroupStatus.builder().build();
-
 	public static final String METADATA_NAMESPACE = "TestNameSpace";
 
 	public static OzgKeycloakGroup create() {
-		OzgKeycloakGroup group = new OzgKeycloakGroup();
-		group.setSpec(SPEC);
-		group.setStatus(STATUS);
-
+		var group = new OzgKeycloakGroup();
+		group.setSpec(OzgKeycloakGroupSpecTestFactory.create());
+		group.setStatus(OzgKeycloakGroupStatus.builder().build());
 		group.getMetadata().setNamespace(METADATA_NAMESPACE);
 
 		return group;

src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java

@@ -32,7 +32,7 @@ import org.mockito.Spy;
 class KeycloakRealmMapperTest {
 
 	@Spy
-	private KeycloakRealmMapper mapper = Mappers.getMapper(KeycloakRealmMapper.class);
+	private final KeycloakRealmMapper mapper = Mappers.getMapper(KeycloakRealmMapper.class);
 
 	@Test
 	void shouldMapDisplayName() {

src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmTestFactory.java

@@ -25,16 +25,12 @@ package de.ozgcloud.operator.keycloak.realm;
 
 public class OzgKeycloakRealmTestFactory {
 
-	public final static OzgKeycloakRealmSpec SPEC = OzgKeycloakRealmSpecTestFactory.create();
-	public final static OzgKeycloakRealmStatus STATUS = OzgKeycloakRealmStatusTestFactory.create();
-
 	public static final String METADATA_NAMESPACE = "TestNamespace";
 
 	public static OzgKeycloakRealm create() {
 		var realm = new OzgKeycloakRealm();
-		realm.setSpec(SPEC);
-		realm.setStatus(STATUS);
-
+		realm.setSpec(OzgKeycloakRealmSpecTestFactory.create());
+		realm.setStatus(OzgKeycloakRealmStatusTestFactory.create());
 		realm.getMetadata().setNamespace(METADATA_NAMESPACE);
 
 		return realm;

src/test/java/de/ozgcloud/operator/keycloak/realm/RealmRepresentationTestFactory.java

@@ -30,8 +30,9 @@ public class RealmRepresentationTestFactory {
 	public static final String NAME = "TestRealm";
 
 	public static RealmRepresentation create() {
-		RealmRepresentation realm = new RealmRepresentation();
+		var realm = new RealmRepresentation();
 		realm.setRealm(NAME);
+
 		return realm;
 	}
 }

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

@@ -43,7 +43,7 @@ import lombok.SneakyThrows;
 class KeycloakUserMapperTest {
 
 	@Spy
-	private KeycloakUserMapper mapper = Mappers.getMapper(KeycloakUserMapper.class);
+	private final KeycloakUserMapper mapper = Mappers.getMapper(KeycloakUserMapper.class);
 
 	@Nested
 	class TestMap {

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

@@ -25,17 +25,12 @@ package de.ozgcloud.operator.keycloak.user;
 
 class OzgKeycloakUserTestFactory {
 
-	public static final OzgKeycloakUserStatus KEYCLOAK_USER_STATUS = OzgKeycloakUserStatusTestFactory.create();
-
-	public static final OzgKeycloakUserSpec KEYCLOAK_USER_SPEC = OzgKeycloakUserSpecTestFactory.create();
-
 	public static final String METADATA_NAMESPACE = "TestNamespace";
 
 	public static OzgKeycloakUser create() {
-		OzgKeycloakUser keycloakUser = new OzgKeycloakUser();
-		keycloakUser.setStatus(KEYCLOAK_USER_STATUS);
-		keycloakUser.setSpec(KEYCLOAK_USER_SPEC);
-
+		var keycloakUser = new OzgKeycloakUser();
+		keycloakUser.setStatus(OzgKeycloakUserStatusTestFactory.create());
+		keycloakUser.setSpec(OzgKeycloakUserSpecTestFactory.create());
 		keycloakUser.getMetadata().setNamespace(METADATA_NAMESPACE);
 
 		return keycloakUser;