fix fabric8io#4460 removing the split packages

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Fix #4350: SchemaSwap annotation is now repeatable and is applied multiple times if classes are used more than once in the class hierarchy.
 * Fix #3733: The authentication command from the .kube/config won't be discarded if no arguments are specified
 * Fix #4441: corrected patch base handling for the patch methods available from a Resource - resource(item).patch() will be evaluated as resource(latest).patch(item).  Also undeprecated patch(item), which is consistent with leaving patch(context, item) undeprecated as well.  For consistency with the other operations (such as edit), patch(item) will use the context item as the base when available, or the server side item when not.  This means that patch(item) is only the same as resource(item).patch() when the patch(item) is called when the context item is missing or is the same as the latest.
+* Fix #4460: removing split packages.  Converting Default clients into adapters rather than real instances.
 
 #### Improvements
 * Fix #4348: Introduce specific annotations for the generators

junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java

@@ -20,7 +20,6 @@
 import io.fabric8.kubernetes.api.model.APIResourceList;
 import io.fabric8.kubernetes.api.model.APIResourceListBuilder;
 import io.fabric8.kubernetes.api.model.RootPathsBuilder;
-import io.fabric8.kubernetes.client.BaseClient;
 import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
@@ -31,6 +30,7 @@
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.http.TlsVersion;
+import io.fabric8.kubernetes.client.impl.BaseClient;
 import io.fabric8.kubernetes.client.utils.ApiVersionUtil;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.mockwebserver.Context;

kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java

