diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a65a729abfd..07411eacb10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/build-keycloak - name: Spotless - run: ./mvnw spotless:check + run: ./mvnw -Pdocs,distribution,operator spotless:check - name: Check for unstaged proto.lock files if: github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release/') diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack-layer-metadata-tests/src/test/java/org/keycloak/test/saml/adapter/galleon/pack/layer/metadata/KeycloakSamlAdapterLayerMetaDataTestCase.java b/distribution/galleon-feature-packs/saml-adapter-galleon-pack-layer-metadata-tests/src/test/java/org/keycloak/test/saml/adapter/galleon/pack/layer/metadata/KeycloakSamlAdapterLayerMetaDataTestCase.java index 217107b3d2c..0390ac9fffc 100644 --- a/distribution/galleon-feature-packs/saml-adapter-galleon-pack-layer-metadata-tests/src/test/java/org/keycloak/test/saml/adapter/galleon/pack/layer/metadata/KeycloakSamlAdapterLayerMetaDataTestCase.java +++ b/distribution/galleon-feature-packs/saml-adapter-galleon-pack-layer-metadata-tests/src/test/java/org/keycloak/test/saml/adapter/galleon/pack/layer/metadata/KeycloakSamlAdapterLayerMetaDataTestCase.java @@ -1,5 +1,16 @@ package org.keycloak.test.saml.adapter.galleon.pack.layer.metadata; +import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.Collections; +import java.util.Set; +import java.util.stream.Collectors; + import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.Asset; import org.jboss.shrinkwrap.api.asset.StringAsset; @@ -14,17 +25,6 @@ import org.wildfly.glow.GlowSession; import org.wildfly.glow.ScanResults; import org.wildfly.glow.maven.MavenResolver; -import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.Collections; -import java.util.Set; -import java.util.stream.Collectors; - public class KeycloakSamlAdapterLayerMetaDataTestCase { private static final String URL_PROPERTY = "wildfly-glow-galleon-feature-packs-url"; diff --git a/operator/src/main/java/org/keycloak/operator/Config.java b/operator/src/main/java/org/keycloak/operator/Config.java index 34b24b164a4..765d0035c25 100644 --- a/operator/src/main/java/org/keycloak/operator/Config.java +++ b/operator/src/main/java/org/keycloak/operator/Config.java @@ -17,11 +17,11 @@ package org.keycloak.operator; +import java.util.Map; + import io.fabric8.kubernetes.api.model.Quantity; import io.smallrye.config.ConfigMapping; -import java.util.Map; - /** * @author Vaclav Muzikar */ diff --git a/operator/src/main/java/org/keycloak/operator/Constants.java b/operator/src/main/java/org/keycloak/operator/Constants.java index 721832ebd24..9afdeadc571 100644 --- a/operator/src/main/java/org/keycloak/operator/Constants.java +++ b/operator/src/main/java/org/keycloak/operator/Constants.java @@ -16,8 +16,6 @@ */ package org.keycloak.operator; -import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; - import java.util.Collections; import java.util.List; import java.util.Map; @@ -25,6 +23,8 @@ import java.util.TreeMap; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; + public final class Constants { public static final String CRDS_GROUP = "k8s.keycloak.org"; public static final String CRDS_VERSION = "v2alpha1"; diff --git a/operator/src/main/java/org/keycloak/operator/ContextUtils.java b/operator/src/main/java/org/keycloak/operator/ContextUtils.java index dcef38987e3..e2d7f53a133 100644 --- a/operator/src/main/java/org/keycloak/operator/ContextUtils.java +++ b/operator/src/main/java/org/keycloak/operator/ContextUtils.java @@ -17,15 +17,16 @@ package org.keycloak.operator; -import io.fabric8.kubernetes.api.model.apps.StatefulSet; -import io.javaoperatorsdk.operator.api.reconciler.Context; +import java.util.Optional; + import org.keycloak.operator.controllers.KeycloakDistConfigurator; import org.keycloak.operator.controllers.WatchedResources; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; import org.keycloak.operator.update.UpdateType; -import java.util.Optional; +import io.fabric8.kubernetes.api.model.apps.StatefulSet; +import io.javaoperatorsdk.operator.api.reconciler.Context; public final class ContextUtils { diff --git a/operator/src/main/java/org/keycloak/operator/Utils.java b/operator/src/main/java/org/keycloak/operator/Utils.java index 51c1827be47..8f4bd8e9797 100644 --- a/operator/src/main/java/org/keycloak/operator/Utils.java +++ b/operator/src/main/java/org/keycloak/operator/Utils.java @@ -17,15 +17,6 @@ package org.keycloak.operator; -import io.fabric8.kubernetes.api.model.ConfigMap; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.ResourceRequirementsBuilder; -import io.fabric8.kubernetes.api.model.Secret; -import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.utils.Serialization; - import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -39,6 +30,15 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import io.fabric8.kubernetes.api.model.ConfigMap; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.api.model.ResourceRequirementsBuilder; +import io.fabric8.kubernetes.api.model.Secret; +import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; + /** * @author Vaclav Muzikar */ diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakAdminSecretDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakAdminSecretDependentResource.java index c9786420cf0..a794f788868 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakAdminSecretDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakAdminSecretDependentResource.java @@ -1,5 +1,13 @@ package org.keycloak.operator.controllers; +import java.util.Optional; +import java.util.UUID; + +import org.keycloak.operator.Constants; +import org.keycloak.operator.Utils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.BootstrapAdminSpec; + import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil; @@ -12,14 +20,6 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDep import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource; import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition; -import org.keycloak.operator.Constants; -import org.keycloak.operator.Utils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.BootstrapAdminSpec; - -import java.util.Optional; -import java.util.UUID; - @KubernetesDependent( informer = @Informer(labelSelector = Constants.DEFAULT_LABELS_AS_STRING) ) diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakController.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakController.java index 505daf42362..d861e4b45c3 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakController.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakController.java @@ -16,6 +16,26 @@ */ package org.keycloak.operator.controllers; +import java.util.Comparator; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.TimeUnit; + +import jakarta.inject.Inject; + +import org.keycloak.common.util.CollectionUtil; +import org.keycloak.operator.Config; +import org.keycloak.operator.Constants; +import org.keycloak.operator.ContextUtils; +import org.keycloak.operator.Utils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakBuilder; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatus; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusAggregator; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HostnameSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HostnameSpecBuilder; +import org.keycloak.operator.update.UpdateLogicFactory; + import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ContainerState; import io.fabric8.kubernetes.api.model.ContainerStateWaiting; @@ -38,24 +58,6 @@ import io.javaoperatorsdk.operator.api.reconciler.Workflow; import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent; import io.javaoperatorsdk.operator.processing.event.source.EventSource; import io.quarkus.logging.Log; -import jakarta.inject.Inject; -import org.keycloak.common.util.CollectionUtil; -import org.keycloak.operator.Config; -import org.keycloak.operator.Constants; -import org.keycloak.operator.ContextUtils; -import org.keycloak.operator.Utils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakBuilder; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatus; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusAggregator; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HostnameSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HostnameSpecBuilder; -import org.keycloak.operator.update.UpdateLogicFactory; - -import java.util.Comparator; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.TimeUnit; @Workflow( explicitInvocation = true, diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeploymentDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeploymentDependentResource.java index a16822c4983..18994481eeb 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeploymentDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeploymentDependentResource.java @@ -16,6 +16,42 @@ */ package org.keycloak.operator.controllers; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.TreeSet; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.keycloak.operator.Config; +import org.keycloak.operator.Constants; +import org.keycloak.operator.ContextUtils; +import org.keycloak.operator.Utils; +import org.keycloak.operator.crds.v2alpha1.CRDUtils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.CacheSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpManagementSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.ProbeSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.SchedulingSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.Truststore; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.TruststoreSource; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.UnsupportedSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.UpdateSpec; +import org.keycloak.operator.update.impl.RecreateOnImageChangeUpdateLogic; + import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.EnvVar; @@ -37,41 +73,6 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernete import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent; import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition; import io.quarkus.logging.Log; -import org.keycloak.operator.Config; -import org.keycloak.operator.Constants; -import org.keycloak.operator.ContextUtils; -import org.keycloak.operator.Utils; -import org.keycloak.operator.crds.v2alpha1.CRDUtils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.CacheSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpManagementSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.ProbeSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.SchedulingSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.Truststore; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.TruststoreSource; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.UnsupportedSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.UpdateSpec; -import org.keycloak.operator.update.impl.RecreateOnImageChangeUpdateLogic; - -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Base64; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.TreeSet; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; import static org.keycloak.operator.Utils.addResources; import static org.keycloak.operator.controllers.KeycloakDistConfigurator.getKeycloakOptionEnvVarName; diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDiscoveryServiceDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDiscoveryServiceDependentResource.java index 66417a5e54a..c378261b97a 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDiscoveryServiceDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDiscoveryServiceDependentResource.java @@ -16,6 +16,10 @@ */ package org.keycloak.operator.controllers; +import org.keycloak.operator.Constants; +import org.keycloak.operator.Utils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; + import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.ServiceBuilder; import io.fabric8.kubernetes.api.model.ServiceSpec; @@ -25,10 +29,6 @@ import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent; -import org.keycloak.operator.Constants; -import org.keycloak.operator.Utils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; - @KubernetesDependent( informer = @Informer(labelSelector = Constants.DEFAULT_LABELS_AS_STRING) ) diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java index d4bb917cc16..e34905dda37 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java @@ -17,12 +17,19 @@ package org.keycloak.operator.controllers; -import io.fabric8.kubernetes.api.model.EnvVar; -import io.fabric8.kubernetes.api.model.EnvVarBuilder; -import io.fabric8.kubernetes.api.model.EnvVarSourceBuilder; -import io.fabric8.kubernetes.api.model.SecretKeySelector; -import io.quarkus.logging.Log; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Collectors; + import jakarta.enterprise.context.ApplicationScoped; + import org.keycloak.common.util.CollectionUtil; import org.keycloak.operator.Constants; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; @@ -38,16 +45,11 @@ import org.keycloak.operator.crds.v2alpha1.deployment.spec.ProxySpec; import org.keycloak.operator.crds.v2alpha1.deployment.spec.TracingSpec; import org.keycloak.operator.crds.v2alpha1.deployment.spec.TransactionsSpec; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.function.Function; -import java.util.stream.Collectors; +import io.fabric8.kubernetes.api.model.EnvVar; +import io.fabric8.kubernetes.api.model.EnvVarBuilder; +import io.fabric8.kubernetes.api.model.EnvVarSourceBuilder; +import io.fabric8.kubernetes.api.model.SecretKeySelector; +import io.quarkus.logging.Log; import static io.smallrye.config.common.utils.StringUtil.replaceNonAlphanumericByUnderscores; diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakIngressDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakIngressDependentResource.java index 3ab8c944de7..312d09e06fb 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakIngressDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakIngressDependentResource.java @@ -16,6 +16,16 @@ */ package org.keycloak.operator.controllers; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashMap; +import java.util.Optional; + +import org.keycloak.operator.Constants; +import org.keycloak.operator.Utils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.IngressSpec; + import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.api.model.networking.v1.IngressBuilder; import io.fabric8.kubernetes.api.model.networking.v1.IngressTLSBuilder; @@ -26,18 +36,8 @@ import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent; import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition; - import io.quarkus.logging.Log; import org.jboss.logging.Logger; -import org.keycloak.operator.Constants; -import org.keycloak.operator.Utils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.IngressSpec; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.HashMap; -import java.util.Optional; import static org.keycloak.operator.crds.v2alpha1.CRDUtils.isTlsConfigured; diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakNetworkPolicyDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakNetworkPolicyDependentResource.java index 630d875692c..dbc94189788 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakNetworkPolicyDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakNetworkPolicyDependentResource.java @@ -21,6 +21,15 @@ import java.util.List; import java.util.Optional; import java.util.function.Predicate; +import org.keycloak.operator.Constants; +import org.keycloak.operator.Utils; +import org.keycloak.operator.crds.v2alpha1.CRDUtils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpManagementSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.NetworkPolicySpec; + import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyBuilder; @@ -33,14 +42,6 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernete import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent; import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition; import org.jboss.logging.Logger; -import org.keycloak.operator.Constants; -import org.keycloak.operator.Utils; -import org.keycloak.operator.crds.v2alpha1.CRDUtils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpManagementSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.NetworkPolicySpec; import static org.keycloak.operator.Constants.KEYCLOAK_JGROUPS_DATA_PORT; import static org.keycloak.operator.Constants.KEYCLOAK_JGROUPS_FD_PORT; diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java index 39b6ce230b9..a21ea20986e 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java @@ -16,6 +16,18 @@ */ package org.keycloak.operator.controllers; +import java.util.Optional; +import java.util.concurrent.TimeUnit; + +import jakarta.inject.Inject; + +import org.keycloak.operator.Config; +import org.keycloak.operator.ContextUtils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatus; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatusBuilder; + import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.fabric8.kubernetes.api.model.apps.StatefulSetStatus; import io.fabric8.kubernetes.api.model.batch.v1.Job; @@ -27,16 +39,6 @@ import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; import io.javaoperatorsdk.operator.api.reconciler.Workflow; import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent; import io.quarkus.logging.Log; -import jakarta.inject.Inject; -import org.keycloak.operator.Config; -import org.keycloak.operator.ContextUtils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatus; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatusBuilder; - -import java.util.Optional; -import java.util.concurrent.TimeUnit; @Workflow( explicitInvocation = true, diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportJobDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportJobDependentResource.java index b59ee042e17..6aafc2a9028 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportJobDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportJobDependentResource.java @@ -16,6 +16,22 @@ */ package org.keycloak.operator.controllers; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import org.keycloak.operator.Config; +import org.keycloak.operator.ContextUtils; +import org.keycloak.operator.Utils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.ImportSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.SchedulingSpec; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportSpec; +import org.keycloak.operator.crds.v2alpha1.realmimport.Placeholder; + import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.EnvVarBuilder; import io.fabric8.kubernetes.api.model.PodSpec; @@ -33,21 +49,6 @@ import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected; import io.javaoperatorsdk.operator.processing.dependent.Creator; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource; -import org.keycloak.operator.Config; -import org.keycloak.operator.ContextUtils; -import org.keycloak.operator.Utils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.ImportSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.SchedulingSpec; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportSpec; -import org.keycloak.operator.crds.v2alpha1.realmimport.Placeholder; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; import static org.keycloak.operator.Utils.addResources; import static org.keycloak.operator.controllers.KeycloakDistConfigurator.getKeycloakOptionEnvVarName; diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportSecretDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportSecretDependentResource.java index 0db50623d94..9de0141c8ad 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportSecretDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportSecretDependentResource.java @@ -1,5 +1,9 @@ package org.keycloak.operator.controllers; +import org.keycloak.operator.Constants; +import org.keycloak.operator.Utils; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; + import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil; @@ -8,10 +12,6 @@ import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent; -import org.keycloak.operator.Constants; -import org.keycloak.operator.Utils; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; - @KubernetesDependent( informer = @Informer(labelSelector = Constants.DEFAULT_LABELS_AS_STRING) ) diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakServiceDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakServiceDependentResource.java index 42cec8eedd1..0971033ba44 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakServiceDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakServiceDependentResource.java @@ -16,9 +16,15 @@ */ package org.keycloak.operator.controllers; -import java.util.Optional; import java.util.HashMap; import java.util.Map; +import java.util.Optional; + +import org.keycloak.operator.Constants; +import org.keycloak.operator.Utils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpManagementSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpSpec; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Service; @@ -29,11 +35,6 @@ import io.javaoperatorsdk.operator.api.config.informer.Informer; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent; -import org.keycloak.operator.Constants; -import org.keycloak.operator.Utils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpManagementSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpSpec; import static org.keycloak.operator.crds.v2alpha1.CRDUtils.isTlsConfigured; diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakServiceMonitorDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakServiceMonitorDependentResource.java index 1224f7be633..cf685821eb4 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakServiceMonitorDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakServiceMonitorDependentResource.java @@ -1,9 +1,5 @@ package org.keycloak.operator.controllers; -import static org.keycloak.operator.controllers.KeycloakDeploymentDependentResource.managementEndpoint; -import static org.keycloak.operator.crds.v2alpha1.CRDUtils.METRICS_ENABLED; -import static org.keycloak.operator.crds.v2alpha1.CRDUtils.configuredOptions; - import java.net.HttpURLConnection; import org.keycloak.operator.Constants; @@ -24,6 +20,10 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDep import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition; import io.quarkus.logging.Log; +import static org.keycloak.operator.controllers.KeycloakDeploymentDependentResource.managementEndpoint; +import static org.keycloak.operator.crds.v2alpha1.CRDUtils.METRICS_ENABLED; +import static org.keycloak.operator.crds.v2alpha1.CRDUtils.configuredOptions; + @KubernetesDependent( informer = @Informer(labelSelector = Constants.DEFAULT_LABELS_AS_STRING) ) diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakUpdateJobDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakUpdateJobDependentResource.java index 3e52a2a10b2..fdcd30b5ba3 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakUpdateJobDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakUpdateJobDependentResource.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; -import io.fabric8.kubernetes.api.model.HasMetadata; +import jakarta.enterprise.context.ApplicationScoped; import org.keycloak.operator.Constants; import org.keycloak.operator.ContextUtils; @@ -37,6 +37,7 @@ import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpecBuilder; import org.keycloak.operator.crds.v2alpha1.deployment.spec.UpdateSpec; import io.fabric8.kubernetes.api.model.ContainerFluent; +import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.api.model.PodSpec; @@ -50,7 +51,6 @@ import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfigBuilder; -import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class KeycloakUpdateJobDependentResource extends CRUDKubernetesDependentResource { diff --git a/operator/src/main/java/org/keycloak/operator/controllers/WatchedResources.java b/operator/src/main/java/org/keycloak/operator/controllers/WatchedResources.java index 4b465478c49..364754ad2d2 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/WatchedResources.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/WatchedResources.java @@ -25,13 +25,14 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; +import jakarta.enterprise.context.ApplicationScoped; + import org.keycloak.operator.Utils; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.javaoperatorsdk.operator.api.reconciler.Context; -import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class WatchedResources { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/CRDUtils.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/CRDUtils.java index 0f94bd5a05a..8c0accd5c31 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/CRDUtils.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/CRDUtils.java @@ -31,7 +31,6 @@ import org.keycloak.operator.crds.v2alpha1.deployment.spec.FeatureSpec; import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpSpec; import com.fasterxml.jackson.databind.JsonNode; - import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.PodSpec; diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java index 8ba30f13896..bbd4a6f5bf7 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java @@ -16,6 +16,8 @@ */ package org.keycloak.operator.crds.v2alpha1.deployment; +import org.keycloak.operator.Constants; + import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.model.annotation.Group; @@ -25,7 +27,6 @@ import io.fabric8.kubernetes.model.annotation.Version; import io.quarkiverse.operatorsdk.annotations.CSVMetadata; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import org.keycloak.operator.Constants; @CSVMetadata( description="Represents a Keycloak Instance", diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java index 39468966b00..2819ca641b8 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java @@ -16,9 +16,10 @@ */ package org.keycloak.operator.crds.v2alpha1.deployment; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.SpecReplicas; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import org.keycloak.operator.crds.v2alpha1.deployment.spec.BootstrapAdminSpec; import org.keycloak.operator.crds.v2alpha1.deployment.spec.CacheSpec; @@ -38,16 +39,14 @@ import org.keycloak.operator.crds.v2alpha1.deployment.spec.TracingSpec; import org.keycloak.operator.crds.v2alpha1.deployment.spec.TransactionsSpec; import org.keycloak.operator.crds.v2alpha1.deployment.spec.Truststore; import org.keycloak.operator.crds.v2alpha1.deployment.spec.UnsupportedSpec; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.UpdateSpec; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.UpdateSpec; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.SpecReplicas; @JsonInclude(JsonInclude.Include.NON_NULL) public class KeycloakSpec { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatus.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatus.java index 5eb24f6b9fa..4dedce44706 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatus.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatus.java @@ -21,7 +21,6 @@ import java.util.Objects; import java.util.Optional; import com.fasterxml.jackson.annotation.JsonIgnore; - import io.fabric8.kubernetes.model.annotation.LabelSelector; import io.fabric8.kubernetes.model.annotation.StatusReplicas; import io.sundr.builder.annotations.Buildable; diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusAggregator.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusAggregator.java index 6ba0df3c3aa..56c1efa05fd 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusAggregator.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakStatusAggregator.java @@ -17,8 +17,6 @@ package org.keycloak.operator.crds.v2alpha1.deployment; -import org.keycloak.operator.Utils; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -28,6 +26,8 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; +import org.keycloak.operator.Utils; + /** * @author Vaclav Muzikar */ diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/ValueOrSecret.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/ValueOrSecret.java index 1ce546f2a2a..b5eb0c30d7e 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/ValueOrSecret.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/ValueOrSecret.java @@ -17,11 +17,10 @@ package org.keycloak.operator.crds.v2alpha1.deployment; -import io.fabric8.kubernetes.api.model.SecretKeySelector; - import java.util.Objects; import com.fasterxml.jackson.annotation.JsonInclude; +import io.fabric8.kubernetes.api.model.SecretKeySelector; /** * @author Vaclav Muzikar diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/BootstrapAdminSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/BootstrapAdminSpec.java index 61f834a5ef1..abe5eb8b923 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/BootstrapAdminSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/BootstrapAdminSpec.java @@ -2,7 +2,6 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyDescription; - import io.sundr.builder.annotations.Buildable; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/CacheSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/CacheSpec.java index a907f61fa77..07452e8719e 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/CacheSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/CacheSpec.java @@ -17,11 +17,10 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; +import com.fasterxml.jackson.annotation.JsonInclude; import io.fabric8.kubernetes.api.model.ConfigMapKeySelector; import io.sundr.builder.annotations.Buildable; -import com.fasterxml.jackson.annotation.JsonInclude; - @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") public class CacheSpec { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/DatabaseSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/DatabaseSpec.java index 9126cedaabf..06d14ffdeea 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/DatabaseSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/DatabaseSpec.java @@ -19,7 +19,6 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyDescription; - import io.fabric8.kubernetes.api.model.SecretKeySelector; import io.sundr.builder.annotations.Buildable; diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/FeatureSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/FeatureSpec.java index 55898c0398c..46b98413763 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/FeatureSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/FeatureSpec.java @@ -17,15 +17,15 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; +import java.io.Serializable; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.sundr.builder.annotations.Buildable; -import java.io.Serializable; -import java.util.List; - @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @JsonPropertyOrder({"enabled", "disabled"}) diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HostnameSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HostnameSpec.java index 97be1e064b3..8bdcbec4b89 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HostnameSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HostnameSpec.java @@ -17,12 +17,12 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; +import java.io.Serializable; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import io.sundr.builder.annotations.Buildable; -import java.io.Serializable; - @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") public class HostnameSpec implements Serializable { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HttpManagementSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HttpManagementSpec.java index e60d5b9bb37..27c7a7da5e6 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HttpManagementSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HttpManagementSpec.java @@ -16,14 +16,15 @@ */ package org.keycloak.operator.crds.v2alpha1.deployment.spec; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import io.sundr.builder.annotations.Buildable; import org.keycloak.operator.Constants; import org.keycloak.operator.crds.v2alpha1.CRDUtils; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import io.sundr.builder.annotations.Buildable; + @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") public class HttpManagementSpec { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HttpSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HttpSpec.java index 263b1e004f9..07d98733909 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HttpSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/HttpSpec.java @@ -17,19 +17,18 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; -import java.util.Optional; import java.util.Map; +import java.util.Optional; import org.keycloak.operator.Constants; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; - -import io.sundr.builder.annotations.Buildable; import org.keycloak.operator.crds.v2alpha1.CRDUtils; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import io.sundr.builder.annotations.Buildable; + /** * @author Vaclav Muzikar */ diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/ImportSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/ImportSpec.java index 3ee328865c2..49fba72614b 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/ImportSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/ImportSpec.java @@ -20,7 +20,6 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; - import io.sundr.builder.annotations.Buildable; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/IngressSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/IngressSpec.java index ef0bff1bf4c..d0fb429343b 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/IngressSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/IngressSpec.java @@ -17,14 +17,14 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; +import java.util.LinkedHashMap; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import io.sundr.builder.annotations.Buildable; -import java.util.LinkedHashMap; -import java.util.Map; - @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") public class IngressSpec { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/NetworkPolicySpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/NetworkPolicySpec.java index 48cbb6fbea9..1c84cb0e5f7 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/NetworkPolicySpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/NetworkPolicySpec.java @@ -20,16 +20,17 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; import java.util.List; import java.util.Optional; +import org.keycloak.operator.Constants; +import org.keycloak.operator.crds.v2alpha1.CRDUtils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import io.fabric8.generator.annotation.Default; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeer; import io.sundr.builder.annotations.Buildable; -import org.keycloak.operator.Constants; -import org.keycloak.operator.crds.v2alpha1.CRDUtils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/SchedulingSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/SchedulingSpec.java index 83e261cebd8..4bbb27d7ce5 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/SchedulingSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/SchedulingSpec.java @@ -1,14 +1,13 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; -import io.fabric8.kubernetes.api.model.Affinity; -import io.fabric8.kubernetes.api.model.Toleration; -import io.fabric8.kubernetes.api.model.TopologySpreadConstraint; -import io.sundr.builder.annotations.Buildable; - import java.util.ArrayList; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; +import io.fabric8.kubernetes.api.model.Affinity; +import io.fabric8.kubernetes.api.model.Toleration; +import io.fabric8.kubernetes.api.model.TopologySpreadConstraint; +import io.sundr.builder.annotations.Buildable; @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/ServiceMonitorSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/ServiceMonitorSpec.java index 76c20291e69..42590f47cb8 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/ServiceMonitorSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/ServiceMonitorSpec.java @@ -6,7 +6,6 @@ import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyDescription; - import io.fabric8.generator.annotation.Default; import io.sundr.builder.annotations.Buildable; diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TracingSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TracingSpec.java index 7353492a47c..f33726f9b64 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TracingSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TracingSpec.java @@ -17,15 +17,15 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.stream.Collectors; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import io.sundr.builder.annotations.Buildable; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.stream.Collectors; - @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") public class TracingSpec { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TransactionsSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TransactionsSpec.java index a3fe3056747..17e5e9a2110 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TransactionsSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TransactionsSpec.java @@ -17,12 +17,12 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; +import java.io.Serializable; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import io.sundr.builder.annotations.Buildable; -import java.io.Serializable; - @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") public class TransactionsSpec implements Serializable { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/Truststore.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/Truststore.java index 4f00fb62b69..cfe19d80f41 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/Truststore.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/Truststore.java @@ -19,7 +19,6 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyDescription; - import io.sundr.builder.annotations.Buildable; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TruststoreSource.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TruststoreSource.java index a73f32ee722..c3b637c55fc 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TruststoreSource.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/TruststoreSource.java @@ -17,11 +17,10 @@ package org.keycloak.operator.crds.v2alpha1.deployment.spec; +import com.fasterxml.jackson.annotation.JsonInclude; import io.fabric8.generator.annotation.Required; import io.sundr.builder.annotations.Buildable; -import com.fasterxml.jackson.annotation.JsonInclude; - @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") public class TruststoreSource { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/UpdateSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/UpdateSpec.java index 7a2d418c230..bb0b5a33772 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/UpdateSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/spec/UpdateSpec.java @@ -21,16 +21,17 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; +import org.keycloak.operator.crds.v2alpha1.CRDUtils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; +import org.keycloak.operator.update.UpdateStrategy; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import io.fabric8.generator.annotation.Default; import io.fabric8.generator.annotation.ValidationRule; import io.sundr.builder.annotations.Buildable; -import org.keycloak.operator.crds.v2alpha1.CRDUtils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpec; -import org.keycloak.operator.update.UpdateStrategy; @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java index a4a2c58fdc6..2c9727c5fd0 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java @@ -16,6 +16,12 @@ */ package org.keycloak.operator.crds.v2alpha1.realmimport; +import org.keycloak.operator.Constants; +import org.keycloak.representations.idm.ComponentExportRepresentation; +import org.keycloak.representations.idm.GroupRepresentation; +import org.keycloak.representations.idm.authorization.ScopeRepresentation; + +import com.fasterxml.jackson.annotation.JsonIgnore; import io.fabric8.crd.generator.annotation.SchemaSwap; import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.client.CustomResource; @@ -25,13 +31,6 @@ import io.quarkiverse.operatorsdk.annotations.CSVMetadata; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; -import org.keycloak.operator.Constants; -import org.keycloak.representations.idm.ComponentExportRepresentation; -import org.keycloak.representations.idm.GroupRepresentation; -import org.keycloak.representations.idm.authorization.ScopeRepresentation; - -import com.fasterxml.jackson.annotation.JsonIgnore; - @CSVMetadata( description="Represents a Keycloak Realm Import", displayName="KeycloakRealmImport" diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportSpec.java index 9354486d67b..742d57cc334 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportSpec.java @@ -16,6 +16,11 @@ */ package org.keycloak.operator.crds.v2alpha1.realmimport; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.keycloak.representations.idm.RealmRepresentation; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; @@ -23,11 +28,6 @@ import io.fabric8.generator.annotation.Required; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.sundr.builder.annotations.Buildable; -import org.keycloak.representations.idm.RealmRepresentation; - -import java.util.LinkedHashMap; -import java.util.Map; - @JsonInclude(JsonInclude.Include.NON_NULL) @Buildable(editableEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") public class KeycloakRealmImportSpec { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatus.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatus.java index 521c1d39e18..0a5000a8147 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatus.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportStatus.java @@ -16,11 +16,11 @@ */ package org.keycloak.operator.crds.v2alpha1.realmimport; -import com.fasterxml.jackson.annotation.JsonIgnore; - import java.util.List; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonIgnore; + import static org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatusCondition.DONE; public class KeycloakRealmImportStatus { diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/Placeholder.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/Placeholder.java index 2e143c6f0db..75717cff113 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/Placeholder.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/Placeholder.java @@ -17,12 +17,12 @@ package org.keycloak.operator.crds.v2alpha1.realmimport; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonInclude; import io.fabric8.kubernetes.api.model.SecretKeySelector; import io.sundr.builder.annotations.Buildable; -import java.util.Objects; - /** * @author Scott Tustison */ diff --git a/operator/src/main/java/org/keycloak/operator/update/UpdateLogic.java b/operator/src/main/java/org/keycloak/operator/update/UpdateLogic.java index 3d5c92beb43..797db10b30e 100644 --- a/operator/src/main/java/org/keycloak/operator/update/UpdateLogic.java +++ b/operator/src/main/java/org/keycloak/operator/update/UpdateLogic.java @@ -19,11 +19,12 @@ package org.keycloak.operator.update; import java.util.Optional; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusAggregator; + import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusAggregator; /** * An API to implement to handle Keycloak CR updates. diff --git a/operator/src/main/java/org/keycloak/operator/update/UpdateLogicFactory.java b/operator/src/main/java/org/keycloak/operator/update/UpdateLogicFactory.java index 25bc423b645..8186e9e3585 100644 --- a/operator/src/main/java/org/keycloak/operator/update/UpdateLogicFactory.java +++ b/operator/src/main/java/org/keycloak/operator/update/UpdateLogicFactory.java @@ -17,9 +17,9 @@ package org.keycloak.operator.update; -import io.javaoperatorsdk.operator.api.reconciler.Context; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; + import org.keycloak.operator.controllers.KeycloakUpdateJobDependentResource; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.spec.UpdateSpec; @@ -27,6 +27,8 @@ import org.keycloak.operator.update.impl.AutoUpdateLogic; import org.keycloak.operator.update.impl.ExplicitUpdateLogic; import org.keycloak.operator.update.impl.RecreateOnImageChangeUpdateLogic; +import io.javaoperatorsdk.operator.api.reconciler.Context; + /** * The {@link UpdateLogic} factory. It returns an implementation based on the {@link Keycloak} configuration. */ diff --git a/operator/src/main/java/org/keycloak/operator/update/UpdateType.java b/operator/src/main/java/org/keycloak/operator/update/UpdateType.java index c02dfdc02fa..0e2c232ff8e 100644 --- a/operator/src/main/java/org/keycloak/operator/update/UpdateType.java +++ b/operator/src/main/java/org/keycloak/operator/update/UpdateType.java @@ -17,9 +17,10 @@ package org.keycloak.operator.update; -import io.fabric8.kubernetes.api.model.apps.StatefulSet; import org.keycloak.operator.controllers.KeycloakDeploymentDependentResource; +import io.fabric8.kubernetes.api.model.apps.StatefulSet; + /** * Supported update types by {@link KeycloakDeploymentDependentResource}. */ diff --git a/operator/src/main/java/org/keycloak/operator/update/impl/AutoUpdateLogic.java b/operator/src/main/java/org/keycloak/operator/update/impl/AutoUpdateLogic.java index ee6fe444ed8..7ccccfb9cdb 100644 --- a/operator/src/main/java/org/keycloak/operator/update/impl/AutoUpdateLogic.java +++ b/operator/src/main/java/org/keycloak/operator/update/impl/AutoUpdateLogic.java @@ -22,6 +22,10 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; +import org.keycloak.operator.controllers.KeycloakUpdateJobDependentResource; +import org.keycloak.operator.crds.v2alpha1.CRDUtils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; + import io.fabric8.kubernetes.api.model.ContainerState; import io.fabric8.kubernetes.api.model.ContainerStateTerminated; import io.fabric8.kubernetes.api.model.ContainerStatus; @@ -32,9 +36,6 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; import io.quarkus.logging.Log; -import org.keycloak.operator.controllers.KeycloakUpdateJobDependentResource; -import org.keycloak.operator.crds.v2alpha1.CRDUtils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; public class AutoUpdateLogic extends BaseUpdateLogic { diff --git a/operator/src/main/java/org/keycloak/operator/update/impl/BaseUpdateLogic.java b/operator/src/main/java/org/keycloak/operator/update/impl/BaseUpdateLogic.java index 6c25fdd765d..b68c8861025 100644 --- a/operator/src/main/java/org/keycloak/operator/update/impl/BaseUpdateLogic.java +++ b/operator/src/main/java/org/keycloak/operator/update/impl/BaseUpdateLogic.java @@ -24,12 +24,6 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.EnvVar; -import io.fabric8.kubernetes.api.model.apps.StatefulSet; -import io.javaoperatorsdk.operator.api.reconciler.Context; -import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; -import io.quarkus.logging.Log; import org.keycloak.operator.ContextUtils; import org.keycloak.operator.controllers.KeycloakDeploymentDependentResource; import org.keycloak.operator.crds.v2alpha1.CRDUtils; @@ -38,6 +32,13 @@ import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusAggregator; import org.keycloak.operator.update.UpdateLogic; import org.keycloak.operator.update.UpdateType; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.EnvVar; +import io.fabric8.kubernetes.api.model.apps.StatefulSet; +import io.javaoperatorsdk.operator.api.reconciler.Context; +import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; +import io.quarkus.logging.Log; + /** * Common {@link UpdateLogic} implementation that checks if the update logic needs to be run. *

