diff --git a/pom.xml b/pom.xml index 2f6f33d50066e5c913fda03920fd2b2dcdfab702..53c904ec7218ac35a46a93b8500a34490a3f60ee 100644 --- a/pom.xml +++ b/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 diff --git a/src/main/java/de/ozgcloud/operator/Config.java b/src/main/java/de/ozgcloud/operator/Config.java index 23f033abedfc6d3f6212ab8da44f0c109b18f88b..6653131f89bd8e0fc6456ccfe8bf0486a3f6881b 100644 --- a/src/main/java/de/ozgcloud/operator/Config.java +++ b/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 diff --git a/src/main/java/de/ozgcloud/operator/OzgOperatorApplication.java b/src/main/java/de/ozgcloud/operator/OzgOperatorApplication.java index 1031253f4516a4956632864f65fd4e0590e44c6d..454595caa34862daf2388138d8f290ff6bb8ea76 100644 --- a/src/main/java/de/ozgcloud/operator/OzgOperatorApplication.java +++ b/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) { diff --git a/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java b/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java index f6f4b0640148fdb49f26905eb776ce86caa8a63a..60899d6ae6d55ebbb760f7bfd54f897f56d2df2d 100644 --- a/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java +++ b/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()); } } } diff --git a/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java b/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java index c20d68429f5bfe58bf89bd3037ee2da7b0bf73ce..8a92e32ac943a5d05850ff5d0d38a5358c7a0e96 100644 --- a/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java +++ b/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)); } } diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapper.java b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapper.java index c7effcaf8075dc18f103d58302f5818fc5b79b93..12cb44954dbfaf4f768aa5ca547bd4b3c4dbc782 100644 --- a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapper.java +++ b/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); diff --git a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapper.java b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapper.java index efeb5ccf8bc4ea13c578ad0c2230904c91476000..d0dcab2e55b7dded2064544876336dc9c44147b6 100644 --- a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapper.java +++ b/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()))); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6ddcc313b912f8bcd677d69d0997f9b797f0c3b0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,22 +0,0 @@ - -#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 diff --git a/src/test/java/de/ozgcloud/operator/keycloak/KeycloakClientTest.java b/src/test/java/de/ozgcloud/operator/keycloak/KeycloakClientTest.java index fa16375b03c808a6a37ac9fb1a1df834fcefbb5b..9ac65f4fc0d630c18cf5c33d2040da38b78e3984 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/KeycloakClientTest.java +++ b/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(); } } diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/ClientRepresentationTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/ClientRepresentationTestFactory.java index 0ac0d4728c8317ce51c824b469e343dcae49e060..c81842fe0a9d05720ae122da0c26d96a6e8084e1 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/client/ClientRepresentationTestFactory.java +++ b/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(); } } diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java index 08d345de5a1559c424317115d24913bd1e87936e..e368d9840e7b9f8056ca12893d138b21af54f86f 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java +++ b/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 { diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java index f29fa3e27ac1553c2413f98e9d574a7f6e8a2003..106831969ddc1c13dbe98759318b1a8dc873e2ec 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java +++ b/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; } } diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java index 8e0c3d82cb7d732ddbd9d7f370d62a36d45ed87b..c6a41f2d947c678491222c43f4e9da1e97134ef2 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java +++ b/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; } } diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java index 184c88edfbfe81e66d51cf440ed8099ca9ec1860..5129815e647ff35e05e91fc69dcdcdc76e7d5737 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java +++ b/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 { diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupTestFactory.java index 6aa51c69404005fa0de880dd083319c35e3837ba..e97a9b0be66fcb32b8a33d1931bf10f3d3cf8d59 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupTestFactory.java +++ b/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; diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java index 104a5a4da6fbcd50b540c08f9bd742fe4144c593..1d5acfe4003b41decd096b190369b868286c73fc 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java +++ b/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() { diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmTestFactory.java index b547ce63cd917996acf4f513b3d515a7d12297a4..e23492a96a0eb9e9baac13c146e5b3c6442988aa 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmTestFactory.java +++ b/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; diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/RealmRepresentationTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/RealmRepresentationTestFactory.java index c3a3148cb2f384860abc8d92fc3a73c773f37f31..72a8830e8b4ffaee3a3d673945ca9508cc313f1a 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/realm/RealmRepresentationTestFactory.java +++ b/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; } } diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java index b75139dc27c73fae6ad852948e737a55330233b3..3b4f7461311933f3ca759709545bef3188849e91 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java +++ b/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 { diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserTestFactory.java index 93d60c69019be104dce937c67bb52b1127fea251..32cdc69a1bed108d02ba8e8aa1b1f1a92be35860 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserTestFactory.java +++ b/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; diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/UserRepresentationTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/UserRepresentationTestFactory.java index bc218f3a08e91f44b99318df872433423c7d1395..3c1d058dfd2269538f78b6cd6027ced902869c07 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/user/UserRepresentationTestFactory.java +++ b/src/test/java/de/ozgcloud/operator/keycloak/user/UserRepresentationTestFactory.java @@ -39,11 +39,12 @@ public class UserRepresentationTestFactory { public static final String ROLE1 = "role1"; public static UserRepresentation create() { - UserRepresentation user = new UserRepresentation(); + var user = new UserRepresentation(); user.setUsername(USERNAME); user.setFirstName(FIRSTNAME); user.setLastName(LASTNAME); user.setClientRoles(new HashMap<>(Map.of(CLIENT_NAME, List.of(ROLE1)))); + return user; } }