fix fabric8io#3876: moving the rest of the extensions to just the api

This also requires the use of ExtensionResourceAdapter so that an explicit constructor is no longer required
shawkins · Mar 2, 2022 · d6a985c · d6a985c
1 parent 14e3071
commit d6a985c
Show file tree

Hide file tree

Showing 60 changed files with 493 additions and 593 deletions.
diff --git a/doc/MIGRATION-v6.md b/doc/MIGRATION-v6.md
@@ -143,9 +143,11 @@ We've removed setter methods `setIntVal`, `setKind`, `setStrVal` from the class.
   String strValue = i2.getStrVal();
   ```
 
-## Service Catalog Changes
+## Extension Changes
 
-io.fabric8.servicecatalog.client.internal.XXXResource interfaces moved to io.fabric8.servicecatalog.client.dsl.XXXResource to no longer be in an internal package.
+- io.fabric8.servicecatalog.client.internal.XXXResource interfaces moved to io.fabric8.servicecatalog.client.dsl.XXXResource to no longer be in an internal package.
+
+- io.fabric8.volumesnapshot.client.internal.XXXResource interfaces moved to io.fabric8.volumesnapshot.client.XXXResource to no longer be in an internal package.
 
 ## Adapt Changes
 

diff --git a/extensions/certmanager/client/pom.xml b/extensions/certmanager/client/pom.xml
@@ -60,26 +60,27 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>certmanager-model-v1alpha2</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>certmanager-model-v1alpha3</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>certmanager-model-v1beta1</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>certmanager-model-v1</artifactId>
-      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-client-api</artifactId>
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

diff --git a/...tmanager/client/src/main/java/io/fabric8/certmanager/client/DefaultCertManagerClient.java b/...tmanager/client/src/main/java/io/fabric8/certmanager/client/DefaultCertManagerClient.java
@@ -19,15 +19,14 @@
 import io.fabric8.certmanager.client.dsl.V1alpha2APIGroupDSL;
 import io.fabric8.certmanager.client.dsl.V1alpha3APIGroupDSL;
 import io.fabric8.certmanager.client.dsl.V1beta1APIGroupDSL;
-import io.fabric8.kubernetes.client.BaseClient;
-import io.fabric8.kubernetes.client.ClientContext;
+import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.RequestConfig;
 import io.fabric8.kubernetes.client.WithRequestCallable;
 import io.fabric8.kubernetes.client.dsl.FunctionCallable;
+import io.fabric8.kubernetes.client.extension.ClientAdapter;
 
-public class DefaultCertManagerClient extends BaseClient implements NamespacedCertManagerClient {
+public class DefaultCertManagerClient extends ClientAdapter<NamespacedCertManagerClient> implements NamespacedCertManagerClient {
 
   public DefaultCertManagerClient() {
     super();
@@ -37,22 +36,13 @@ public DefaultCertManagerClient(Config configuration) {
     super(configuration);
   }
 
-  public DefaultCertManagerClient(ClientContext clientContext) {
-    super(clientContext);
+  public DefaultCertManagerClient(Client client) {
+    super(client);
   }
 
   @Override
-  public NamespacedCertManagerClient inAnyNamespace() {
-    return inNamespace(null);
-  }
-
-  @Override
-  public NamespacedCertManagerClient inNamespace(String namespace) {
-    Config updated = new ConfigBuilder(getConfiguration())
-      .withNamespace(namespace)
-      .build();
-
-    return new DefaultCertManagerClient(newState(updated));
+  protected NamespacedCertManagerClient newInstance(Client client) {
+    return new DefaultCertManagerClient(client);
   }
 
   @Override

diff --git a/...ions/certmanager/client/src/main/java/io/fabric8/certmanager/client/V1APIGroupClient.java b/...ions/certmanager/client/src/main/java/io/fabric8/certmanager/client/V1APIGroupClient.java
@@ -28,47 +28,51 @@
 import io.fabric8.certmanager.api.model.v1.Issuer;
 import io.fabric8.certmanager.api.model.v1.IssuerList;
 import io.fabric8.certmanager.client.dsl.V1APIGroupDSL;
-import io.fabric8.kubernetes.client.BaseClient;
-import io.fabric8.kubernetes.client.ClientContext;
-import io.fabric8.kubernetes.client.Handlers;
+import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
+import io.fabric8.kubernetes.client.extension.ClientAdapter;
 
-public class V1APIGroupClient extends BaseClient implements V1APIGroupDSL {
+public class V1APIGroupClient extends ClientAdapter<V1APIGroupDSL> implements V1APIGroupDSL {
   public V1APIGroupClient() {super();}
 
-  public V1APIGroupClient(ClientContext clientContext) {
-    super(clientContext);
+  public V1APIGroupClient(Client client) {
+    super(client);
+  }
+
+  @Override
+  protected V1APIGroupDSL newInstance(Client client) {
+    return new V1APIGroupClient(client);
   }
 
   @Override
   public MixedOperation<Certificate, CertificateList, Resource<Certificate>> certificates() {
-    return Handlers.getOperation(Certificate.class, CertificateList.class, this);
+    return resources(Certificate.class, CertificateList.class);
   }
 
   @Override
   public MixedOperation<CertificateRequest, CertificateRequestList, Resource<CertificateRequest>> certificateRequests() {
-    return Handlers.getOperation(CertificateRequest.class, CertificateRequestList.class, this);
+    return resources(CertificateRequest.class, CertificateRequestList.class);
   }
 
   @Override
   public MixedOperation<Issuer, IssuerList, Resource<Issuer>> issuers() {
-    return Handlers.getOperation(Issuer.class, IssuerList.class, this);
+    return resources(Issuer.class, IssuerList.class);
   }
 
   @Override
   public NonNamespaceOperation<ClusterIssuer, ClusterIssuerList, Resource<ClusterIssuer>> clusterIssuers() {
-    return Handlers.getOperation(ClusterIssuer.class, ClusterIssuerList.class, this);
+    return resources(ClusterIssuer.class, ClusterIssuerList.class);
   }
 
   @Override
   public MixedOperation<Challenge, ChallengeList, Resource<Challenge>> challenges() {
-    return Handlers.getOperation(Challenge.class, ChallengeList.class, this);
+    return resources(Challenge.class, ChallengeList.class);
   }
 
   @Override
   public MixedOperation<Order, OrderList, Resource<Order>> orders() {
-    return Handlers.getOperation(Order.class, OrderList.class, this);
+    return resources(Order.class, OrderList.class);
   }
 }
diff --git a/...ertmanager/client/src/main/java/io/fabric8/certmanager/client/V1alpha2APIGroupClient.java b/...ertmanager/client/src/main/java/io/fabric8/certmanager/client/V1alpha2APIGroupClient.java
@@ -28,49 +28,53 @@
 import io.fabric8.certmanager.api.model.v1alpha2.Issuer;
 import io.fabric8.certmanager.api.model.v1alpha2.IssuerList;
 import io.fabric8.certmanager.client.dsl.V1alpha2APIGroupDSL;
-import io.fabric8.kubernetes.client.BaseClient;
-import io.fabric8.kubernetes.client.ClientContext;
-import io.fabric8.kubernetes.client.Handlers;
+import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
+import io.fabric8.kubernetes.client.extension.ClientAdapter;
 
-public class V1alpha2APIGroupClient extends BaseClient implements V1alpha2APIGroupDSL {
+public class V1alpha2APIGroupClient extends ClientAdapter<V1alpha2APIGroupDSL> implements V1alpha2APIGroupDSL {
   public V1alpha2APIGroupClient() {
     super();
   }
 
-  public V1alpha2APIGroupClient(ClientContext clientContext) {
-    super(clientContext);
+  public V1alpha2APIGroupClient(Client client) {
+    super(client);
+  }
+
+  @Override
+  protected V1alpha2APIGroupDSL newInstance(Client client) {
+    return new V1alpha2APIGroupClient(client);
   }
 
   @Override
   public MixedOperation<Certificate, CertificateList, Resource<Certificate>> certificates() {
-    return Handlers.getOperation(Certificate.class, CertificateList.class, this);
+    return resources(Certificate.class, CertificateList.class);
   }
 
   @Override
   public MixedOperation<CertificateRequest, CertificateRequestList, Resource<CertificateRequest>> certificateRequests() {
-    return Handlers.getOperation(CertificateRequest.class, CertificateRequestList.class, this);
+    return resources(CertificateRequest.class, CertificateRequestList.class);
   }
 
   @Override
   public MixedOperation<Issuer, IssuerList, Resource<Issuer>> issuers() {
-    return Handlers.getOperation(Issuer.class, IssuerList.class, this);
+    return resources(Issuer.class, IssuerList.class);
   }
 
   @Override
   public NonNamespaceOperation<ClusterIssuer, ClusterIssuerList, Resource<ClusterIssuer>> clusterIssuers() {
-    return Handlers.getOperation(ClusterIssuer.class, ClusterIssuerList.class, this);
+    return resources(ClusterIssuer.class, ClusterIssuerList.class);
   }
 
   @Override
   public MixedOperation<Challenge, ChallengeList, Resource<Challenge>> challenges() {
-    return Handlers.getOperation(Challenge.class, ChallengeList.class, this);
+    return resources(Challenge.class, ChallengeList.class);
   }
 
   @Override
   public MixedOperation<Order, OrderList, Resource<Order>> orders() {
-    return Handlers.getOperation(Order.class, OrderList.class, this);
+    return resources(Order.class, OrderList.class);
   }
 }
diff --git a/...ertmanager/client/src/main/java/io/fabric8/certmanager/client/V1alpha3APIGroupClient.java b/...ertmanager/client/src/main/java/io/fabric8/certmanager/client/V1alpha3APIGroupClient.java
@@ -28,49 +28,53 @@
 import io.fabric8.certmanager.api.model.v1alpha3.Issuer;
 import io.fabric8.certmanager.api.model.v1alpha3.IssuerList;
 import io.fabric8.certmanager.client.dsl.V1alpha3APIGroupDSL;
-import io.fabric8.kubernetes.client.BaseClient;
-import io.fabric8.kubernetes.client.ClientContext;
-import io.fabric8.kubernetes.client.Handlers;
+import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
+import io.fabric8.kubernetes.client.extension.ClientAdapter;
 
-public class V1alpha3APIGroupClient extends BaseClient implements V1alpha3APIGroupDSL {
+public class V1alpha3APIGroupClient extends ClientAdapter<V1alpha3APIGroupDSL> implements V1alpha3APIGroupDSL {
   public V1alpha3APIGroupClient() {
     super();
   }
 
-  public V1alpha3APIGroupClient(ClientContext clientContext) {
-    super(clientContext);
+  public V1alpha3APIGroupClient(Client client) {
+    super(client);
+  }
+
+  @Override
+  protected V1alpha3APIGroupDSL newInstance(Client client) {
+    return new V1alpha3APIGroupClient(client);
   }
 
   @Override
   public MixedOperation<Certificate, CertificateList, Resource<Certificate>> certificates() {
-    return Handlers.getOperation(Certificate.class, CertificateList.class, this);
+    return resources(Certificate.class, CertificateList.class);
   }
 
   @Override
   public MixedOperation<CertificateRequest, CertificateRequestList, Resource<CertificateRequest>> certificateRequests() {
-    return Handlers.getOperation(CertificateRequest.class, CertificateRequestList.class, this);
+    return resources(CertificateRequest.class, CertificateRequestList.class);
   }
 
   @Override
   public MixedOperation<Issuer, IssuerList, Resource<Issuer>> issuers() {
-    return Handlers.getOperation(Issuer.class, IssuerList.class, this);
+    return resources(Issuer.class, IssuerList.class);
   }
 
   @Override
   public NonNamespaceOperation<ClusterIssuer, ClusterIssuerList, Resource<ClusterIssuer>> clusterIssuers() {
-    return Handlers.getOperation(ClusterIssuer.class, ClusterIssuerList.class, this);
+    return resources(ClusterIssuer.class, ClusterIssuerList.class);
   }
 
   @Override
   public MixedOperation<Challenge, ChallengeList, Resource<Challenge>> challenges() {
-    return Handlers.getOperation(Challenge.class, ChallengeList.class, this);
+    return resources(Challenge.class, ChallengeList.class);
   }
 
   @Override
   public MixedOperation<Order, OrderList, Resource<Order>> orders() {
-    return Handlers.getOperation(Order.class, OrderList.class, this);
+    return resources(Order.class, OrderList.class);
   }
 }
diff --git a/...certmanager/client/src/main/java/io/fabric8/certmanager/client/V1beta1APIGroupClient.java b/...certmanager/client/src/main/java/io/fabric8/certmanager/client/V1beta1APIGroupClient.java
@@ -28,49 +28,53 @@
 import io.fabric8.certmanager.api.model.v1beta1.Issuer;
 import io.fabric8.certmanager.api.model.v1beta1.IssuerList;
 import io.fabric8.certmanager.client.dsl.V1beta1APIGroupDSL;
-import io.fabric8.kubernetes.client.BaseClient;
-import io.fabric8.kubernetes.client.ClientContext;
-import io.fabric8.kubernetes.client.Handlers;
+import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
+import io.fabric8.kubernetes.client.extension.ClientAdapter;
 
-public class V1beta1APIGroupClient extends BaseClient implements V1beta1APIGroupDSL {
+public class V1beta1APIGroupClient extends ClientAdapter<V1beta1APIGroupDSL> implements V1beta1APIGroupDSL {
   public V1beta1APIGroupClient() {
     super();
   }
 
-  public V1beta1APIGroupClient(ClientContext clientContext) {
-    super(clientContext);
+  public V1beta1APIGroupClient(Client client) {
+    super(client);
+  }
+
+  @Override
+  protected V1beta1APIGroupDSL newInstance(Client client) {
+    return new V1beta1APIGroupClient(client);
   }
 
   @Override
   public MixedOperation<Certificate, CertificateList, Resource<Certificate>> certificates() {
-    return Handlers.getOperation(Certificate.class, CertificateList.class, this);
+    return resources(Certificate.class, CertificateList.class);
   }
 
   @Override
   public MixedOperation<CertificateRequest, CertificateRequestList, Resource<CertificateRequest>> certificateRequests() {
-    return Handlers.getOperation(CertificateRequest.class, CertificateRequestList.class, this);
+    return resources(CertificateRequest.class, CertificateRequestList.class);
   }
 
   @Override
   public MixedOperation<Issuer, IssuerList, Resource<Issuer>> issuers() {
-    return Handlers.getOperation(Issuer.class, IssuerList.class, this);
+    return resources(Issuer.class, IssuerList.class);
   }
 
   @Override
   public NonNamespaceOperation<ClusterIssuer, ClusterIssuerList, Resource<ClusterIssuer>> clusterIssuers() {
-    return Handlers.getOperation(ClusterIssuer.class, ClusterIssuerList.class, this);
+    return resources(ClusterIssuer.class, ClusterIssuerList.class);
   }
 
   @Override
   public MixedOperation<Challenge, ChallengeList, Resource<Challenge>> challenges() {
-    return Handlers.getOperation(Challenge.class, ChallengeList.class, this);
+    return resources(Challenge.class, ChallengeList.class);
   }
 
   @Override
   public MixedOperation<Order, OrderList, Resource<Order>> orders() {
-    return Handlers.getOperation(Order.class, OrderList.class, this);
+    return resources(Order.class, OrderList.class);
   }
 }
diff --git a/extensions/certmanager/examples/pom.xml b/extensions/certmanager/examples/pom.xml
@@ -32,7 +32,6 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>certmanager-client</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
 

diff --git a/extensions/chaosmesh/client/pom.xml b/extensions/chaosmesh/client/pom.xml
@@ -53,19 +53,24 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>chaosmesh-model</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-client</artifactId>
+      <artifactId>kubernetes-client-api</artifactId>
       <exclusions>
         <exclusion>
           <groupId>io.sundr</groupId>
           <artifactId>*</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
+
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-client</artifactId>
+      <scope>runtime</scope>
+    </dependency>
 
     <dependency>
       <groupId>io.sundr</groupId>