diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java index 8994c6a10b925..37789fe8a9c20 100644 --- a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java +++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java @@ -72,7 +72,7 @@ import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem; import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem; import io.quarkus.deployment.pkg.steps.NativeBuild; -import io.quarkus.kubernetes.client.deployment.KubernetesClientErrorHandler; +import io.quarkus.kubernetes.client.deployment.internal.KubernetesClientErrorHandler; import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem; import io.quarkus.kubernetes.spi.DecoratorBuildItem; import io.quarkus.kubernetes.spi.DeployStrategy; diff --git a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/internal/KubernetesClientBuildStep.java similarity index 67% rename from extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java rename to extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/internal/KubernetesClientBuildStep.java index 79a813c2a260a..0f42d8b37aff5 100644 --- a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java +++ b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/internal/KubernetesClientBuildStep.java @@ -1,11 +1,11 @@ -package io.quarkus.kubernetes.client.deployment; +package io.quarkus.kubernetes.client.deployment.internal; -import static io.quarkus.kubernetes.client.runtime.KubernetesClientUtils.createConfig; +import static io.quarkus.kubernetes.client.runtime.internal.KubernetesClientUtils.createConfig; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.QuarkusBuildCloseablesBuildItem; -import io.quarkus.kubernetes.client.runtime.KubernetesClientBuildConfig; -import io.quarkus.kubernetes.client.runtime.QuarkusHttpClientFactory; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesClientBuildConfig; +import io.quarkus.kubernetes.client.runtime.internal.QuarkusHttpClientFactory; import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem; public class KubernetesClientBuildStep { diff --git a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/internal/KubernetesClientErrorHandler.java similarity index 93% rename from extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java rename to extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/internal/KubernetesClientErrorHandler.java index 58f3eff0b634e..7800654fa1ba0 100644 --- a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java +++ b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/internal/KubernetesClientErrorHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.kubernetes.client.deployment; +package io.quarkus.kubernetes.client.deployment.internal; import javax.net.ssl.SSLHandshakeException; diff --git a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java index 0cc0842b91ebf..397c8aa44dbd8 100644 --- a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java +++ b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java @@ -59,9 +59,9 @@ import io.quarkus.devservices.common.ContainerAddress; import io.quarkus.devservices.common.ContainerLocator; import io.quarkus.devservices.common.ContainerShutdownCloseable; -import io.quarkus.kubernetes.client.runtime.KubernetesClientBuildConfig; -import io.quarkus.kubernetes.client.runtime.KubernetesDevServicesBuildTimeConfig; -import io.quarkus.kubernetes.client.runtime.KubernetesDevServicesBuildTimeConfig.Flavor; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesClientBuildConfig; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesDevServicesBuildTimeConfig; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesDevServicesBuildTimeConfig.Flavor; import io.quarkus.runtime.configuration.ConfigUtils; @BuildSteps(onlyIfNot = IsNormal.class, onlyIf = { DevServicesConfig.Enabled.class, NoQuarkusTestKubernetesClient.class }) diff --git a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java index d229adf2986c9..91fbeec567369 100644 --- a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java +++ b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java @@ -49,11 +49,11 @@ import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; import io.quarkus.deployment.util.JandexUtil; import io.quarkus.jackson.deployment.IgnoreJsonDeserializeClassBuildItem; -import io.quarkus.kubernetes.client.runtime.KubernetesClientBuildConfig; import io.quarkus.kubernetes.client.runtime.KubernetesClientObjectMapperProducer; import io.quarkus.kubernetes.client.runtime.KubernetesClientProducer; import io.quarkus.kubernetes.client.runtime.KubernetesConfigProducer; import io.quarkus.kubernetes.client.runtime.KubernetesSerializationProducer; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesClientBuildConfig; import io.quarkus.kubernetes.client.spi.KubernetesClientCapabilityBuildItem; import io.quarkus.maven.dependency.ArtifactKey; diff --git a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesResourceBuildStep.java b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesResourceBuildStep.java index da13f1ea08b23..fb6b651c2cc8b 100644 --- a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesResourceBuildStep.java +++ b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesResourceBuildStep.java @@ -20,7 +20,7 @@ import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; import io.quarkus.kubernetes.client.KubernetesResources; -import io.quarkus.kubernetes.client.runtime.KubernetesSerializationRecorder; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesSerializationRecorder; import io.quarkus.kubernetes.client.spi.KubernetesResourcesBuildItem; public class KubernetesResourceBuildStep { diff --git a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesClientBuildConfig.java similarity index 98% rename from extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java rename to extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesClientBuildConfig.java index e562bdb748259..6801a17b13bcb 100644 --- a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java +++ b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesClientBuildConfig.java @@ -1,4 +1,4 @@ -package io.quarkus.kubernetes.client.runtime; +package io.quarkus.kubernetes.client.runtime.internal; import java.time.Duration; import java.util.List; diff --git a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesClientUtils.java similarity index 99% rename from extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java rename to extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesClientUtils.java index 534b3796300b4..bd034c36a5e08 100644 --- a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java +++ b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesClientUtils.java @@ -1,4 +1,4 @@ -package io.quarkus.kubernetes.client.runtime; +package io.quarkus.kubernetes.client.runtime.internal; import java.time.Duration; import java.util.Optional; diff --git a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesDevServicesBuildTimeConfig.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesDevServicesBuildTimeConfig.java similarity index 98% rename from extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesDevServicesBuildTimeConfig.java rename to extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesDevServicesBuildTimeConfig.java index 1c5dd077006dc..2aa553a260bb0 100644 --- a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesDevServicesBuildTimeConfig.java +++ b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesDevServicesBuildTimeConfig.java @@ -1,4 +1,4 @@ -package io.quarkus.kubernetes.client.runtime; +package io.quarkus.kubernetes.client.runtime.internal; import java.util.Map; import java.util.Optional; diff --git a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesSerializationRecorder.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesSerializationRecorder.java similarity index 93% rename from extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesSerializationRecorder.java rename to extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesSerializationRecorder.java index 8b8a37b7c3330..08cd183f44ef0 100644 --- a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesSerializationRecorder.java +++ b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/KubernetesSerializationRecorder.java @@ -1,4 +1,4 @@ -package io.quarkus.kubernetes.client.runtime; +package io.quarkus.kubernetes.client.runtime.internal; import java.util.HashSet; import java.util.Set; diff --git a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/QuarkusHttpClientFactory.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/QuarkusHttpClientFactory.java similarity index 97% rename from extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/QuarkusHttpClientFactory.java rename to extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/QuarkusHttpClientFactory.java index ab8d71db34a07..d272020f25b67 100644 --- a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/QuarkusHttpClientFactory.java +++ b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/internal/QuarkusHttpClientFactory.java @@ -1,4 +1,4 @@ -package io.quarkus.kubernetes.client.runtime; +package io.quarkus.kubernetes.client.runtime.internal; import static io.vertx.core.spi.resolver.ResolverProvider.DISABLE_DNS_RESOLVER_PROP_NAME; diff --git a/extensions/kubernetes-client/runtime-internal/src/main/resources/META-INF/services/io.fabric8.kubernetes.client.http.HttpClient$Factory b/extensions/kubernetes-client/runtime-internal/src/main/resources/META-INF/services/io.fabric8.kubernetes.client.http.HttpClient$Factory index 9ea453154b742..d488770fc0bd3 100644 --- a/extensions/kubernetes-client/runtime-internal/src/main/resources/META-INF/services/io.fabric8.kubernetes.client.http.HttpClient$Factory +++ b/extensions/kubernetes-client/runtime-internal/src/main/resources/META-INF/services/io.fabric8.kubernetes.client.http.HttpClient$Factory @@ -1 +1 @@ -io.quarkus.kubernetes.client.runtime.QuarkusHttpClientFactory \ No newline at end of file +io.quarkus.kubernetes.client.runtime.internal.QuarkusHttpClientFactory diff --git a/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/KubernetesConfigCustomizer.java b/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/KubernetesConfigCustomizer.java index 8cb855c59c0c7..c03a474491eef 100644 --- a/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/KubernetesConfigCustomizer.java +++ b/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/KubernetesConfigCustomizer.java @@ -5,9 +5,9 @@ import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.utils.KubernetesSerialization; -import io.quarkus.kubernetes.client.runtime.KubernetesClientBuildConfig; import io.quarkus.kubernetes.client.runtime.KubernetesClientProducer; import io.quarkus.kubernetes.client.runtime.KubernetesConfigProducer; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesClientBuildConfig; /** * Meant to be implemented by a CDI bean that provided arbitrary customization for the default {@link Config} created by diff --git a/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigProducer.java b/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigProducer.java index a6ecc2c6b73e0..0869047881d93 100644 --- a/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigProducer.java +++ b/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigProducer.java @@ -9,6 +9,8 @@ import io.quarkus.arc.All; import io.quarkus.arc.DefaultBean; import io.quarkus.kubernetes.client.KubernetesConfigCustomizer; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesClientBuildConfig; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesClientUtils; @Singleton public class KubernetesConfigProducer { diff --git a/extensions/kubernetes-client/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtilsTest.java b/extensions/kubernetes-client/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtilsTest.java index b1f709a44901a..b766b60134caa 100644 --- a/extensions/kubernetes-client/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtilsTest.java +++ b/extensions/kubernetes-client/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtilsTest.java @@ -10,6 +10,7 @@ import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesClientUtils; class KubernetesClientUtilsTest { diff --git a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/config/runtime/KubernetesConfigSourceFactoryBuilder.java b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/config/runtime/KubernetesConfigSourceFactoryBuilder.java index ceceb155e7e3e..b3b0f1bd9592b 100644 --- a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/config/runtime/KubernetesConfigSourceFactoryBuilder.java +++ b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/config/runtime/KubernetesConfigSourceFactoryBuilder.java @@ -5,8 +5,8 @@ import org.eclipse.microprofile.config.spi.ConfigSource; import io.fabric8.kubernetes.client.KubernetesClient; -import io.quarkus.kubernetes.client.runtime.KubernetesClientBuildConfig; -import io.quarkus.kubernetes.client.runtime.KubernetesClientUtils; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesClientBuildConfig; +import io.quarkus.kubernetes.client.runtime.internal.KubernetesClientUtils; import io.quarkus.runtime.ApplicationLifecycleManager; import io.quarkus.runtime.configuration.ConfigBuilder; import io.smallrye.config.ConfigSourceContext; diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java index 9b6713bece712..339b486e64118 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java @@ -55,7 +55,7 @@ import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem; import io.quarkus.deployment.pkg.builditem.DeploymentResultBuildItem; import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem; -import io.quarkus.kubernetes.client.deployment.KubernetesClientErrorHandler; +import io.quarkus.kubernetes.client.deployment.internal.KubernetesClientErrorHandler; import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem; import io.quarkus.kubernetes.spi.DeployStrategy; import io.quarkus.kubernetes.spi.GeneratedKubernetesResourceBuildItem;