From 3f0769ed6fdd278a15581186d0638cc6fb254378 Mon Sep 17 00:00:00 2001 From: Steve Hawkins Date: Fri, 11 Feb 2022 08:31:38 -0500 Subject: [PATCH] fix #3853 addressing informers and utils --- .../kubernetes/client/BaseKubernetesClient.java | 2 +- .../kubernetes/client/URLFromClusterIPImpl.java | 2 +- .../fabric8/kubernetes/client/URLFromEnvVarsImpl.java | 2 +- .../fabric8/kubernetes/client/URLFromIngressImpl.java | 2 +- .../kubernetes/client/URLFromNodePortImpl.java | 2 +- .../client/dsl/internal/AbstractWatchManager.java | 2 +- .../kubernetes/client/dsl/internal/BaseOperation.java | 2 ++ ...erverGetWatchDeleteRecreateWaitApplicableImpl.java | 2 +- .../client/dsl/internal/OperationSupport.java | 2 +- .../internal/apps/v1/ReplicaSetOperationsImpl.java | 2 +- .../internal/apps/v1/StatefulSetOperationsImpl.java | 2 +- .../dsl/internal/batch/v1/JobOperationsImpl.java | 2 +- .../dsl/internal/core/v1/PodOperationsImpl.java | 8 ++++---- .../core/v1/ReplicationControllerOperationsImpl.java | 2 +- .../extensions/v1beta1/ReplicaSetOperationsImpl.java | 2 +- .../client/dsl/internal/uploadable/PodUpload.java | 2 +- .../informers/impl/DefaultSharedIndexInformer.java | 11 +++++------ .../client/informers/{ => impl}/ResyncRunnable.java | 4 ++-- .../{ => impl}/SharedInformerFactoryImpl.java | 6 ++++-- .../client/informers/{ => impl}/cache/CacheImpl.java | 3 ++- .../informers/{ => impl}/cache/ProcessorListener.java | 2 +- .../informers/{ => impl}/cache/ProcessorStore.java | 3 ++- .../client/informers/{ => impl}/cache/Reflector.java | 2 +- .../informers/{ => impl}/cache/SharedProcessor.java | 2 +- .../informers/{ => impl}/cache/SyncableStore.java | 4 +++- .../client/utils/{ => internal}/Base64.java | 2 +- .../utils/{ => internal}/CreateOrReplaceHelper.java | 4 +++- .../utils/{ => internal}/DeleteAndCreateHelper.java | 2 +- .../ExponentialBackoffIntervalCalculator.java | 2 +- .../utils/internal}/OptionalDependencyWrapper.java | 2 +- .../client/utils/{ => internal}/PodOperationUtil.java | 5 +++-- .../client/utils/{ => internal}/SerialExecutor.java | 2 +- .../client/utils/internal}/URLFromServiceUtil.java | 3 ++- .../client/utils/{ => internal}/WatcherToggle.java | 2 +- .../client/dsl/internal/uploadable/PodUploadTest.java | 1 - .../client/informers/SharedInformerFactoryTest.java | 1 + .../client/informers/{ => impl}/cache/CacheTest.java | 4 ++-- .../client/informers/{ => impl}/cache/ListerTest.java | 3 ++- .../{ => impl}/cache/ProcessorListenerTest.java | 2 +- .../{ => impl}/cache/ProcessorStoreTest.java | 10 +++++----- .../informers/{ => impl}/cache/ReflectorTest.java | 2 +- .../{ => impl}/cache/SharedProcessorTest.java | 2 +- .../client/utils/CreateOrReplaceHelperTest.java | 1 + .../client/utils/DeleteAndCreateHelperTest.java | 1 + .../client/utils/OptionalDependencyWrapperTest.java | 2 +- .../kubernetes/client/utils/PodOperationUtilTest.java | 1 + .../openshift/client/URLFromOpenshiftRouteImpl.java | 2 +- .../internal/apps/DeploymentConfigOperationsImpl.java | 2 +- .../dsl/internal/build/BuildOperationsImpl.java | 2 +- 49 files changed, 75 insertions(+), 60 deletions(-) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/{ => impl}/ResyncRunnable.java (92%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/{ => impl}/SharedInformerFactoryImpl.java (98%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/CacheImpl.java (99%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/ProcessorListener.java (98%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/ProcessorStore.java (96%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/Reflector.java (99%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/SharedProcessor.java (98%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/SyncableStore.java (91%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/{ => internal}/Base64.java (99%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/{ => internal}/CreateOrReplaceHelper.java (93%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/{ => internal}/DeleteAndCreateHelper.java (98%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/{ => internal}/ExponentialBackoffIntervalCalculator.java (95%) rename {kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils => kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal}/OptionalDependencyWrapper.java (96%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/{ => internal}/PodOperationUtil.java (94%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/{ => internal}/SerialExecutor.java (96%) rename {kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils => kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal}/URLFromServiceUtil.java (98%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/{ => internal}/WatcherToggle.java (96%) rename kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/CacheTest.java (97%) rename kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/ListerTest.java (94%) rename kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/ProcessorListenerTest.java (97%) rename kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/ProcessorStoreTest.java (91%) rename kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/ReflectorTest.java (98%) rename kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/{ => impl}/cache/SharedProcessorTest.java (98%) diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BaseKubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BaseKubernetesClient.java index a7ec02fab4d..9c56c1703d8 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BaseKubernetesClient.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BaseKubernetesClient.java @@ -113,7 +113,7 @@ import io.fabric8.kubernetes.client.extended.run.RunOperations; import io.fabric8.kubernetes.client.http.HttpClient; import io.fabric8.kubernetes.client.informers.SharedInformerFactory; -import io.fabric8.kubernetes.client.informers.SharedInformerFactoryImpl; +import io.fabric8.kubernetes.client.informers.impl.SharedInformerFactoryImpl; import io.fabric8.kubernetes.client.utils.Serialization; import java.io.InputStream; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromClusterIPImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromClusterIPImpl.java index d334634004c..689c69ad321 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromClusterIPImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromClusterIPImpl.java @@ -17,7 +17,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.ServicePort; -import io.fabric8.kubernetes.client.utils.URLFromServiceUtil; +import io.fabric8.kubernetes.client.utils.internal.URLFromServiceUtil; public class URLFromClusterIPImpl implements ServiceToURLProvider { @Override diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromEnvVarsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromEnvVarsImpl.java index f1c83331e73..cc37bd9617e 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromEnvVarsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromEnvVarsImpl.java @@ -17,7 +17,7 @@ package io.fabric8.kubernetes.client; import io.fabric8.kubernetes.api.model.Service; -import io.fabric8.kubernetes.client.utils.URLFromServiceUtil; +import io.fabric8.kubernetes.client.utils.internal.URLFromServiceUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromIngressImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromIngressImpl.java index 79da7f4d001..04dba46507a 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromIngressImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromIngressImpl.java @@ -19,7 +19,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.ServicePort; import io.fabric8.kubernetes.api.model.extensions.*; -import io.fabric8.kubernetes.client.utils.URLFromServiceUtil; +import io.fabric8.kubernetes.client.utils.internal.URLFromServiceUtil; public class URLFromIngressImpl implements ServiceToURLProvider { diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromNodePortImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromNodePortImpl.java index b01788aa96a..9f2e4824cf1 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromNodePortImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/URLFromNodePortImpl.java @@ -17,7 +17,7 @@ package io.fabric8.kubernetes.client; import io.fabric8.kubernetes.api.model.*; -import io.fabric8.kubernetes.client.utils.URLFromServiceUtil; +import io.fabric8.kubernetes.client.utils.internal.URLFromServiceUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/AbstractWatchManager.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/AbstractWatchManager.java index 9d979374978..897e6896439 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/AbstractWatchManager.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/AbstractWatchManager.java @@ -27,9 +27,9 @@ import io.fabric8.kubernetes.client.Watcher.Action; import io.fabric8.kubernetes.client.WatcherException; import io.fabric8.kubernetes.client.http.HttpClient; -import io.fabric8.kubernetes.client.utils.ExponentialBackoffIntervalCalculator; import io.fabric8.kubernetes.client.utils.Serialization; import io.fabric8.kubernetes.client.utils.Utils; +import io.fabric8.kubernetes.client.utils.internal.ExponentialBackoffIntervalCalculator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseOperation.java index 775d65e2fde..2ac2f90f7f5 100755 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseOperation.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseOperation.java @@ -56,6 +56,8 @@ import io.fabric8.kubernetes.client.utils.URLUtils; import io.fabric8.kubernetes.client.utils.URLUtils.URLBuilder; import io.fabric8.kubernetes.client.utils.Utils; +import io.fabric8.kubernetes.client.utils.internal.CreateOrReplaceHelper; +import io.fabric8.kubernetes.client.utils.internal.WatcherToggle; import java.io.File; import java.io.FileInputStream; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl.java index 5b829bf7fcf..7b7dcb4f3e5 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl.java @@ -50,7 +50,7 @@ import java.util.function.Predicate; import java.util.function.UnaryOperator; -import static io.fabric8.kubernetes.client.utils.DeleteAndCreateHelper.deleteAndCreateItem; +import static io.fabric8.kubernetes.client.utils.internal.DeleteAndCreateHelper.deleteAndCreateItem; /** * Resource like operation with specific namespace rules. diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/OperationSupport.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/OperationSupport.java index 843c245f640..6b2e9ac5b45 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/OperationSupport.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/OperationSupport.java @@ -34,11 +34,11 @@ import io.fabric8.kubernetes.client.http.HttpRequest; import io.fabric8.kubernetes.client.http.HttpResponse; import io.fabric8.kubernetes.client.internal.VersionUsageUtils; -import io.fabric8.kubernetes.client.utils.ExponentialBackoffIntervalCalculator; import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil; import io.fabric8.kubernetes.client.utils.Serialization; import io.fabric8.kubernetes.client.utils.URLUtils; import io.fabric8.kubernetes.client.utils.Utils; +import io.fabric8.kubernetes.client.utils.internal.ExponentialBackoffIntervalCalculator; import io.fabric8.zjsonpatch.JsonDiff; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetOperationsImpl.java index c04a87c5491..b951d21d48b 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetOperationsImpl.java @@ -30,7 +30,7 @@ import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl; import io.fabric8.kubernetes.client.dsl.internal.OperationContext; import io.fabric8.kubernetes.client.dsl.internal.RollingOperationContext; -import io.fabric8.kubernetes.client.utils.PodOperationUtil; +import io.fabric8.kubernetes.client.utils.internal.PodOperationUtil; import java.io.OutputStream; import java.io.Reader; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetOperationsImpl.java index a4f9cf45306..fb917144439 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetOperationsImpl.java @@ -34,7 +34,7 @@ import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl; import io.fabric8.kubernetes.client.dsl.internal.OperationContext; import io.fabric8.kubernetes.client.dsl.internal.RollingOperationContext; -import io.fabric8.kubernetes.client.utils.PodOperationUtil; +import io.fabric8.kubernetes.client.utils.internal.PodOperationUtil; import java.io.IOException; import java.io.OutputStream; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java index aa65a3558c4..a5924a6a924 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java @@ -29,7 +29,7 @@ import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl; import io.fabric8.kubernetes.client.dsl.internal.OperationContext; import io.fabric8.kubernetes.client.dsl.internal.PodControllerOperationContext; -import io.fabric8.kubernetes.client.utils.PodOperationUtil; +import io.fabric8.kubernetes.client.utils.internal.PodOperationUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java index 10086521b80..1e0df0facef 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java @@ -35,6 +35,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; +import static io.fabric8.kubernetes.client.utils.internal.OptionalDependencyWrapper.wrapRunWithOptionalDependency; + import io.fabric8.kubernetes.api.model.DeleteOptions; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Pod; @@ -68,8 +70,6 @@ import io.fabric8.kubernetes.client.dsl.internal.LogWatchCallback; import io.fabric8.kubernetes.client.dsl.internal.OperationContext; import io.fabric8.kubernetes.client.dsl.internal.PodOperationContext; -import io.fabric8.kubernetes.client.utils.Base64; -import io.fabric8.kubernetes.client.utils.PodOperationUtil; import io.fabric8.kubernetes.client.dsl.internal.PortForwarderWebsocket; import io.fabric8.kubernetes.client.dsl.internal.uploadable.PodUpload; import io.fabric8.kubernetes.client.http.HttpClient; @@ -78,10 +78,10 @@ import io.fabric8.kubernetes.client.utils.URLUtils; import io.fabric8.kubernetes.client.utils.Utils; import io.fabric8.kubernetes.client.utils.URLUtils.URLBuilder; +import io.fabric8.kubernetes.client.utils.internal.Base64; +import io.fabric8.kubernetes.client.utils.internal.PodOperationUtil; import io.fabric8.kubernetes.client.lib.FilenameUtils; -import static io.fabric8.kubernetes.client.utils.OptionalDependencyWrapper.wrapRunWithOptionalDependency; - public class PodOperationsImpl extends HasMetadataOperation> implements PodResource,CopyOrReadable { public static final int HTTP_TOO_MANY_REQUESTS = 429; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerOperationsImpl.java index 0f9bbcb1497..e2ae8bb3c35 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerOperationsImpl.java @@ -32,7 +32,7 @@ import io.fabric8.kubernetes.client.dsl.internal.RollingOperationContext; import io.fabric8.kubernetes.client.dsl.internal.apps.v1.RollableScalableResourceOperation; import io.fabric8.kubernetes.client.dsl.internal.apps.v1.RollingUpdater; -import io.fabric8.kubernetes.client.utils.PodOperationUtil; +import io.fabric8.kubernetes.client.utils.internal.PodOperationUtil; import java.io.InputStream; import java.io.OutputStream; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetOperationsImpl.java index b943e9a723f..640b6146943 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetOperationsImpl.java @@ -32,7 +32,7 @@ import io.fabric8.kubernetes.client.dsl.internal.RollingOperationContext; import io.fabric8.kubernetes.client.dsl.internal.apps.v1.RollableScalableResourceOperation; import io.fabric8.kubernetes.client.dsl.internal.apps.v1.RollingUpdater; -import io.fabric8.kubernetes.client.utils.PodOperationUtil; +import io.fabric8.kubernetes.client.utils.internal.PodOperationUtil; import java.io.OutputStream; import java.io.Reader; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUpload.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUpload.java index 15cd1c718ca..59f8d83c9f5 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUpload.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUpload.java @@ -41,10 +41,10 @@ import io.fabric8.kubernetes.client.dsl.internal.PodOperationContext; import io.fabric8.kubernetes.client.http.HttpClient; import io.fabric8.kubernetes.client.http.WebSocket; -import io.fabric8.kubernetes.client.utils.Base64; import io.fabric8.kubernetes.client.utils.InputStreamPumper; import io.fabric8.kubernetes.client.utils.URLUtils; import io.fabric8.kubernetes.client.utils.Utils; +import io.fabric8.kubernetes.client.utils.internal.Base64; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/DefaultSharedIndexInformer.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/DefaultSharedIndexInformer.java index 877aa4be84f..a2bb097dffc 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/DefaultSharedIndexInformer.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/DefaultSharedIndexInformer.java @@ -19,16 +19,15 @@ import io.fabric8.kubernetes.api.model.KubernetesResourceList; import io.fabric8.kubernetes.client.informers.ListerWatcher; import io.fabric8.kubernetes.client.informers.ResourceEventHandler; -import io.fabric8.kubernetes.client.informers.ResyncRunnable; import io.fabric8.kubernetes.client.informers.SharedIndexInformer; -import io.fabric8.kubernetes.client.informers.cache.CacheImpl; import io.fabric8.kubernetes.client.informers.cache.Indexer; -import io.fabric8.kubernetes.client.informers.cache.ProcessorStore; -import io.fabric8.kubernetes.client.informers.cache.Reflector; -import io.fabric8.kubernetes.client.informers.cache.SharedProcessor; import io.fabric8.kubernetes.client.informers.cache.Store; -import io.fabric8.kubernetes.client.utils.SerialExecutor; +import io.fabric8.kubernetes.client.informers.impl.cache.CacheImpl; +import io.fabric8.kubernetes.client.informers.impl.cache.ProcessorStore; +import io.fabric8.kubernetes.client.informers.impl.cache.Reflector; +import io.fabric8.kubernetes.client.informers.impl.cache.SharedProcessor; import io.fabric8.kubernetes.client.utils.Utils; +import io.fabric8.kubernetes.client.utils.internal.SerialExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/ResyncRunnable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/ResyncRunnable.java similarity index 92% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/ResyncRunnable.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/ResyncRunnable.java index ba4c9788a3d..f11c85ab304 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/ResyncRunnable.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/ResyncRunnable.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers; +package io.fabric8.kubernetes.client.informers.impl; -import io.fabric8.kubernetes.client.informers.cache.SyncableStore; +import io.fabric8.kubernetes.client.informers.impl.cache.SyncableStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactoryImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/SharedInformerFactoryImpl.java similarity index 98% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactoryImpl.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/SharedInformerFactoryImpl.java index 8f9fb2756e4..af148116e8d 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactoryImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/SharedInformerFactoryImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers; +package io.fabric8.kubernetes.client.informers.impl; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.fabric8.kubernetes.api.model.GenericKubernetesResourceList; @@ -26,7 +26,9 @@ import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext; import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl; import io.fabric8.kubernetes.client.dsl.internal.OperationContext; -import io.fabric8.kubernetes.client.informers.impl.DefaultSharedIndexInformer; +import io.fabric8.kubernetes.client.informers.SharedIndexInformer; +import io.fabric8.kubernetes.client.informers.SharedInformerEventListener; +import io.fabric8.kubernetes.client.informers.SharedInformerFactory; import io.fabric8.kubernetes.client.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/CacheImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/CacheImpl.java similarity index 99% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/CacheImpl.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/CacheImpl.java index dcc95e7c5c2..6829ebca2cb 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/CacheImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/CacheImpl.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.client.informers.cache.Cache; import io.fabric8.kubernetes.client.utils.ReflectUtils; import io.fabric8.kubernetes.client.utils.Utils; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/ProcessorListener.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorListener.java similarity index 98% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/ProcessorListener.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorListener.java index f05bbca48a5..ef957730593 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/ProcessorListener.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.client.informers.ResourceEventHandler; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/ProcessorStore.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorStore.java similarity index 96% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/ProcessorStore.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorStore.java index a044054cd80..67793cb8805 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/ProcessorStore.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorStore.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.client.informers.cache.Cache; import java.util.List; import java.util.Objects; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/Reflector.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/Reflector.java similarity index 99% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/Reflector.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/Reflector.java index d9b84152771..a466f96015d 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/Reflector.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/Reflector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesResourceList; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/SharedProcessor.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessor.java similarity index 98% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/SharedProcessor.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessor.java index f5050951e30..f4e2829d183 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/SharedProcessor.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.client.informers.ResourceEventHandler; import org.slf4j.Logger; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/SyncableStore.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SyncableStore.java similarity index 91% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/SyncableStore.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SyncableStore.java index fad0b13e022..232c4729bb3 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/SyncableStore.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SyncableStore.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; + +import io.fabric8.kubernetes.client.informers.cache.Store; import java.util.Set; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/Base64.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/Base64.java similarity index 99% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/Base64.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/Base64.java index 523a9c9d4f8..c39543e2169 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/Base64.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/Base64.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.utils; +package io.fabric8.kubernetes.client.utils.internal; import io.fabric8.kubernetes.client.KubernetesClientException; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/CreateOrReplaceHelper.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/CreateOrReplaceHelper.java similarity index 93% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/CreateOrReplaceHelper.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/CreateOrReplaceHelper.java index c533657f64a..e4c2afe135d 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/CreateOrReplaceHelper.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/CreateOrReplaceHelper.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.utils; +package io.fabric8.kubernetes.client.utils.internal; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil; +import io.fabric8.kubernetes.client.utils.Serialization; import java.net.HttpURLConnection; import java.util.concurrent.CompletableFuture; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/DeleteAndCreateHelper.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/DeleteAndCreateHelper.java similarity index 98% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/DeleteAndCreateHelper.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/DeleteAndCreateHelper.java index 2f992000001..999c9d9141a 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/DeleteAndCreateHelper.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/DeleteAndCreateHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.utils; +package io.fabric8.kubernetes.client.utils.internal; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.KubernetesClientException; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/ExponentialBackoffIntervalCalculator.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/ExponentialBackoffIntervalCalculator.java similarity index 95% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/ExponentialBackoffIntervalCalculator.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/ExponentialBackoffIntervalCalculator.java index db91356769d..269e2528e22 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/ExponentialBackoffIntervalCalculator.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/ExponentialBackoffIntervalCalculator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.utils; +package io.fabric8.kubernetes.client.utils.internal; public class ExponentialBackoffIntervalCalculator { diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils/OptionalDependencyWrapper.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/OptionalDependencyWrapper.java similarity index 96% rename from kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils/OptionalDependencyWrapper.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/OptionalDependencyWrapper.java index 2e0123b368d..7c3ef464114 100644 --- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils/OptionalDependencyWrapper.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/OptionalDependencyWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.utils; +package io.fabric8.kubernetes.client.utils.internal; import java.util.function.Supplier; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/PodOperationUtil.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/PodOperationUtil.java similarity index 94% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/PodOperationUtil.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/PodOperationUtil.java index 15b13a21463..442c82460ad 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/PodOperationUtil.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/PodOperationUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.utils; +package io.fabric8.kubernetes.client.utils.internal; import io.fabric8.kubernetes.api.model.OwnerReference; import io.fabric8.kubernetes.api.model.Pod; @@ -23,6 +23,7 @@ import io.fabric8.kubernetes.client.dsl.internal.OperationContext; import io.fabric8.kubernetes.client.dsl.internal.PodOperationContext; import io.fabric8.kubernetes.client.dsl.internal.core.v1.PodOperationsImpl; +import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -97,7 +98,7 @@ public static String getLog(List> podOperationList, Boolean isP return stringBuilder.toString(); } - static List> getPodOperationsForController(PodOperationsImpl podOperations, String controllerUid, Map selectorLabels) { + public static List> getPodOperationsForController(PodOperationsImpl podOperations, String controllerUid, Map selectorLabels) { PodList controllerPodList = podOperations.withLabels(selectorLabels).list(); return PodOperationUtil.getFilteredPodsForLogs(podOperations, controllerPodList, controllerUid); diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/SerialExecutor.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/SerialExecutor.java similarity index 96% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/SerialExecutor.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/SerialExecutor.java index a167361f64f..29e660c4ddc 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/SerialExecutor.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/SerialExecutor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.kubernetes.client.utils; +package io.fabric8.kubernetes.client.utils.internal; import java.util.ArrayDeque; import java.util.Queue; diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils/URLFromServiceUtil.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/URLFromServiceUtil.java similarity index 98% rename from kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils/URLFromServiceUtil.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/URLFromServiceUtil.java index 412c9d4312c..fd70c123e9f 100644 --- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils/URLFromServiceUtil.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/URLFromServiceUtil.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package io.fabric8.kubernetes.client.utils; +package io.fabric8.kubernetes.client.utils.internal; import io.fabric8.kubernetes.api.model.*; import io.fabric8.kubernetes.api.model.extensions.*; +import io.fabric8.kubernetes.client.utils.URLUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/WatcherToggle.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/WatcherToggle.java similarity index 96% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/WatcherToggle.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/WatcherToggle.java index 20909332af7..c810241c3ee 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/WatcherToggle.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/internal/WatcherToggle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.kubernetes.client.utils; +package io.fabric8.kubernetes.client.utils.internal; import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.WatcherException; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUploadTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUploadTest.java index 8568328df8d..283d8d7ff43 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUploadTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUploadTest.java @@ -27,7 +27,6 @@ import java.util.Arrays; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import java.util.function.ObjIntConsumer; import io.fabric8.kubernetes.client.dsl.internal.OperationSupport; import io.fabric8.kubernetes.client.dsl.internal.PodOperationContext; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/SharedInformerFactoryTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/SharedInformerFactoryTest.java index 77835bfadea..78672ac1a53 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/SharedInformerFactoryTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/SharedInformerFactoryTest.java @@ -23,6 +23,7 @@ import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext; +import io.fabric8.kubernetes.client.informers.impl.SharedInformerFactoryImpl; import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Kind; import io.fabric8.kubernetes.model.annotation.Plural; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/CacheTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/CacheTest.java similarity index 97% rename from kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/CacheTest.java rename to kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/CacheTest.java index b5314af151a..6c7dbb7ad07 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/CacheTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/CacheTest.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; +import io.fabric8.kubernetes.client.informers.cache.Cache; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -27,7 +28,6 @@ import java.util.function.Function; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; class CacheTest { private static CacheImpl cache = new CacheImpl("mock", CacheTest::mockIndexFunction, CacheTest::mockKeyFunction); diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ListerTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ListerTest.java similarity index 94% rename from kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ListerTest.java rename to kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ListerTest.java index f5c3aacb313..bd8f6945178 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ListerTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ListerTest.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; +import io.fabric8.kubernetes.client.informers.cache.Lister; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ProcessorListenerTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorListenerTest.java similarity index 97% rename from kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ProcessorListenerTest.java rename to kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorListenerTest.java index aec5bbd7392..135706f9dbf 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ProcessorListenerTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorListenerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ProcessorStoreTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorStoreTest.java similarity index 91% rename from kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ProcessorStoreTest.java rename to kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorStoreTest.java index 7fa6886f8c2..3efce0ce746 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ProcessorStoreTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorStoreTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; -import io.fabric8.kubernetes.client.informers.cache.ProcessorListener.AddNotification; -import io.fabric8.kubernetes.client.informers.cache.ProcessorListener.DeleteNotification; -import io.fabric8.kubernetes.client.informers.cache.ProcessorListener.Notification; -import io.fabric8.kubernetes.client.informers.cache.ProcessorListener.UpdateNotification; +import io.fabric8.kubernetes.client.informers.impl.cache.ProcessorListener.AddNotification; +import io.fabric8.kubernetes.client.informers.impl.cache.ProcessorListener.DeleteNotification; +import io.fabric8.kubernetes.client.informers.impl.cache.ProcessorListener.Notification; +import io.fabric8.kubernetes.client.informers.impl.cache.ProcessorListener.UpdateNotification; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ReflectorTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ReflectorTest.java similarity index 98% rename from kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ReflectorTest.java rename to kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ReflectorTest.java index 8dfbc21d77c..fcf07d21cfb 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/ReflectorTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/ReflectorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodList; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/SharedProcessorTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessorTest.java similarity index 98% rename from kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/SharedProcessorTest.java rename to kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessorTest.java index 8a86755c9c5..e95793057c9 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/cache/SharedProcessorTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.client.informers.cache; +package io.fabric8.kubernetes.client.informers.impl.cache; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/CreateOrReplaceHelperTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/CreateOrReplaceHelperTest.java index 75e46963cfc..692892754b5 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/CreateOrReplaceHelperTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/CreateOrReplaceHelperTest.java @@ -19,6 +19,7 @@ import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.StatusBuilder; import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.utils.internal.CreateOrReplaceHelper; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/DeleteAndCreateHelperTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/DeleteAndCreateHelperTest.java index 9a2c8cf9b0d..35902d110dd 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/DeleteAndCreateHelperTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/DeleteAndCreateHelperTest.java @@ -19,6 +19,7 @@ import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.StatusBuilder; import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.utils.internal.DeleteAndCreateHelper; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/OptionalDependencyWrapperTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/OptionalDependencyWrapperTest.java index 6ec84488eae..b0fef28879b 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/OptionalDependencyWrapperTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/OptionalDependencyWrapperTest.java @@ -18,7 +18,7 @@ import io.fabric8.kubernetes.client.KubernetesClientException; import org.junit.jupiter.api.Test; -import static io.fabric8.kubernetes.client.utils.OptionalDependencyWrapper.wrapRunWithOptionalDependency; +import static io.fabric8.kubernetes.client.utils.internal.OptionalDependencyWrapper.wrapRunWithOptionalDependency; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/PodOperationUtilTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/PodOperationUtilTest.java index 49ebf393edb..330a94842e2 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/PodOperationUtilTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/PodOperationUtilTest.java @@ -25,6 +25,7 @@ import io.fabric8.kubernetes.client.dsl.PodResource; import io.fabric8.kubernetes.client.dsl.internal.OperationContext; import io.fabric8.kubernetes.client.dsl.internal.core.v1.PodOperationsImpl; +import io.fabric8.kubernetes.client.utils.internal.PodOperationUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/URLFromOpenshiftRouteImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/URLFromOpenshiftRouteImpl.java index 32dc64681ab..72a8b1ede8e 100644 --- a/openshift-client/src/main/java/io/fabric8/openshift/client/URLFromOpenshiftRouteImpl.java +++ b/openshift-client/src/main/java/io/fabric8/openshift/client/URLFromOpenshiftRouteImpl.java @@ -21,7 +21,7 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.ServiceToURLProvider; -import io.fabric8.kubernetes.client.utils.URLFromServiceUtil; +import io.fabric8.kubernetes.client.utils.internal.URLFromServiceUtil; import io.fabric8.openshift.api.model.Route; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/apps/DeploymentConfigOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/apps/DeploymentConfigOperationsImpl.java index b998d515166..ebed65146a7 100644 --- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/apps/DeploymentConfigOperationsImpl.java +++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/apps/DeploymentConfigOperationsImpl.java @@ -27,9 +27,9 @@ import io.fabric8.kubernetes.client.dsl.internal.LogWatchCallback; import io.fabric8.kubernetes.client.dsl.internal.OperationContext; import io.fabric8.kubernetes.client.dsl.internal.RollingOperationContext; -import io.fabric8.kubernetes.client.utils.PodOperationUtil; import io.fabric8.kubernetes.client.utils.URLUtils; import io.fabric8.kubernetes.client.utils.URLUtils.URLBuilder; +import io.fabric8.kubernetes.client.utils.internal.PodOperationUtil; import io.fabric8.openshift.api.model.DeploymentConfig; import io.fabric8.openshift.api.model.DeploymentConfigList; import io.fabric8.openshift.client.OpenshiftClientContext; diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildOperationsImpl.java index 60479ed7a4b..b5f1fb079b7 100644 --- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildOperationsImpl.java +++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildOperationsImpl.java @@ -29,8 +29,8 @@ import io.fabric8.kubernetes.client.dsl.internal.LogWatchCallback; import io.fabric8.kubernetes.client.dsl.internal.OperationContext; import io.fabric8.kubernetes.client.internal.PatchUtils; -import io.fabric8.kubernetes.client.utils.PodOperationUtil; import io.fabric8.kubernetes.client.utils.URLUtils; +import io.fabric8.kubernetes.client.utils.internal.PodOperationUtil; import io.fabric8.openshift.api.model.Build; import io.fabric8.openshift.api.model.BuildBuilder; import io.fabric8.openshift.api.model.BuildList;