Merge pull request quarkusio#44766 from geoand/quarkusio#44730

Move kubernetes-client-internal code to proper packages
geoand · Nov 27, 2024 · d99e142 · d99e142
2 parents 00d7dbc + 6316ec2
commit d99e142
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 21 deletions.
diff --git a/...ent/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java b/...ent/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/...deployment/KubernetesClientBuildStep.java → ...t/internal/KubernetesClientBuildStep.java b/...deployment/KubernetesClientBuildStep.java → ...t/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/...loyment/KubernetesClientErrorHandler.java → ...nternal/KubernetesClientErrorHandler.java b/...loyment/KubernetesClientErrorHandler.java → ...nternal/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/...src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java b/...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/...ment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java b/...ment/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/...nt/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesResourceBuildStep.java b/...nt/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/.../runtime/KubernetesClientBuildConfig.java → ...internal/KubernetesClientBuildConfig.java b/.../runtime/KubernetesClientBuildConfig.java → ...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/...client/runtime/KubernetesClientUtils.java → ...ntime/internal/KubernetesClientUtils.java b/...client/runtime/KubernetesClientUtils.java → ...ntime/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/...KubernetesDevServicesBuildTimeConfig.java → ...KubernetesDevServicesBuildTimeConfig.java b/...KubernetesDevServicesBuildTimeConfig.java → ...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/...time/KubernetesSerializationRecorder.java → ...rnal/KubernetesSerializationRecorder.java b/...time/KubernetesSerializationRecorder.java → ...rnal/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/...ent/runtime/QuarkusHttpClientFactory.java → ...me/internal/QuarkusHttpClientFactory.java b/...ent/runtime/QuarkusHttpClientFactory.java → ...me/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/...src/main/resources/META-INF/services/io.fabric8.kubernetes.client.http.HttpClient$Factory b/...src/main/resources/META-INF/services/io.fabric8.kubernetes.client.http.HttpClient$Factory
@@ -1 +1 @@
-io.quarkus.kubernetes.client.runtime.QuarkusHttpClientFactory
+io.quarkus.kubernetes.client.runtime.internal.QuarkusHttpClientFactory
diff --git a/...client/runtime/src/main/java/io/quarkus/kubernetes/client/KubernetesConfigCustomizer.java b/...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/.../runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigProducer.java b/.../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/...runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtilsTest.java b/...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/.../main/java/io/quarkus/kubernetes/config/runtime/KubernetesConfigSourceFactoryBuilder.java b/.../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/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java b/...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;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		io.quarkus.kubernetes.client.runtime.QuarkusHttpClientFactory
		io.quarkus.kubernetes.client.runtime.internal.QuarkusHttpClientFactory