@@ -0,0 +1,84 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client;
+
+import io.fabric8.kubernetes.client.KubernetesClientBuilder.ExecutorSupplier;
+import io.fabric8.kubernetes.client.http.HttpClient;
+import io.fabric8.kubernetes.client.http.HttpClient.Builder;
+import io.fabric8.kubernetes.client.http.HttpClient.Factory;
+import io.fabric8.kubernetes.client.utils.HttpClientUtils;
+import io.fabric8.kubernetes.client.utils.Serialization;
+
+import java.io.InputStream;
+
+/**
+ * Class for Default Kubernetes Client implementing KubernetesClient interface.
+ * It is thread safe.
+ *
+ * @deprecated direct usage should no longer be needed. Please use the {@link KubernetesClientBuilder} instead.
+ */
+@Deprecated
+public class DefaultKubernetesClient extends NamespacedKubernetesClientAdapter<NamespacedKubernetesClient> {
+
+  public static final String KUBERNETES_VERSION_ENDPOINT = "version";
+
+  public static DefaultKubernetesClient fromConfig(String config) {
+    return new DefaultKubernetesClient(Serialization.unmarshal(config, Config.class));
+  }
+
+  public static DefaultKubernetesClient fromConfig(InputStream is) {
+    return new DefaultKubernetesClient(Serialization.unmarshal(is, Config.class));
+  }
+
+  public DefaultKubernetesClient() {
+    this(new ConfigBuilder().build());
+  }
+
+  public DefaultKubernetesClient(String masterUrl) {
+    this(new ConfigBuilder().withMasterUrl(masterUrl).build());
+  }
+
+  public DefaultKubernetesClient(Config config) {
+    this(HttpClientUtils.createHttpClient(config), config);
+  }
+
+  public DefaultKubernetesClient(HttpClient httpClient, Config config) {
+    this(httpClient, config, null);
+  }
+
+  public DefaultKubernetesClient(HttpClient httpClient, Config config, ExecutorSupplier executorSupplier) {
+    super(NamespacedKubernetesClient.class);
+    KubernetesClientBuilder builder = new KubernetesClientBuilder().withConfig(config)
+        .withTaskExecutorSupplier(executorSupplier);
+    if (httpClient != null) {
+      builder.withHttpClientFactory(new Factory() {
+
+        @Override
+        public Builder newBuilder() {
+          // should not be called
+          throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public HttpClient createHttpClient(Config config) {
+          return httpClient;
+        }
+      });
+    }
+    this.init(builder.build());
+  }
+
+}

kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/KubernetesClientBuilder.java

@@ -48,7 +48,7 @@ default void onClose(Executor executor) {
   public KubernetesClientBuilder() {
     // basically the same logic as in KubernetesResourceUtil for finding list types
     // we're not guarding against a null context class loader
-    String className = "io.fabric8.kubernetes.client.DefaultKubernetesClient";
+    String className = "io.fabric8.kubernetes.client.impl.KubernetesClientImpl";
     try {
       clazz = (Class<KubernetesClient>) Thread.currentThread().getContextClassLoader().loadClass(className);
     } catch (ClassNotFoundException | ClassCastException e) {
@@ -102,7 +102,7 @@ public KubernetesClientBuilder withHttpClientFactory(HttpClient.Factory factory)
    * calls and writing to streams.
    * <p>
    * Only override if you need more control over the number of task threads used by the kubernetes client.
-   * 
+   *
    * @return this builder
    */
   public KubernetesClientBuilder withTaskExecutor(Executor executor) {
@@ -117,7 +117,7 @@ public KubernetesClientBuilder withTaskExecutor(Executor executor) {
    * There will be a call to {@link ExecutorSupplier#onClose(Executor)} when a client is closed.
    * <p>
    * Only override if you need more control over the number of task threads used by the kubernetes client.
-   * 
+   *
    * @return this builder
    */
   public KubernetesClientBuilder withTaskExecutorSupplier(ExecutorSupplier executorSupplier) {

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/NamespacedKubernetesClientAdapter.java → kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/NamespacedKubernetesClientAdapter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fabric8.kubernetes.client.osgi;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.model.APIService;
 import io.fabric8.kubernetes.api.model.APIServiceList;
@@ -58,12 +58,6 @@
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList;
-import io.fabric8.kubernetes.client.AdmissionRegistrationAPIGroupDSL;
-import io.fabric8.kubernetes.client.ApiVisitor;
-import io.fabric8.kubernetes.client.Client;
-import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
-import io.fabric8.kubernetes.client.RequestConfig;
-import io.fabric8.kubernetes.client.VersionInfo;
 import io.fabric8.kubernetes.client.dsl.ApiextensionsAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.AppsAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.AuthorizationAPIGroupDSL;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/HasMetadataOperationsImpl.java

@@ -19,11 +19,11 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
-import io.fabric8.kubernetes.client.BaseClient;
 import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
+import io.fabric8.kubernetes.client.impl.BaseClient;
 import io.fabric8.kubernetes.client.utils.Utils;
 import io.fabric8.kubernetes.internal.KubernetesDeserializer;
 

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/ObjectMetaMixIn.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/ObjectMetaMixIn.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client.internal;
+package io.fabric8.kubernetes.client.dsl.internal;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.fabric8.kubernetes.api.model.ObjectMeta;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/OperationContext.java

@@ -18,11 +18,11 @@
 import io.fabric8.kubernetes.api.builder.VisitableBuilder;
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.fabric8.kubernetes.client.BaseClient;
 import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.ResourceHandler;
 import io.fabric8.kubernetes.client.http.HttpClient;
+import io.fabric8.kubernetes.client.impl.BaseClient;
+import io.fabric8.kubernetes.client.impl.ResourceHandler;
 import io.fabric8.kubernetes.client.utils.ApiVersionUtil;
 import io.fabric8.kubernetes.client.utils.Utils;
 

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/OperationSupport.java

@@ -35,8 +35,6 @@
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.http.HttpRequest;
 import io.fabric8.kubernetes.client.http.HttpResponse;
-import io.fabric8.kubernetes.client.internal.PatchUtils;
-import io.fabric8.kubernetes.client.internal.VersionUsageUtils;
 import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.kubernetes.client.utils.URLUtils;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/PatchUtils.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/PatchUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client.internal;
+package io.fabric8.kubernetes.client.dsl.internal;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/VersionUsageUtils.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/VersionUsageUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client.internal;
+package io.fabric8.kubernetes.client.dsl.internal;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/RollingUpdater.java

@@ -32,9 +32,9 @@
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 import io.fabric8.kubernetes.client.dsl.base.PatchContext;
 import io.fabric8.kubernetes.client.dsl.base.PatchType;
+import io.fabric8.kubernetes.client.dsl.internal.PatchUtils;
+import io.fabric8.kubernetes.client.dsl.internal.PatchUtils.Format;
 import io.fabric8.kubernetes.client.dsl.internal.core.v1.PodOperationsImpl;
-import io.fabric8.kubernetes.client.internal.PatchUtils;
-import io.fabric8.kubernetes.client.internal.PatchUtils.Format;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.kubernetes.client.utils.Utils;
 import org.slf4j.Logger;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/Adapters.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/Adapters.java

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
+import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
 import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl;
 import io.fabric8.kubernetes.client.extension.ClientAdapter;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AdmissionRegistrationAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/AdmissionRegistrationAPIGroupClient.java

@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
+import io.fabric8.kubernetes.client.AdmissionRegistrationAPIGroupDSL;
+import io.fabric8.kubernetes.client.V1AdmissionRegistrationAPIGroupDSL;
+import io.fabric8.kubernetes.client.V1beta1AdmissionRegistrationAPIGroupDSL;
 import io.fabric8.kubernetes.client.extension.ClientAdapter;
 
 public class AdmissionRegistrationAPIGroupClient extends ClientAdapter<AdmissionRegistrationAPIGroupClient>

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ApiextensionsAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/ApiextensionsAPIGroupClient.java

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
+import io.fabric8.kubernetes.client.V1ApiextensionAPIGroupDSL;
+import io.fabric8.kubernetes.client.V1beta1ApiextensionAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.ApiextensionsAPIGroupDSL;
 import io.fabric8.kubernetes.client.extension.ClientAdapter;
 

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AppsAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/AppsAPIGroupClient.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
 import io.fabric8.kubernetes.api.model.apps.ControllerRevision;
 import io.fabric8.kubernetes.api.model.apps.ControllerRevisionList;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AuthorizationAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/AuthorizationAPIGroupClient.java

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
+import io.fabric8.kubernetes.client.V1AuthorizationAPIGroupDSL;
+import io.fabric8.kubernetes.client.V1beta1AuthorizationAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.AuthorizationAPIGroupDSL;
 import io.fabric8.kubernetes.client.extension.ClientAdapter;
 

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AutoscalingAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/AutoscalingAPIGroupClient.java

@@ -13,8 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
+import io.fabric8.kubernetes.client.V1AutoscalingAPIGroupDSL;
+import io.fabric8.kubernetes.client.V2AutoscalingAPIGroupDSL;
+import io.fabric8.kubernetes.client.V2beta1AutoscalingAPIGroupDSL;
+import io.fabric8.kubernetes.client.V2beta2AutoscalingAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.AutoscalingAPIGroupDSL;
 import io.fabric8.kubernetes.client.extension.ClientAdapter;
 

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BaseClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/BaseClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
 import io.fabric8.kubernetes.api.model.APIGroup;
 import io.fabric8.kubernetes.api.model.APIGroupList;
@@ -24,6 +24,10 @@
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.RootPaths;
+import io.fabric8.kubernetes.client.Client;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.VersionInfo;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder.ExecutorSupplier;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BatchAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/BatchAPIGroupClient.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
 import io.fabric8.kubernetes.api.model.batch.v1.Job;
 import io.fabric8.kubernetes.api.model.batch.v1.JobList;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/CertificatesAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/CertificatesAPIGroupClient.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
 import io.fabric8.kubernetes.client.dsl.CertificatesAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.V1CertificatesAPIGroupDSL;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DiscoveryAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/DiscoveryAPIGroupClient.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
 import io.fabric8.kubernetes.client.dsl.DiscoveryAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.V1DiscoveryAPIGroupDSL;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/EventingAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/EventingAPIGroupClient.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
 import io.fabric8.kubernetes.client.dsl.EventingAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.V1EventingAPIGroupDSL;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/ExtensionsAPIGroupClient.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
 import io.fabric8.kubernetes.api.model.batch.v1.Job;
 import io.fabric8.kubernetes.api.model.batch.v1.JobList;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/FlowControlAPIGroupClient.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/FlowControlAPIGroupClient.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
 import io.fabric8.kubernetes.client.dsl.FlowControlAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.V1beta1FlowControlAPIGroupDSL;

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/Handlers.java → kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/Handlers.java

@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-package io.fabric8.kubernetes.client;
+package io.fabric8.kubernetes.client.impl;
 
 import io.fabric8.kubernetes.api.builder.VisitableBuilder;
 import io.fabric8.kubernetes.api.model.APIResourceList;
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.fabric8.kubernetes.api.model.GenericKubernetesResourceList;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
+import io.fabric8.kubernetes.client.Client;
+import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.dsl.NamespacedInOutCreateable;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;