removing more interfaces

shawkins · Apr 28, 2022 · 20f7b6b · 20f7b6b
1 parent 03ec3b1
commit 20f7b6b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 112 deletions.
diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/Client.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/Client.java
@@ -25,11 +25,12 @@
 import io.fabric8.kubernetes.api.model.RootPaths;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
+import io.fabric8.kubernetes.client.http.HttpClient;
 
 import java.io.Closeable;
 import java.net.URL;
 
-public interface Client extends HttpClientAware, ConfigAware<Config>, Closeable {
+public interface Client extends Closeable {
 
   /**
    * Checks if the client can be adapted to an other client type and if that target client is supported.
@@ -167,4 +168,8 @@ default <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperat
    */
   Client newClient(RequestConfig requestConfig);
 
+  HttpClient getHttpClient();
+
+  Config getConfiguration();
+
 }
diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/ConfigAware.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/ConfigAware.java
diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/HttpClientAware.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/HttpClientAware.java
diff --git a/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/BuildConfigOperation.java b/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/BuildConfigOperation.java
diff --git a/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/TemplateOperation.java b/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/TemplateOperation.java
diff --git a/...c/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildConfigOperationsImpl.java b/...c/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildConfigOperationsImpl.java
@@ -35,7 +35,6 @@
 import io.fabric8.openshift.api.model.BuildConfigList;
 import io.fabric8.openshift.api.model.BuildRequest;
 import io.fabric8.openshift.api.model.WebHookTrigger;
-import io.fabric8.openshift.client.dsl.BuildConfigOperation;
 import io.fabric8.openshift.client.dsl.BuildConfigResource;
 import io.fabric8.openshift.client.dsl.InputStreamable;
 import io.fabric8.openshift.client.dsl.TimeoutInputStreamable;
@@ -62,7 +61,8 @@
 
 public class BuildConfigOperationsImpl
     extends HasMetadataOperation<BuildConfig, BuildConfigList, BuildConfigResource<BuildConfig, Void, Build>>
-    implements BuildConfigOperation {
+    implements BuildConfigResource<BuildConfig, Void, Build>,
+    CommitterAuthorMessageAsFileTimeoutInputStreamable<Build> {
 
   private static final Logger logger = LoggerFactory.getLogger(BuildConfigOperationsImpl.class);
   public static final String BUILD_CONFIG_LABEL = "openshift.io/build-config.name";

diff --git a/...t/src/main/java/io/fabric8/openshift/client/dsl/internal/core/TemplateOperationsImpl.java b/...t/src/main/java/io/fabric8/openshift/client/dsl/internal/core/TemplateOperationsImpl.java
@@ -23,11 +23,11 @@
 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.ParameterMixedOperation;
 import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl;
 import io.fabric8.kubernetes.client.dsl.internal.OperationContext;
 import io.fabric8.kubernetes.client.http.HttpRequest;
-import io.fabric8.kubernetes.client.http.HttpRequest.Builder;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.kubernetes.client.utils.URLUtils;
 import io.fabric8.kubernetes.client.utils.Utils;
@@ -36,7 +36,6 @@
 import io.fabric8.openshift.api.model.TemplateBuilder;
 import io.fabric8.openshift.api.model.TemplateList;
 import io.fabric8.openshift.client.ParameterValue;
-import io.fabric8.openshift.client.dsl.TemplateOperation;
 import io.fabric8.openshift.client.dsl.TemplateResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,7 +58,8 @@
 
 public class TemplateOperationsImpl
     extends HasMetadataOperation<Template, TemplateList, TemplateResource<Template, KubernetesList>>
-    implements TemplateOperation {
+    implements TemplateResource<Template, KubernetesList>,
+    ParameterMixedOperation<Template, TemplateList, TemplateResource<Template, KubernetesList>> {
 
   private static final Logger logger = LoggerFactory.getLogger(TemplateOperationsImpl.class);
   private static final String EXPRESSION = "expression";