fix: removed SupportTestingClient interface

Signed-off-by: Marc Nuri <marc@marcnuri.com>
fabric8io · Nov 15, 2024 · 24c3522 · 24c3522
1 parent ed25431
commit 24c3522
Show file tree

Hide file tree

Showing 44 changed files with 25 additions and 968 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,10 +28,11 @@
 
 #### _**Note**_: Breaking changes
 * Check detailed migration documentation for breaking changes in [7.0.0](./doc/MIGRATION-v7.md)
+* Fix #4659: Removed `SupportTestingClient` interface
 * Fix #5264: `Config.errorMessages` has been removed. Please use Kubernetes status messages directly.
+* Fix #5351: Removed deprecated `io.fabric8:openshift-server-mock` artifact
 * Fix #6081: Moved Java baseline from 8 (1.8) to 11
 * Fix #6138: Removed unused `io:fabric8:kubernetes-model` artifact
-* Fix #5351: Removed deprecated `io.fabric8:openshift-server-mock` artifact
 * Fix #6156: Removed deprecated extension `io:fabric8:service-catalog`
 * Fix #6158: Removed deprecated methods from `io.fabric8.kubernetes.client.utils.IOHelpers`
 * Fix #6361: Renamed SettableBeanPropertyDelegate to SettableBeanPropertyDelegating

diff --git a/doc/MIGRATION-v7.md b/doc/MIGRATION-v7.md
@@ -24,6 +24,7 @@
 - [Deprecations and Removals](#deprecations-and-removals)
   - [Apache Felix SCR Annotations removed](#apache-felix-scr-annotations)
   - [OpenShift Server Mock removed](#openshift-server-mock-removed)
+  - [SupportTestingClient removed](#supporttestingclient-removed)
   - [Service Catalog API (extension) removed](#service-catalog-extension)
 
 
@@ -272,6 +273,14 @@ The usage of the `@EnableOpenShiftMockClient` annotation should be replaced with
 
 The use of the `OpenShiftMockServer` class should be replaced with the `KubernetesMockServer` class.
 
+### SupportTestingClient removed <a href="#supporttestingclient-removed" id="supporttestingclient-removed"/>
+
+The deprecated interface `SupportTestingClient` has been removed from the project.
+
+The method `client.isSupported` is no longer available.
+You can replace it with the `Client.hasApiGroup` method or one of the `Client.supports` alternative methods.
+For OpenShift, you can also leverage the `OpenShiftClient.supportsOpenShiftAPIGroup` method.
+
 ### Service Catalog API (extension) removed <a href="#service-catalog-extension" id="service-catalog-extension"/>
 
 The Service Catalog API extension has been removed.

diff --git a/extensions/chaosmesh/client/pom.xml b/extensions/chaosmesh/client/pom.xml
@@ -67,11 +67,6 @@
       <artifactId>kubernetes-client</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/...ns/chaosmesh/client/src/main/java/io/fabric8/chaosmesh/client/DefaultChaosMeshClient.java b/...ns/chaosmesh/client/src/main/java/io/fabric8/chaosmesh/client/DefaultChaosMeshClient.java
@@ -47,10 +47,9 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.extension.ExtensionRootClientAdapter;
-import io.fabric8.kubernetes.client.extension.SupportTestingClient;
 
 public class DefaultChaosMeshClient extends ExtensionRootClientAdapter<DefaultChaosMeshClient>
-    implements NamespacedChaosMeshClient, SupportTestingClient {
+    implements NamespacedChaosMeshClient {
 
   public DefaultChaosMeshClient() {
     super();
@@ -134,8 +133,4 @@ public MixedOperation<AWSChaos, AWSChaosList, Resource<AWSChaos>> awsChaos() {
     return resources(AWSChaos.class, AWSChaosList.class);
   }
 
-  @Override
-  public boolean isSupported() {
-    return hasApiGroup("chaos-mesh.org", false);
-  }
 }
diff --git a/.../chaosmesh/client/src/test/java/io/fabric8/chaosmesh/client/ChaosMeshClientAdaptTest.java b/.../chaosmesh/client/src/test/java/io/fabric8/chaosmesh/client/ChaosMeshClientAdaptTest.java
diff --git a/extensions/istio/client/pom.xml b/extensions/istio/client/pom.xml
@@ -65,11 +65,6 @@
       <artifactId>kubernetes-client</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/extensions/istio/client/src/main/java/io/fabric8/istio/client/DefaultIstioClient.java b/extensions/istio/client/src/main/java/io/fabric8/istio/client/DefaultIstioClient.java
@@ -21,10 +21,9 @@
 import io.fabric8.kubernetes.client.WithRequestCallable;
 import io.fabric8.kubernetes.client.dsl.FunctionCallable;
 import io.fabric8.kubernetes.client.extension.ExtensionRootClientAdapter;
-import io.fabric8.kubernetes.client.extension.SupportTestingClient;
 
 public class DefaultIstioClient extends ExtensionRootClientAdapter<DefaultIstioClient>
-    implements NamespacedIstioClient, SupportTestingClient {
+    implements NamespacedIstioClient {
 
   public DefaultIstioClient() {
     super();
@@ -57,9 +56,4 @@ public V1alpha3APIGroupDSL v1alpha3() {
   public V1beta1APIGroupDSL v1beta1() {
     return adapt(V1beta1APIGroupClient.class);
   }
-
-  @Override
-  public boolean isSupported() {
-    return hasApiGroup("istio.io", false);
-  }
 }
diff --git a/extensions/istio/client/src/test/java/io/fabric8/istio/client/IstioClientAdaptTest.java b/extensions/istio/client/src/test/java/io/fabric8/istio/client/IstioClientAdaptTest.java
diff --git a/extensions/istio/client/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/extensions/istio/client/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/extensions/knative/client/pom.xml b/extensions/knative/client/pom.xml
@@ -65,11 +65,6 @@
       <artifactId>kubernetes-client</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/extensions/knative/client/src/main/java/io/fabric8/knative/client/DefaultKnativeClient.java b/extensions/knative/client/src/main/java/io/fabric8/knative/client/DefaultKnativeClient.java
@@ -77,10 +77,9 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.extension.ExtensionRootClientAdapter;
-import io.fabric8.kubernetes.client.extension.SupportTestingClient;
 
 public class DefaultKnativeClient extends ExtensionRootClientAdapter<DefaultKnativeClient>
-    implements NamespacedKnativeClient, SupportTestingClient {
+    implements NamespacedKnativeClient {
 
   public DefaultKnativeClient() {
     super();
@@ -238,9 +237,4 @@ public MixedOperation<KafkaSource, KafkaSourceList, Resource<KafkaSource>> kafka
   public MixedOperation<KafkaBinding, KafkaBindingList, Resource<KafkaBinding>> kafkaBindings() {
     return resources(KafkaBinding.class, KafkaBindingList.class);
   }
-
-  @Override
-  public boolean isSupported() {
-    return hasApiGroup("knative.dev", false);
-  }
 }
diff --git a/...nsions/knative/client/src/test/java/io/fabric8/knative/client/KnativeClientAdaptTest.java b/...nsions/knative/client/src/test/java/io/fabric8/knative/client/KnativeClientAdaptTest.java
diff --git a/...nsions/knative/client/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...nsions/knative/client/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/extensions/open-cluster-management/client/pom.xml b/extensions/open-cluster-management/client/pom.xml
@@ -67,11 +67,6 @@
       <artifactId>kubernetes-client</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>