From f51a0728dd7c01afc8292d56a6b549eb87b3cf9d Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Tue, 11 Mar 2025 19:05:20 +0100
Subject: [PATCH] revert operator sdk version
---
.../de/ozgcloud/operator/ElasticsearchReconcilerTest.java | 6 +++---
.../operator/keycloak/client/OzgCloudKeycloakClient.java | 4 ----
.../operator/keycloak/group/OzgCloudKeycloakGroup.java | 4 ----
.../operator/keycloak/realm/OzgCloudKeycloakRealm.java | 4 ----
.../operator/keycloak/user/OzgCloudKeycloakUser.java | 4 ----
.../keycloak/client/KeycloakClientReconcilerTest.java | 4 ++--
.../keycloak/group/KeycloakGroupReconcilerTest.java | 4 ++--
.../keycloak/realm/KeycloakRealmReconcilerTest.java | 2 +-
pom.xml | 2 +-
9 files changed, 9 insertions(+), 25 deletions(-)
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 9185d00..904ead4 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 0defae3..9a02452 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 7853520..f2996fd 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 1a1c3a3..8ebf499 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 e728c96..aaa237e 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 8e8b458..a7ddbd8 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 e7390c7..bb568f7 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 bf3848c..986de53 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 921a8e0..df3bdcb 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>
--
GitLab