SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x'

Browse Source
This commit is contained in:
Ryan Baxter
2023-12-29 09:31:25 -05:00
parent 5cc727ca20 df8e264a09
commit eda567bd58
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java
View File

@@ -37,7 +37,7 @@ import org.springframework.core.env.Environment;
/**
* @author Ryan Baxter
*/
public class KubernetesClientServicesListSupplier extends KubernetesServicesListSupplier {
public class KubernetesClientServicesListSupplier extends KubernetesServicesListSupplier<V1Service> {
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<V1Service> mapper,
KubernetesDiscoveryProperties discoveryProperties, CoreV1Api coreV1Api,
KubernetesNamespaceProvider kubernetesNamespaceProvider) {
super(environment, mapper, discoveryProperties);

6
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/loadbalancer/KubernetesServicesListSupplier.java
View File

@@ -32,15 +32,15 @@ import org.springframework.core.env.Environment;
*
* @author Piotr Minkowski
*/
public abstract class KubernetesServicesListSupplier implements ServiceInstanceListSupplier {
public abstract class KubernetesServicesListSupplier<T> implements ServiceInstanceListSupplier {
protected final Environment environment;
protected final KubernetesDiscoveryProperties discoveryProperties;
protected final KubernetesServiceInstanceMapper mapper;
protected final KubernetesServiceInstanceMapper<T> mapper;
public KubernetesServicesListSupplier(Environment environment, KubernetesServiceInstanceMapper mapper,
public KubernetesServicesListSupplier(Environment environment, KubernetesServiceInstanceMapper<T> mapper,
KubernetesDiscoveryProperties discoveryProperties) {
this.environment = environment;
this.discoveryProperties = discoveryProperties;

2
spring-cloud-kubernetes-fabric8-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplier.java
View File

@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
*
* @author Piotr Minkowski
*/
public class Fabric8ServicesListSupplier extends KubernetesServicesListSupplier {
public class Fabric8ServicesListSupplier extends KubernetesServicesListSupplier<Service> {
private final KubernetesClient kubernetesClient;

4
spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/KubernetesServiceListSupplierTests.java
View File

@@ -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<Service> supplier = new Fabric8ServicesListSupplier(environment, client, mapper,
KubernetesDiscoveryProperties.DEFAULT);
List<ServiceInstance> 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<Service> supplier = new Fabric8ServicesListSupplier(environment, client, mapper,
discoveryProperties);
List<ServiceInstance> instances = supplier.get().blockFirst();
assert instances != null;