From 4fdc6ca97283b05b33316784ec154cdd3eb62fb8 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 4 Jan 2024 15:08:42 +0100
Subject: [PATCH] OZG-4453 adjust dependency injection
---
.../keycloak/user/KeycloakUserReconciler.java | 9 ++++-----
.../operator/keycloak/user/UserSecretService.java | 15 ++++++---------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
index 26aab3f..669a897 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
@@ -27,7 +27,6 @@ import java.util.logging.Level;
import javax.ws.rs.NotFoundException;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import de.ozgcloud.operator.Config;
@@ -38,17 +37,17 @@ import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import lombok.RequiredArgsConstructor;
import lombok.extern.java.Log;
+@RequiredArgsConstructor
@Log
@ControllerConfiguration
@Component
public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>, Cleaner<OzgCloudKeycloakUser> {
- @Autowired
- private KeycloakUserService service;
- @Autowired
- private KeycloakUserPreconditionService preconditionService;
+ private final KeycloakUserService service;
+ private final KeycloakUserPreconditionService preconditionService;
@Override
public UpdateControl<OzgCloudKeycloakUser> reconcile(OzgCloudKeycloakUser resource, Context<OzgCloudKeycloakUser> context) {
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretService.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretService.java
index 23bab6c..a82bc2f 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretService.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretService.java
@@ -2,24 +2,21 @@ package de.ozgcloud.operator.keycloak.user;
import java.util.Optional;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.client.dsl.Resource;
import io.fabric8.kubernetes.client.extension.ResourceAdapter;
+import lombok.RequiredArgsConstructor;
+@RequiredArgsConstructor
@Component
class UserSecretService {
- @Autowired
- private UserNameConverter userNameConverter;
- @Autowired
- private UserSecretBuilder secretBuilder;
- @Autowired
- private UserSecretReader secretReader;
- @Autowired
- private KubernetesRemoteService kubernetesRemoteService;
+ private final UserNameConverter userNameConverter;
+ private final UserSecretBuilder secretBuilder;
+ private final UserSecretReader secretReader;
+ private final KubernetesRemoteService kubernetesRemoteService;
public Secret create(OzgCloudKeycloakUserSpec userSpec, String namespace) {
var secretName = userNameConverter.toSecretName(userSpec.getKeycloakUser());
--
GitLab