Merge branch 'main' into move-discovery-conditionals-to-separate-package

Author: wind57

spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClient.java

@@ -16,13 +16,11 @@
 
 package org.springframework.cloud.kubernetes.fabric8.discovery;
 
-import java.util.List;
 import java.util.function.Predicate;
 
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.client.KubernetesClient;
 
-import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
@@ -43,24 +41,9 @@ final class Fabric8DiscoveryClient extends Fabric8AbstractBlockingDiscoveryClien
 		super(client, kubernetesDiscoveryProperties, servicePortSecureResolver, namespaceProvider, predicate);
 	}
 
-	@Override
-	public List<String> getServices() {
-		return super.getServices();
-	}
-
-	@Override
-	public List<ServiceInstance> getInstances(String serviceId) {
-		return super.getInstances(serviceId);
-	}
-
 	@Override
 	public String description() {
 		return "Fabric8 Blocking Discovery Client";
 	}
 
-	@Override
-	public int getOrder() {
-		return super.getOrder();
-	}
-
 }