From df8e264a09e1f6be3f8f1c1bac917095feb0d332 Mon Sep 17 00:00:00 2001 From: erabii Date: Fri, 29 Dec 2023 16:30:29 +0200 Subject: [PATCH] non raw type usage in loadbalancer (#1554) --- .../loadbalancer/KubernetesClientServicesListSupplier.java | 5 +++-- .../loadbalancer/KubernetesServicesListSupplier.java | 6 +++--- .../fabric8/loadbalancer/Fabric8ServicesListSupplier.java | 2 +- .../loadbalancer/KubernetesServiceListSupplierTests.java | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java b/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java index 2d6cb010..14143533 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java @@ -37,7 +37,7 @@ import org.springframework.core.env.Environment; /** * @author Ryan Baxter */ -public class KubernetesClientServicesListSupplier extends KubernetesServicesListSupplier { +public class KubernetesClientServicesListSupplier extends KubernetesServicesListSupplier { private static final Log LOG = LogFactory.getLog(KubernetesClientServicesListSupplier.class); @@ -47,7 +47,8 @@ public class KubernetesClientServicesListSupplier extends KubernetesServicesList private KubernetesNamespaceProvider kubernetesNamespaceProvider; - public KubernetesClientServicesListSupplier(Environment environment, KubernetesServiceInstanceMapper mapper, + public KubernetesClientServicesListSupplier(Environment environment, + KubernetesServiceInstanceMapper mapper, KubernetesDiscoveryProperties discoveryProperties, CoreV1Api coreV1Api, KubernetesNamespaceProvider kubernetesNamespaceProvider) { super(environment, mapper, discoveryProperties); diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/loadbalancer/KubernetesServicesListSupplier.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/loadbalancer/KubernetesServicesListSupplier.java index a9b485b3..33cd0edd 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/loadbalancer/KubernetesServicesListSupplier.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/loadbalancer/KubernetesServicesListSupplier.java @@ -32,15 +32,15 @@ import org.springframework.core.env.Environment; * * @author Piotr Minkowski */ -public abstract class KubernetesServicesListSupplier implements ServiceInstanceListSupplier { +public abstract class KubernetesServicesListSupplier implements ServiceInstanceListSupplier { protected final Environment environment; protected final KubernetesDiscoveryProperties discoveryProperties; - protected final KubernetesServiceInstanceMapper mapper; + protected final KubernetesServiceInstanceMapper mapper; - public KubernetesServicesListSupplier(Environment environment, KubernetesServiceInstanceMapper mapper, + public KubernetesServicesListSupplier(Environment environment, KubernetesServiceInstanceMapper mapper, KubernetesDiscoveryProperties discoveryProperties) { this.environment = environment; this.discoveryProperties = discoveryProperties; diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplier.java b/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplier.java index 00e0a6fe..217e15bf 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplier.java +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplier.java @@ -36,7 +36,7 @@ import org.springframework.util.StringUtils; * * @author Piotr Minkowski */ -public class Fabric8ServicesListSupplier extends KubernetesServicesListSupplier { +public class Fabric8ServicesListSupplier extends KubernetesServicesListSupplier { private final KubernetesClient kubernetesClient; diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/KubernetesServiceListSupplierTests.java b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/KubernetesServiceListSupplierTests.java index 9e463466..40afa180 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/KubernetesServiceListSupplierTests.java +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/KubernetesServiceListSupplierTests.java @@ -77,7 +77,7 @@ class KubernetesServiceListSupplierTests { when(this.serviceOperation.inNamespace("test")).thenReturn(namespaceOperation); when(this.namespaceOperation.withName("test-service")).thenReturn(this.serviceResource); when(this.serviceResource.get()).thenReturn(buildService("test-service", 8080)); - KubernetesServicesListSupplier supplier = new Fabric8ServicesListSupplier(environment, client, mapper, + KubernetesServicesListSupplier supplier = new Fabric8ServicesListSupplier(environment, client, mapper, KubernetesDiscoveryProperties.DEFAULT); List instances = supplier.get().blockFirst(); assert instances != null; @@ -98,7 +98,7 @@ class KubernetesServiceListSupplierTests { KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, false); - KubernetesServicesListSupplier supplier = new Fabric8ServicesListSupplier(environment, client, mapper, + KubernetesServicesListSupplier supplier = new Fabric8ServicesListSupplier(environment, client, mapper, discoveryProperties); List instances = supplier.get().blockFirst(); assert instances != null;