diff --git a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchReconcilerTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchReconcilerTest.java
index 9185d001aa8cdd49058dfa8feedc15f72d8839c0..904ead4d747afec3409b795556bcb76f7441ff3f 100644
--- a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchReconcilerTest.java
+++ b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchReconcilerTest.java
@@ -155,14 +155,14 @@ class ElasticsearchReconcilerTest {
void shouldContainResource() {
var updateControl = buildExceptionUpdateControl();
- assertThat(updateControl.getResource().get()).isEqualTo(resource);
+ assertThat(updateControl.getResource()).isEqualTo(resource);
}
@Test
void shouldContainUpdateStatus() {
var updateControl = buildExceptionUpdateControl();
- assertThat(updateControl.getResource().get().getStatus().getStatus()).isEqualTo(CustomResourceStatus.ERROR);
+ assertThat(updateControl.getResource().getStatus().getStatus()).isEqualTo(CustomResourceStatus.ERROR);
}
@Test
@@ -176,7 +176,7 @@ class ElasticsearchReconcilerTest {
void shouldContainMessage() {
var updateControl = buildExceptionUpdateControl();
- assertThat(updateControl.getResource().get().getStatus().getMessage()).isEqualTo(EXCEPTION_MESSAGE);
+ assertThat(updateControl.getResource().getStatus().getMessage()).isEqualTo(EXCEPTION_MESSAGE);
}
private UpdateControl<OzgCloudElasticsearchCustomResource> buildExceptionUpdateControl() {
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java
index 0defae3726672be24b20f494a99a193eeea07fba..9a0245284d9db59deb7fa400852fe26b848d7ef5 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java
@@ -38,8 +38,4 @@ import io.fabric8.kubernetes.model.annotation.Version;
@Plural("ozgcloudkeycloakclients")
@SuppressWarnings("serial")
class OzgCloudKeycloakClient extends CustomResource<OzgCloudKeycloakClientSpec, OzgCloudKeycloakClientStatus> implements Namespaced {
-
- public OzgCloudKeycloakClient() {
- super();
- }
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroup.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroup.java
index 78535206021f41d58a5b9530884e1b342407b95f..f2996fdc9c040ecf1ebe7e87b604d9e5a928e6f2 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroup.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroup.java
@@ -38,8 +38,4 @@ import io.fabric8.kubernetes.model.annotation.Version;
@Plural("ozgcloudkeycloakgroups")
@SuppressWarnings("serial")
class OzgCloudKeycloakGroup extends CustomResource<OzgCloudKeycloakGroupSpec, OzgCloudKeycloakGroupStatus> implements Namespaced {
-
- public OzgCloudKeycloakGroup() {
- super();
- }
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealm.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealm.java
index 1a1c3a3c095c401b8a409b1e4ec88bbee5622b47..8ebf4990a6ac5bdb08de3186ffecee251ebe3e2e 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealm.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealm.java
@@ -38,8 +38,4 @@ import io.fabric8.kubernetes.model.annotation.Version;
@Plural("ozgcloudkeycloakrealms")
@SuppressWarnings("serial")
class OzgCloudKeycloakRealm extends CustomResource<OzgCloudKeycloakRealmSpec, OzgCloudKeycloakRealmStatus> implements Namespaced {
-
- public OzgCloudKeycloakRealm() {
- super();
- }
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUser.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUser.java
index e728c9641343db522d849a61932fbe73cb37c248..aaa237ef7b5d5cefeb1ed9f1d4aae46619e5376e 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUser.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUser.java
@@ -38,8 +38,4 @@ import io.fabric8.kubernetes.model.annotation.Version;
@Plural("ozgcloudkeycloakusers")
@SuppressWarnings("serial")
class OzgCloudKeycloakUser extends CustomResource<OzgCloudKeycloakUserSpec, OzgCloudKeycloakUserStatus> implements Namespaced {
-
- public OzgCloudKeycloakUser() {
- super();
- }
}
diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
index 8e8b45879b2fee7fff56e2d117e15288a8f756bc..a7ddbd8a018a013041cb8c45bc3fae3edd8d657a 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
@@ -74,7 +74,7 @@ class KeycloakClientReconcilerTest {
void shouldSetStatusOk() {
var response = reconciler.reconcile(OzgCloudKeycloakClientTestFactory.create(), null);
- assertThat(response.getResource().get().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
+ assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
}
@Test
@@ -83,7 +83,7 @@ class KeycloakClientReconcilerTest {
var response = reconciler.reconcile(OzgCloudKeycloakClientTestFactory.create(), null);
- assertThat(response.getResource().get().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.IN_PROGRESS);
+ assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.IN_PROGRESS);
}
}
}
diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
index e7390c7cf80ae3038bb847b4c4e850e7ae8d25ad..bb568f7c430b6a2130dfe330331922a77d318356 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
@@ -73,7 +73,7 @@ class KeycloakGroupReconcilerTest {
void shouldSetStatusOk() {
var response = reconciler.reconcile(KEYCLOAK_GROUP, null);
- assertThat(response.getResource().get().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
+ assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
}
@Test
@@ -82,7 +82,7 @@ class KeycloakGroupReconcilerTest {
var response = reconciler.reconcile(KEYCLOAK_GROUP, null);
- assertThat(response.getResource().get().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.IN_PROGRESS);
+ assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.IN_PROGRESS);
}
}
}
diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
index bf3848c600f1266c065782f5479a128c55a0eafb..986de5307e05a9623af7c47ba6fa1fc4abee26d3 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
@@ -73,7 +73,7 @@ class KeycloakRealmReconcilerTest {
void shouldSetStatusOk() {
var response = reconciler.reconcile(OzgCloudKeycloakRealmTestFactory.create(), null);
- assertThat(response.getResource().get().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
+ assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
}
}
diff --git a/pom.xml b/pom.xml
index 921a8e0f788c23f6aecfd8d7982bec691d39f949..df3bdcb1c9a1080a03aa7938fce99c30e5c4b2db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<ozgcloud-license.version>1.6.0</ozgcloud-license.version>
<dependency-track-maven-plugin.version>1.7.0</dependency-track-maven-plugin.version>
- <operator-sdk.version>6.0.0</operator-sdk.version>
+ <operator-sdk.version>5.6.0</operator-sdk.version>
<!-- tools -->
<reflections.version>0.10.2</reflections.version>