diff --git a/operator/src/main/java/org/keycloak/operator/update/impl/ExplicitUpdateLogic.java b/operator/src/main/java/org/keycloak/operator/update/impl/ExplicitUpdateLogic.java index 453b83b72b7..a57ac6b006f 100644 --- a/operator/src/main/java/org/keycloak/operator/update/impl/ExplicitUpdateLogic.java +++ b/operator/src/main/java/org/keycloak/operator/update/impl/ExplicitUpdateLogic.java @@ -3,13 +3,14 @@ package org.keycloak.operator.update.impl; import java.util.Objects; import java.util.Optional; -import io.javaoperatorsdk.operator.api.reconciler.Context; -import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; import org.keycloak.operator.ContextUtils; import org.keycloak.operator.crds.v2alpha1.CRDUtils; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.spec.UpdateSpec; +import io.javaoperatorsdk.operator.api.reconciler.Context; +import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; + /** * Implements an explicit update logic. *

diff --git a/operator/src/main/java/org/keycloak/operator/update/impl/RecreateOnImageChangeUpdateLogic.java b/operator/src/main/java/org/keycloak/operator/update/impl/RecreateOnImageChangeUpdateLogic.java index b405daf70af..1c8b44b06fc 100644 --- a/operator/src/main/java/org/keycloak/operator/update/impl/RecreateOnImageChangeUpdateLogic.java +++ b/operator/src/main/java/org/keycloak/operator/update/impl/RecreateOnImageChangeUpdateLogic.java @@ -20,15 +20,16 @@ package org.keycloak.operator.update.impl; import java.util.Objects; import java.util.Optional; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.apps.StatefulSet; -import io.javaoperatorsdk.operator.api.reconciler.Context; -import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; import org.keycloak.operator.ContextUtils; import org.keycloak.operator.crds.v2alpha1.CRDUtils; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.update.UpdateType; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.apps.StatefulSet; +import io.javaoperatorsdk.operator.api.reconciler.Context; +import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; + /** * Implements Keycloak 26.0 logic. *

diff --git a/operator/src/test/java/org/keycloak/operator/controllers/KeycloakUpdateJobDependentResourceTest.java b/operator/src/test/java/org/keycloak/operator/controllers/KeycloakUpdateJobDependentResourceTest.java index 6fc9c811085..25243d942fb 100644 --- a/operator/src/test/java/org/keycloak/operator/controllers/KeycloakUpdateJobDependentResourceTest.java +++ b/operator/src/test/java/org/keycloak/operator/controllers/KeycloakUpdateJobDependentResourceTest.java @@ -17,13 +17,14 @@ package org.keycloak.operator.controllers; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - -import org.junit.jupiter.api.Test; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakBuilder; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + public class KeycloakUpdateJobDependentResourceTest { @Test diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/apiserver/CRDTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/apiserver/CRDTest.java index b685b62be1f..5526f8f789a 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/apiserver/CRDTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/apiserver/CRDTest.java @@ -17,26 +17,25 @@ package org.keycloak.operator.testsuite.apiserver; +import java.io.FileNotFoundException; + +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakBuilder; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusAggregator; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportBuilder; +import org.keycloak.operator.testsuite.integration.BaseOperatorTest; +import org.keycloak.operator.testsuite.utils.K8sUtils; +import org.keycloak.operator.update.UpdateStrategy; + +import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubeapitest.junit.EnableKubeAPIServer; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.dsl.Resource; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakBuilder; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusAggregator; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; - -import java.io.FileNotFoundException; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportBuilder; -import org.keycloak.operator.testsuite.integration.BaseOperatorTest; -import org.keycloak.operator.testsuite.utils.K8sUtils; -import org.keycloak.operator.update.UpdateStrategy; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/apiserver/DisabledIfApiServerTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/apiserver/DisabledIfApiServerTest.java index d362602f0ac..23d0fba4431 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/apiserver/DisabledIfApiServerTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/apiserver/DisabledIfApiServerTest.java @@ -1,13 +1,13 @@ package org.keycloak.operator.testsuite.apiserver; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - @Target({ TYPE, METHOD, ANNOTATION_TYPE }) @Retention(RUNTIME) public @interface DisabledIfApiServerTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java index 22912680931..920517e4850 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java @@ -17,6 +17,46 @@ package org.keycloak.operator.testsuite.integration; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.lang.reflect.Method; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.enterprise.util.TypeLiteral; + +import org.keycloak.operator.Constants; +import org.keycloak.operator.controllers.KeycloakController; +import org.keycloak.operator.controllers.KeycloakDeploymentDependentResource; +import org.keycloak.operator.controllers.KeycloakRealmImportController; +import org.keycloak.operator.controllers.KeycloakUpdateJobDependentResource; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakBuilder; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpecBuilder; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatus; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatus; +import org.keycloak.operator.testsuite.apiserver.ApiServerHelper; +import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; +import org.keycloak.operator.testsuite.utils.K8sUtils; + import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.MicroTime; @@ -47,7 +87,6 @@ import io.quarkiverse.operatorsdk.runtime.QuarkusConfigurationService; import io.quarkus.logging.Log; import io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback; import io.quarkus.test.junit.callback.QuarkusTestMethodContext; - import org.awaitility.Awaitility; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger.Level; @@ -56,51 +95,13 @@ import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInfo; -import org.keycloak.operator.Constants; -import org.keycloak.operator.controllers.KeycloakController; -import org.keycloak.operator.controllers.KeycloakDeploymentDependentResource; -import org.keycloak.operator.controllers.KeycloakRealmImportController; -import org.keycloak.operator.controllers.KeycloakUpdateJobDependentResource; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakBuilder; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpecBuilder; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatus; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatus; -import org.keycloak.operator.testsuite.apiserver.ApiServerHelper; -import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; -import org.keycloak.operator.testsuite.utils.K8sUtils; import org.opentest4j.TestAbortedException; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.lang.reflect.Method; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Optional; -import java.util.UUID; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import jakarta.enterprise.inject.Instance; -import jakarta.enterprise.inject.spi.CDI; -import jakarta.enterprise.util.TypeLiteral; +import static org.keycloak.operator.Utils.isOpenShift; +import static org.keycloak.operator.testsuite.utils.K8sUtils.getResourceFromFile; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.keycloak.operator.Utils.isOpenShift; -import static org.keycloak.operator.testsuite.utils.K8sUtils.getResourceFromFile; public class BaseOperatorTest implements QuarkusTestAfterEachCallback { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/CacheTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/CacheTest.java index 6a46fb99fda..a1eb320e871 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/CacheTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/CacheTest.java @@ -17,17 +17,10 @@ package org.keycloak.operator.testsuite.integration; -import io.fabric8.kubernetes.api.model.ConfigMapBuilder; -import io.fabric8.kubernetes.api.model.apps.StatefulSet; -import io.fabric8.kubernetes.client.dsl.Resource; -import io.fabric8.kubernetes.client.utils.Serialization; -import io.quarkus.logging.Log; -import io.quarkus.test.junit.QuarkusTest; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.TimeUnit; -import org.apache.commons.io.IOUtils; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition; import org.keycloak.operator.crds.v2alpha1.deployment.spec.CacheSpecBuilder; @@ -35,12 +28,20 @@ import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; import org.keycloak.operator.testsuite.utils.CRAssert; import org.keycloak.operator.testsuite.utils.K8sUtils; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.TimeUnit; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; +import io.fabric8.kubernetes.api.model.apps.StatefulSet; +import io.fabric8.kubernetes.client.dsl.Resource; +import io.fabric8.kubernetes.client.utils.Serialization; +import io.quarkus.logging.Log; +import io.quarkus.test.junit.QuarkusTest; +import org.apache.commons.io.IOUtils; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; import static org.assertj.core.api.Assertions.assertThat; -import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; @DisabledIfApiServerTest @QuarkusTest diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/ClusteringTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/ClusteringTest.java index 6475fb28b6d..b538a4f328e 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/ClusteringTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/ClusteringTest.java @@ -17,6 +17,21 @@ package org.keycloak.operator.testsuite.integration; +import java.time.Duration; +import java.util.Optional; +import java.util.function.Function; + +import org.keycloak.operator.Constants; +import org.keycloak.operator.controllers.KeycloakServiceDependentResource; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatusCondition; +import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; +import org.keycloak.operator.testsuite.utils.CRAssert; +import org.keycloak.operator.testsuite.utils.K8sUtils; + +import com.fasterxml.jackson.databind.JsonNode; import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Pod; @@ -29,30 +44,16 @@ import io.fabric8.kubernetes.client.utils.Serialization; import io.quarkus.logging.Log; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; - import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.keycloak.operator.Constants; -import org.keycloak.operator.controllers.KeycloakServiceDependentResource; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatusCondition; -import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; -import org.keycloak.operator.testsuite.utils.CRAssert; -import org.keycloak.operator.testsuite.utils.K8sUtils; - -import java.time.Duration; -import java.util.Optional; -import java.util.function.Function; - -import com.fasterxml.jackson.databind.JsonNode; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.assertj.core.api.Assertions.assertThat; + import static org.keycloak.operator.controllers.KeycloakDeploymentDependentResource.KC_TRACING_SERVICE_NAME; +import static org.assertj.core.api.Assertions.assertThat; + @DisabledIfApiServerTest @QuarkusTest public class ClusteringTest extends BaseOperatorTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java index 1df79932764..7e0c9c4c25f 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java @@ -17,27 +17,19 @@ package org.keycloak.operator.testsuite.integration; -import io.fabric8.kubernetes.api.model.EnvVarBuilder; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.LocalObjectReferenceBuilder; -import io.fabric8.kubernetes.api.model.Quantity; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.Secret; -import io.fabric8.kubernetes.api.model.SecretBuilder; -import io.fabric8.kubernetes.api.model.SecretKeySelectorBuilder; -import io.fabric8.kubernetes.api.model.apps.StatefulSet; -import io.fabric8.kubernetes.api.model.apps.StatefulSetBuilder; -import io.fabric8.kubernetes.api.model.apps.StatefulSetSpecBuilder; -import io.fabric8.kubernetes.client.dsl.Resource; -import io.quarkus.logging.Log; -import io.quarkus.test.junit.QuarkusTest; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.Base64; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicReference; + +import jakarta.inject.Inject; -import org.assertj.core.api.Condition; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.keycloak.operator.Config; import org.keycloak.operator.Constants; import org.keycloak.operator.controllers.KeycloakAdminSecretDependentResource; @@ -54,24 +46,30 @@ import org.keycloak.operator.testsuite.unit.WatchedResourcesTest; import org.keycloak.operator.testsuite.utils.CRAssert; import org.keycloak.operator.testsuite.utils.K8sUtils; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.Base64; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicReference; - -import jakarta.inject.Inject; +import io.fabric8.kubernetes.api.model.EnvVarBuilder; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.LocalObjectReferenceBuilder; +import io.fabric8.kubernetes.api.model.Quantity; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.api.model.Secret; +import io.fabric8.kubernetes.api.model.SecretBuilder; +import io.fabric8.kubernetes.api.model.SecretKeySelectorBuilder; +import io.fabric8.kubernetes.api.model.apps.StatefulSet; +import io.fabric8.kubernetes.api.model.apps.StatefulSetBuilder; +import io.fabric8.kubernetes.api.model.apps.StatefulSetSpecBuilder; +import io.fabric8.kubernetes.client.dsl.Resource; +import io.quarkus.logging.Log; +import io.quarkus.test.junit.QuarkusTest; +import org.assertj.core.api.Condition; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; + import static org.keycloak.operator.testsuite.utils.CRAssert.assertKeycloakStatusCondition; import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; import static org.keycloak.operator.testsuite.utils.K8sUtils.disableHttps; @@ -79,6 +77,10 @@ import static org.keycloak.operator.testsuite.utils.K8sUtils.enableHttp; import static org.keycloak.operator.testsuite.utils.K8sUtils.getResourceFromFile; import static org.keycloak.operator.testsuite.utils.K8sUtils.waitForKeycloakToBeReady; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + @DisabledIfApiServerTest @Tag(BaseOperatorTest.SLOW) @QuarkusTest diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java index 5ede0f4ee25..6a12f381169 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java @@ -17,16 +17,8 @@ package org.keycloak.operator.testsuite.integration; -import io.fabric8.kubernetes.api.model.networking.v1.Ingress; -import io.fabric8.kubernetes.api.model.networking.v1.IngressBuilder; -import io.fabric8.kubernetes.api.model.networking.v1.ServiceBackendPortBuilder; -import io.fabric8.kubernetes.client.dsl.Resource; -import io.quarkus.logging.Log; -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; +import java.util.Map; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Test; import org.keycloak.operator.Constants; import org.keycloak.operator.controllers.KeycloakController; import org.keycloak.operator.controllers.KeycloakIngressDependentResource; @@ -37,14 +29,24 @@ import org.keycloak.operator.crds.v2alpha1.deployment.spec.IngressSpecBuilder; import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; import org.keycloak.operator.testsuite.utils.K8sUtils; -import java.util.Map; +import io.fabric8.kubernetes.api.model.networking.v1.Ingress; +import io.fabric8.kubernetes.api.model.networking.v1.IngressBuilder; +import io.fabric8.kubernetes.api.model.networking.v1.ServiceBackendPortBuilder; +import io.fabric8.kubernetes.client.dsl.Resource; +import io.quarkus.logging.Log; +import io.quarkus.test.junit.QuarkusTest; +import io.restassured.RestAssured; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Test; import static java.util.concurrent.TimeUnit.MINUTES; + +import static org.keycloak.operator.testsuite.utils.K8sUtils.disableHttps; +import static org.keycloak.operator.testsuite.utils.K8sUtils.enableHttp; + import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.keycloak.operator.testsuite.utils.K8sUtils.disableHttps; -import static org.keycloak.operator.testsuite.utils.K8sUtils.enableHttp; @QuarkusTest public class KeycloakIngressTest extends BaseOperatorTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakKubernetesJwtTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakKubernetesJwtTest.java index fe6485df3c9..35e609a6a21 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakKubernetesJwtTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakKubernetesJwtTest.java @@ -17,6 +17,20 @@ package org.keycloak.operator.testsuite.integration; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +import org.keycloak.operator.controllers.KeycloakServiceDependentResource; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.FeatureSpec; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.UnsupportedSpec; +import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; +import org.keycloak.operator.testsuite.utils.TrustAllSSLContext; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.IdentityProviderRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; + import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.PodBuilder; @@ -29,29 +43,15 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import org.keycloak.jose.jws.JWSInput; -import org.keycloak.operator.controllers.KeycloakServiceDependentResource; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.FeatureSpec; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.UnsupportedSpec; -import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; -import org.keycloak.operator.testsuite.utils.TrustAllSSLContext; -import org.keycloak.representations.JsonWebToken; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.IdentityProviderRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - import static java.util.concurrent.TimeUnit.MINUTES; -import static org.assertj.core.api.Assertions.assertThat; + import static org.keycloak.operator.Constants.KEYCLOAK_HTTPS_PORT; import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; import static org.keycloak.operator.testsuite.utils.K8sUtils.inClusterCurl; import static org.keycloak.operator.testsuite.utils.K8sUtils.inClusterCurlCommand; +import static org.assertj.core.api.Assertions.assertThat; + @DisabledIfApiServerTest @Tag(BaseOperatorTest.SLOW) @QuarkusTest diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakNetworkPolicyTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakNetworkPolicyTest.java index 1db43f5f5b6..55d50210912 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakNetworkPolicyTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakNetworkPolicyTest.java @@ -20,14 +20,6 @@ package org.keycloak.operator.testsuite.integration; import java.util.List; import java.util.Map; -import io.fabric8.kubernetes.api.model.NamespaceBuilder; -import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy; -import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeer; -import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeerBuilder; -import io.quarkus.test.junit.QuarkusTest; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.operator.Constants; import org.keycloak.operator.Utils; import org.keycloak.operator.controllers.KeycloakController; @@ -39,6 +31,14 @@ import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; import org.keycloak.operator.testsuite.utils.CRAssert; import org.keycloak.operator.testsuite.utils.K8sUtils; +import io.fabric8.kubernetes.api.model.NamespaceBuilder; +import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy; +import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeer; +import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeerBuilder; +import io.quarkus.test.junit.QuarkusTest; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertNull; @Tag(BaseOperatorTest.SLOW) diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakServicesTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakServicesTest.java index 03b9ac93997..93f58fcfb43 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakServicesTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakServicesTest.java @@ -17,18 +17,18 @@ package org.keycloak.operator.testsuite.integration; -import io.fabric8.kubernetes.api.model.ServiceSpecBuilder; -import io.quarkus.logging.Log; -import io.quarkus.test.junit.QuarkusTest; +import java.time.Duration; +import java.util.Map; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Test; import org.keycloak.operator.controllers.KeycloakDiscoveryServiceDependentResource; import org.keycloak.operator.controllers.KeycloakServiceDependentResource; import org.keycloak.operator.testsuite.utils.K8sUtils; -import java.time.Duration; -import java.util.Map; +import io.fabric8.kubernetes.api.model.ServiceSpecBuilder; +import io.quarkus.logging.Log; +import io.quarkus.test.junit.QuarkusTest; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakTruststoresTests.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakTruststoresTests.java index c48de161b1a..9af3ed381fb 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakTruststoresTests.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakTruststoresTests.java @@ -17,23 +17,24 @@ package org.keycloak.operator.testsuite.integration; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.TruststoreBuilder; +import org.keycloak.operator.testsuite.unit.WatchedResourcesTest; +import org.keycloak.operator.testsuite.utils.K8sUtils; + import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.fabric8.kubernetes.client.dsl.Resource; import io.quarkus.test.junit.QuarkusTest; - import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.TruststoreBuilder; -import org.keycloak.operator.testsuite.unit.WatchedResourcesTest; -import org.keycloak.operator.testsuite.utils.K8sUtils; + +import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; +import static org.keycloak.operator.testsuite.utils.K8sUtils.getResourceFromFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; -import static org.keycloak.operator.testsuite.utils.K8sUtils.getResourceFromFile; @QuarkusTest public class KeycloakTruststoresTests extends BaseOperatorTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/PodTemplateTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/PodTemplateTest.java index 4d6517b4c36..586d65dad27 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/PodTemplateTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/PodTemplateTest.java @@ -17,6 +17,15 @@ package org.keycloak.operator.testsuite.integration; +import java.util.Collections; +import java.util.concurrent.TimeUnit; + +import org.keycloak.operator.Utils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; +import org.keycloak.operator.testsuite.utils.CRAssert; +import org.keycloak.operator.testsuite.utils.K8sUtils; + import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.LocalObjectReferenceBuilder; import io.fabric8.kubernetes.api.model.NamespaceBuilder; @@ -28,25 +37,18 @@ import io.fabric8.kubernetes.client.dsl.Resource; import io.fabric8.kubernetes.client.utils.Serialization; import io.quarkus.logging.Log; import io.quarkus.test.junit.QuarkusTest; - import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.keycloak.operator.Utils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; -import org.keycloak.operator.testsuite.utils.CRAssert; -import org.keycloak.operator.testsuite.utils.K8sUtils; - -import java.util.Collections; -import java.util.concurrent.TimeUnit; import static java.util.concurrent.TimeUnit.MINUTES; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; + import static org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition.HAS_ERRORS; import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; import static org.keycloak.operator.testsuite.utils.K8sUtils.getResourceFromFile; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; + @QuarkusTest public class PodTemplateTest extends BaseOperatorTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java index 84d1a996507..da25aebdeef 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java @@ -17,6 +17,22 @@ package org.keycloak.operator.testsuite.integration; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import jakarta.inject.Inject; + +import org.keycloak.operator.Config; +import org.keycloak.operator.controllers.KeycloakServiceDependentResource; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; +import org.keycloak.operator.crds.v2alpha1.realmimport.Placeholder; +import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; +import org.keycloak.operator.testsuite.utils.CRAssert; +import org.keycloak.operator.testsuite.utils.K8sUtils; + import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.LocalObjectReferenceBuilder; @@ -27,29 +43,15 @@ import io.fabric8.kubernetes.api.model.SecretKeySelectorBuilder; import io.quarkus.logging.Log; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.callback.QuarkusTestMethodContext; -import jakarta.inject.Inject; import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -import org.keycloak.operator.Config; -import org.keycloak.operator.controllers.KeycloakServiceDependentResource; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; -import org.keycloak.operator.crds.v2alpha1.realmimport.Placeholder; -import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; -import org.keycloak.operator.testsuite.utils.CRAssert; -import org.keycloak.operator.testsuite.utils.K8sUtils; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.assertj.core.api.Assertions.assertThat; + import static org.keycloak.operator.Constants.KEYCLOAK_HTTPS_PORT; import static org.keycloak.operator.controllers.KeycloakDistConfigurator.getKeycloakOptionEnvVarName; import static org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatusCondition.DONE; @@ -59,6 +61,8 @@ import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; import static org.keycloak.operator.testsuite.utils.K8sUtils.getResourceFromFile; import static org.keycloak.operator.testsuite.utils.K8sUtils.inClusterCurl; +import static org.assertj.core.api.Assertions.assertThat; + @DisabledIfApiServerTest @QuarkusTest public class RealmImportTest extends BaseOperatorTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/ServiceMonitorTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/ServiceMonitorTest.java index 11b348a8287..70d28ca6b5e 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/ServiceMonitorTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/ServiceMonitorTest.java @@ -1,13 +1,7 @@ package org.keycloak.operator.testsuite.integration; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.operator.controllers.KeycloakServiceMonitorDependentResource; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition; @@ -19,6 +13,12 @@ import org.keycloak.operator.testsuite.utils.K8sUtils; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.openshift.api.model.monitoring.v1.ServiceMonitor; import io.quarkus.test.junit.QuarkusTest; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; @Tag(BaseOperatorTest.SLOW) @QuarkusTest diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/ServiceMonitorUninstalledTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/ServiceMonitorUninstalledTest.java index b71fe71ba89..22bfebab643 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/ServiceMonitorUninstalledTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/ServiceMonitorUninstalledTest.java @@ -1,12 +1,7 @@ package org.keycloak.operator.testsuite.integration; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; import org.keycloak.operator.controllers.KeycloakServiceMonitorDependentResource; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition; @@ -15,6 +10,11 @@ import org.keycloak.operator.testsuite.utils.K8sUtils; import io.fabric8.openshift.api.model.monitoring.v1.ServiceMonitor; import io.quarkus.test.junit.QuarkusTest; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; @QuarkusTest public class ServiceMonitorUninstalledTest extends BaseOperatorTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/TracingDeploymentTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/TracingDeploymentTest.java index 39799e7686d..14ee077d0d3 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/TracingDeploymentTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/TracingDeploymentTest.java @@ -16,12 +16,11 @@ */ package org.keycloak.operator.testsuite.integration; -import io.fabric8.kubernetes.api.model.EnvVar; -import io.fabric8.kubernetes.api.model.SecretBuilder; -import io.fabric8.kubernetes.api.model.SecretKeySelectorBuilder; -import io.quarkus.test.junit.QuarkusTest; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Test; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + import org.keycloak.operator.Constants; import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; import org.keycloak.operator.crds.v2alpha1.deployment.spec.TracingSpec; @@ -29,17 +28,20 @@ import org.keycloak.operator.crds.v2alpha1.deployment.spec.TracingSpecBuilder; import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; import org.keycloak.operator.testsuite.utils.K8sUtils; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; +import io.fabric8.kubernetes.api.model.EnvVar; +import io.fabric8.kubernetes.api.model.SecretBuilder; +import io.fabric8.kubernetes.api.model.SecretKeySelectorBuilder; +import io.quarkus.test.junit.QuarkusTest; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.keycloak.operator.controllers.KeycloakDeploymentDependentResource.KC_TRACING_RESOURCE_ATTRIBUTES; import static org.keycloak.operator.controllers.KeycloakDeploymentDependentResource.KC_TRACING_SERVICE_NAME; import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; + @DisabledIfApiServerTest @QuarkusTest public class TracingDeploymentTest extends BaseOperatorTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/UpdateTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/UpdateTest.java index 5834e6ddc59..6e3f75ed2ac 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/UpdateTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/UpdateTest.java @@ -17,15 +17,6 @@ package org.keycloak.operator.testsuite.integration; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.operator.testsuite.utils.CRAssert.eventuallyRecreateUpdateStatus; -import static org.keycloak.operator.testsuite.utils.CRAssert.eventuallyRollingUpdateStatus; -import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; - import java.util.List; import java.util.Map; import java.util.Optional; @@ -34,14 +25,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import io.fabric8.kubernetes.api.model.Pod; -import io.fabric8.kubernetes.client.dsl.Gettable; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; import org.keycloak.operator.Utils; import org.keycloak.operator.controllers.KeycloakUpdateJobDependentResource; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; @@ -54,9 +37,27 @@ import org.keycloak.operator.update.UpdateStrategy; import org.keycloak.operator.update.impl.AutoUpdateLogic; import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.fabric8.kubernetes.api.model.batch.v1.JobStatus; +import io.fabric8.kubernetes.client.dsl.Gettable; import io.quarkus.test.junit.QuarkusTest; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +import static org.keycloak.operator.testsuite.utils.CRAssert.eventuallyRecreateUpdateStatus; +import static org.keycloak.operator.testsuite.utils.CRAssert.eventuallyRollingUpdateStatus; +import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag(BaseOperatorTest.SLOW) @QuarkusTest diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java index 0a817c440c8..abe69a45406 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java @@ -17,21 +17,6 @@ package org.keycloak.operator.testsuite.integration; -import io.fabric8.kubernetes.api.model.Secret; -import io.fabric8.kubernetes.api.model.SecretBuilder; -import io.fabric8.kubernetes.api.model.apps.StatefulSet; -import io.quarkus.logging.Log; -import io.quarkus.test.junit.QuarkusTest; - -import org.awaitility.Awaitility; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HostnameSpecBuilder; -import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; -import org.keycloak.operator.testsuite.unit.WatchedResourcesTest; - import java.util.Base64; import java.util.HashSet; import java.util.Set; @@ -40,9 +25,25 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HostnameSpecBuilder; +import org.keycloak.operator.testsuite.apiserver.DisabledIfApiServerTest; +import org.keycloak.operator.testsuite.unit.WatchedResourcesTest; + +import io.fabric8.kubernetes.api.model.Secret; +import io.fabric8.kubernetes.api.model.SecretBuilder; +import io.fabric8.kubernetes.api.model.apps.StatefulSet; +import io.quarkus.logging.Log; +import io.quarkus.test.junit.QuarkusTest; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; + import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak; /** * @author Vaclav Muzikar diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java index fd401a0b2c2..4a409a29496 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/CRSerializationTest.java @@ -23,12 +23,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.SecretKeySelector; -import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeer; -import io.fabric8.kubernetes.client.utils.Serialization; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Test; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; import org.keycloak.operator.crds.v2alpha1.deployment.spec.DatabaseSpec; @@ -42,6 +36,13 @@ import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport; import org.keycloak.operator.testsuite.utils.K8sUtils; import org.keycloak.operator.update.UpdateStrategy; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.api.model.SecretKeySelector; +import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeer; +import io.fabric8.kubernetes.client.utils.Serialization; +import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.hasEntry; diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/IngressLogicTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/IngressLogicTest.java index 0c5bb637bc2..2e8a2b1fb5c 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/IngressLogicTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/IngressLogicTest.java @@ -20,8 +20,6 @@ package org.keycloak.operator.testsuite.unit; import java.util.Map; import java.util.Optional; -import io.fabric8.kubernetes.api.model.networking.v1.Ingress; -import org.junit.jupiter.api.Test; import org.keycloak.operator.controllers.KeycloakIngressDependentResource; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.spec.IngressSpec; @@ -29,11 +27,15 @@ import org.keycloak.operator.crds.v2alpha1.deployment.spec.IngressSpecBuilder; import org.keycloak.operator.testsuite.utils.K8sUtils; import org.keycloak.operator.testsuite.utils.MockController; +import io.fabric8.kubernetes.api.model.networking.v1.Ingress; +import org.junit.jupiter.api.Test; + +import static org.keycloak.operator.testsuite.utils.K8sUtils.disableHttps; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.operator.testsuite.utils.K8sUtils.disableHttps; public class IngressLogicTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakControllerTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakControllerTest.java index 9c6b3c37c5b..b3160389d7e 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakControllerTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakControllerTest.java @@ -17,17 +17,17 @@ package org.keycloak.operator.testsuite.unit; +import org.keycloak.operator.controllers.KeycloakController; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.IngressSpecBuilder; +import org.keycloak.operator.testsuite.utils.K8sUtils; + import io.fabric8.kubernetes.client.dsl.Resource; import io.fabric8.openshift.api.model.config.v1.Ingress; import io.fabric8.openshift.api.model.config.v1.IngressBuilder; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; - import org.junit.jupiter.api.Test; -import org.keycloak.operator.controllers.KeycloakController; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.IngressSpecBuilder; -import org.keycloak.operator.testsuite.utils.K8sUtils; import org.mockito.Mockito; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java index b1394bd8726..2a696bfb339 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java @@ -17,10 +17,13 @@ package org.keycloak.operator.testsuite.unit; -import io.fabric8.kubernetes.api.model.EnvVar; -import io.quarkus.test.junit.QuarkusTest; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; -import org.junit.jupiter.api.Test; import org.keycloak.common.util.CollectionUtil; import org.keycloak.operator.Constants; import org.keycloak.operator.controllers.KeycloakDistConfigurator; @@ -31,19 +34,17 @@ import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition; import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; import org.keycloak.operator.testsuite.utils.K8sUtils; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; +import io.fabric8.kubernetes.api.model.EnvVar; +import io.quarkus.test.junit.QuarkusTest; +import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; import static org.keycloak.common.util.ObjectUtil.isBlank; import static org.keycloak.operator.controllers.KeycloakDistConfigurator.getKeycloakOptionEnvVarName; import static org.keycloak.operator.testsuite.utils.CRAssert.assertKeycloakStatusCondition; import static org.keycloak.operator.testsuite.utils.CRAssert.assertKeycloakStatusDoesNotContainMessage; +import static org.assertj.core.api.Assertions.assertThat; + @QuarkusTest public class KeycloakDistConfiguratorTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakStatusTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakStatusTest.java index d11763cdabb..266b29a430f 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakStatusTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakStatusTest.java @@ -17,15 +17,15 @@ package org.keycloak.operator.testsuite.unit; -import io.fabric8.kubernetes.client.utils.Serialization; - -import org.assertj.core.api.Condition; -import org.junit.jupiter.api.Test; import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatus; import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusAggregator; import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition; import org.keycloak.operator.testsuite.utils.CRAssert; +import io.fabric8.kubernetes.client.utils.Serialization; +import org.assertj.core.api.Condition; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/NetworkPolicyLogicTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/NetworkPolicyLogicTest.java index 02e83badfa4..7d5e1e3d065 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/NetworkPolicyLogicTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/NetworkPolicyLogicTest.java @@ -19,12 +19,6 @@ package org.keycloak.operator.testsuite.unit; import java.util.List; -import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy; -import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeer; -import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeerBuilder; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; import org.keycloak.operator.Constants; import org.keycloak.operator.controllers.KeycloakNetworkPolicyDependentResource; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; @@ -34,6 +28,13 @@ import org.keycloak.operator.testsuite.utils.CRAssert; import org.keycloak.operator.testsuite.utils.K8sUtils; import org.keycloak.operator.testsuite.utils.MockController; +import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy; +import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeer; +import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeerBuilder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/PodTemplateTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/PodTemplateTest.java index 7e35a9b21b7..5594e958138 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/PodTemplateTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/PodTemplateTest.java @@ -17,6 +17,37 @@ package org.keycloak.operator.testsuite.unit; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; + +import jakarta.inject.Inject; + +import org.keycloak.operator.Config; +import org.keycloak.operator.Constants; +import org.keycloak.operator.ContextUtils; +import org.keycloak.operator.Utils; +import org.keycloak.operator.controllers.KeycloakDeploymentDependentResource; +import org.keycloak.operator.controllers.KeycloakDistConfigurator; +import org.keycloak.operator.controllers.KeycloakRealmImportJobDependentResource; +import org.keycloak.operator.controllers.KeycloakUpdateJobDependentResource; +import org.keycloak.operator.controllers.WatchedResources; +import org.keycloak.operator.controllers.WatchedResources.Watched; +import org.keycloak.operator.crds.v2alpha1.CRDUtils; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakBuilder; +import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpecBuilder; +import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HostnameSpecBuilder; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpSpecBuilder; +import org.keycloak.operator.crds.v2alpha1.deployment.spec.UnsupportedSpec; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportBuilder; +import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportSpecBuilder; +import org.keycloak.representations.idm.RealmRepresentation; + import io.fabric8.kubernetes.api.model.Affinity; import io.fabric8.kubernetes.api.model.AffinityBuilder; import io.fabric8.kubernetes.api.model.ConfigMap; @@ -44,50 +75,22 @@ import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedWorkflowAndDependentResourceContext; import io.quarkus.test.InjectMock; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.keycloak.operator.Config; -import org.keycloak.operator.Constants; -import org.keycloak.operator.ContextUtils; -import org.keycloak.operator.Utils; -import org.keycloak.operator.controllers.KeycloakDeploymentDependentResource; -import org.keycloak.operator.controllers.KeycloakDistConfigurator; -import org.keycloak.operator.controllers.KeycloakRealmImportJobDependentResource; -import org.keycloak.operator.controllers.KeycloakUpdateJobDependentResource; -import org.keycloak.operator.controllers.WatchedResources; -import org.keycloak.operator.controllers.WatchedResources.Watched; -import org.keycloak.operator.crds.v2alpha1.CRDUtils; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakBuilder; -import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakSpecBuilder; -import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HostnameSpecBuilder; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.HttpSpecBuilder; -import org.keycloak.operator.crds.v2alpha1.deployment.spec.UnsupportedSpec; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportBuilder; -import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportSpecBuilder; -import org.keycloak.representations.idm.RealmRepresentation; import org.mockito.Mockito; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.stream.Collectors; +import static org.keycloak.operator.ContextUtils.DIST_CONFIGURATOR_KEY; +import static org.keycloak.operator.ContextUtils.NEW_DEPLOYMENT_KEY; +import static org.keycloak.operator.ContextUtils.OLD_DEPLOYMENT_KEY; +import static org.keycloak.operator.ContextUtils.OPERATOR_CONFIG_KEY; +import static org.keycloak.operator.ContextUtils.WATCHED_RESOURCES_KEY; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.operator.ContextUtils.DIST_CONFIGURATOR_KEY; -import static org.keycloak.operator.ContextUtils.NEW_DEPLOYMENT_KEY; -import static org.keycloak.operator.ContextUtils.OLD_DEPLOYMENT_KEY; -import static org.keycloak.operator.ContextUtils.OPERATOR_CONFIG_KEY; -import static org.keycloak.operator.ContextUtils.WATCHED_RESOURCES_KEY; @QuarkusTest public class PodTemplateTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/WatchedResourcesTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/WatchedResourcesTest.java index e43597f915d..7352def4c43 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/WatchedResourcesTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/WatchedResourcesTest.java @@ -17,13 +17,12 @@ package org.keycloak.operator.testsuite.unit; -import static org.junit.jupiter.api.Assertions.assertEquals; - import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.jupiter.api.Test; +import jakarta.inject.Inject; + import org.keycloak.operator.Utils; import org.keycloak.operator.controllers.WatchedResources; @@ -31,7 +30,9 @@ import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest public class WatchedResourcesTest { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/utils/CRAssert.java b/operator/src/test/java/org/keycloak/operator/testsuite/utils/CRAssert.java index b50e76e3762..b198d89be47 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/utils/CRAssert.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/utils/CRAssert.java @@ -17,11 +17,6 @@ package org.keycloak.operator.testsuite.utils; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.time.Duration; import java.util.List; import java.util.Map; @@ -35,9 +30,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.assertj.core.api.ObjectAssert; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Assertions; import org.keycloak.operator.Constants; import org.keycloak.operator.Utils; import org.keycloak.operator.controllers.KeycloakController; @@ -62,6 +54,14 @@ import io.fabric8.kubernetes.client.informers.ResourceEventHandler; import io.fabric8.kubernetes.client.utils.Serialization; import io.netty.util.NetUtil; import io.quarkus.logging.Log; +import org.assertj.core.api.ObjectAssert; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Assertions; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Vaclav Muzikar diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/utils/K8sUtils.java b/operator/src/test/java/org/keycloak/operator/testsuite/utils/K8sUtils.java index 42eca1d5dee..3e301af1288 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/utils/K8sUtils.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/utils/K8sUtils.java @@ -32,7 +32,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.awaitility.Awaitility; import org.keycloak.operator.Constants; import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition; @@ -48,6 +47,7 @@ import io.fabric8.kubernetes.client.dsl.ExecWatch; import io.fabric8.kubernetes.client.dsl.Resource; import io.fabric8.kubernetes.client.utils.Serialization; import io.quarkus.logging.Log; +import org.awaitility.Awaitility; /** * @author Vaclav Muzikar diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/utils/MockController.java b/operator/src/test/java/org/keycloak/operator/testsuite/utils/MockController.java index 9956f671300..434b0722da4 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/utils/MockController.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/utils/MockController.java @@ -19,9 +19,10 @@ package org.keycloak.operator.testsuite.utils; import java.util.Optional; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; + import io.fabric8.kubernetes.api.model.HasMetadata; import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource; -import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; public abstract class MockController> { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/utils/TrustAllSSLContext.java b/operator/src/test/java/org/keycloak/operator/testsuite/utils/TrustAllSSLContext.java index e289c661201..4861d05f1e6 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/utils/TrustAllSSLContext.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/utils/TrustAllSSLContext.java @@ -17,13 +17,13 @@ package org.keycloak.operator.testsuite.utils; +import java.security.KeyManagementException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.security.cert.X509Certificate; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import java.security.cert.X509Certificate; -import java.security.SecureRandom; -import java.security.KeyManagementException; -import java.security.NoSuchAlgorithmException; /** * Helper class to provide an SSLContext that trusts all server certificates.