Merge branch '3.0.x'

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.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<EndpointNameAndNamespace> state(Stream<ObjectReference> 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();
 	}
 
 }

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<ObjectReference> referenceStream = Stream
+				.of(new ObjectReferenceBuilder().withName("a").withNamespace("default").build());
+
+		List<EndpointNameAndNamespace> 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<ObjectReference> referenceStream = Stream
+				.of(new ObjectReferenceBuilder().withName(null).withNamespace("default").build());
+
+		List<EndpointNameAndNamespace> 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<ObjectReference> referenceStream = Stream.of(
+				new ObjectReferenceBuilder().withName(null).withNamespace("defaultNull").build(),
+				new ObjectReferenceBuilder().withName("a").withNamespace("defaultA").build());
+
+		List<EndpointNameAndNamespace> 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");
+
+	}
+
+}