From b0a72b155183650ec63496fd6424324a2493379c Mon Sep 17 00:00:00 2001 From: erabii Date: Thu, 2 Nov 2023 23:01:15 +0200 Subject: [PATCH] fix-1413 (#1495) --- .../discovery/Fabric8CatalogWatchContext.java | 6 +- .../Fabric8CatalogWatchContextTests.java | 76 +++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContextTests.java diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContext.java b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContext.java index 9d3fc70f..9a9fadf8 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContext.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContext.java @@ -16,7 +16,6 @@ package org.springframework.cloud.kubernetes.fabric8.discovery; -import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.stream.Stream; @@ -28,6 +27,9 @@ import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; +import static java.util.Comparator.comparing; +import static java.util.Comparator.nullsLast; + /** * A simple holder for some instances needed for either Endpoints or EndpointSlice catalog * implementations. @@ -39,7 +41,7 @@ record Fabric8CatalogWatchContext(KubernetesClient kubernetesClient, KubernetesD static List state(Stream references) { return references.filter(Objects::nonNull).map(x -> new EndpointNameAndNamespace(x.getName(), x.getNamespace())) - .sorted(Comparator.comparing(EndpointNameAndNamespace::endpointName, String::compareTo)).toList(); + .sorted(comparing(EndpointNameAndNamespace::endpointName, nullsLast(String::compareTo))).toList(); } } diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContextTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContextTests.java new file mode 100644 index 00000000..3324baab --- /dev/null +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContextTests.java @@ -0,0 +1,76 @@ +/* + * Copyright 2012-2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.kubernetes.fabric8.discovery; + +import java.util.List; +import java.util.stream.Stream; + +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.ObjectReferenceBuilder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace; + +/** + * @author wind57 + */ +class Fabric8CatalogWatchContextTests { + + @Test + void stateWithASingleElementNameNotNull() { + + Stream referenceStream = Stream + .of(new ObjectReferenceBuilder().withName("a").withNamespace("default").build()); + + List result = Fabric8CatalogWatchContext.state(referenceStream); + Assertions.assertEquals(result.size(), 1); + Assertions.assertEquals(result.get(0).endpointName(), "a"); + Assertions.assertEquals(result.get(0).namespace(), "default"); + + } + + @Test + void stateWithASingleElementNameNull() { + + Stream referenceStream = Stream + .of(new ObjectReferenceBuilder().withName(null).withNamespace("default").build()); + + List result = Fabric8CatalogWatchContext.state(referenceStream); + Assertions.assertEquals(result.size(), 1); + Assertions.assertNull(result.get(0).endpointName()); + Assertions.assertEquals(result.get(0).namespace(), "default"); + + } + + @Test + void stateWithTwoElementsNameNull() { + + Stream referenceStream = Stream.of( + new ObjectReferenceBuilder().withName(null).withNamespace("defaultNull").build(), + new ObjectReferenceBuilder().withName("a").withNamespace("defaultA").build()); + + List result = Fabric8CatalogWatchContext.state(referenceStream); + Assertions.assertEquals(result.size(), 2); + Assertions.assertEquals(result.get(0).endpointName(), "a"); + Assertions.assertEquals(result.get(0).namespace(), "defaultA"); + Assertions.assertNull(result.get(1).endpointName()); + Assertions.assertEquals(result.get(1).namespace(), "defaultNull"); + + } + +}