Merge pull request #2067 from wind57/rename-external-name-class

Rename external name class (5)

Author: ryanjbaxter

spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerDiscoveryClientTests.java

@@ -52,8 +52,8 @@
 
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
+import org.springframework.cloud.kubernetes.commons.discovery.ExternalNameKubernetesServiceInstance;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
-import org.springframework.cloud.kubernetes.commons.discovery.KubernetesExternalNameServiceInstance;
 
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -571,7 +571,7 @@ void testExternalNameService() {
 
 		List<ServiceInstance> result = discoveryClient.getInstances("blue-service");
 		assertThat(result.size()).isEqualTo(1);
-		KubernetesExternalNameServiceInstance externalNameServiceInstance = (KubernetesExternalNameServiceInstance) result
+		ExternalNameKubernetesServiceInstance externalNameServiceInstance = (ExternalNameKubernetesServiceInstance) result
 			.get(0);
 		assertThat(externalNameServiceInstance.getServiceId()).isEqualTo("blue-service");
 		assertThat(externalNameServiceInstance.getHost()).isEqualTo("k8s-spring-b");

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/DiscoveryClientUtils.java

@@ -164,7 +164,7 @@ public static ServiceInstance externalNameServiceInstance(ServiceMetadata servic
 
 		InstanceIdHostPodName data = instanceIdAndHost.get();
 
-		return new KubernetesExternalNameServiceInstance(serviceMetadata.name(), data.host(), data.instanceId(),
+		return new ExternalNameKubernetesServiceInstance(serviceMetadata.name(), data.host(), data.instanceId(),
 				serviceInstanceMetadata);
 
 	}

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesExternalNameServiceInstance.java renamed to spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ExternalNameKubernetesServiceInstance.java

@@ -28,7 +28,7 @@
  *
  * @author wind57
  */
-public record KubernetesExternalNameServiceInstance(String serviceId, String host, String instanceId,
+public record ExternalNameKubernetesServiceInstance(String serviceId, String host, String instanceId,
 		Map<String, String> metadata) implements ServiceInstance, Serializable {
 
 	@Override

spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/ServiceInstanceSerializationTests.java

@@ -123,7 +123,7 @@ void defaultKubernetesServiceInstanceDeserializationTest() throws JsonProcessing
 
 	@Test
 	void externalNameServiceInstanceSerializationTest() throws JsonProcessingException {
-		KubernetesExternalNameServiceInstance instance = new KubernetesExternalNameServiceInstance("serviceId", "host",
+		ExternalNameKubernetesServiceInstance instance = new ExternalNameKubernetesServiceInstance("serviceId", "host",
 				"instanceId", Map.of("a", "b"));
 		String serialized = new ObjectMapper().writeValueAsString(instance);
 

spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientTwoTests.java

@@ -44,8 +44,8 @@
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
+import org.springframework.cloud.kubernetes.commons.discovery.ExternalNameKubernetesServiceInstance;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
-import org.springframework.cloud.kubernetes.commons.discovery.KubernetesExternalNameServiceInstance;
 import org.springframework.core.env.Environment;
 import org.springframework.mock.env.MockEnvironment;
 
@@ -553,7 +553,7 @@ void testExternalNameService() {
 		Fabric8DiscoveryClient discoveryClient = new Fabric8DiscoveryClient(client, properties, null, null, null);
 		List<ServiceInstance> result = discoveryClient.getInstances("blue-service");
 		Assertions.assertThat(result.size()).isEqualTo(1);
-		KubernetesExternalNameServiceInstance externalNameServiceInstance = (KubernetesExternalNameServiceInstance) result
+		ExternalNameKubernetesServiceInstance externalNameServiceInstance = (ExternalNameKubernetesServiceInstance) result
 			.get(0);
 		Assertions.assertThat(externalNameServiceInstance.getServiceId()).isEqualTo("blue-service");
 		Assertions.assertThat(externalNameServiceInstance.getHost()).isEqualTo("k8s-spring-b");

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySimpleIT.java

@@ -34,8 +34,8 @@
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
+import org.springframework.cloud.kubernetes.commons.discovery.ExternalNameKubernetesServiceInstance;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
-import org.springframework.cloud.kubernetes.commons.discovery.KubernetesExternalNameServiceInstance;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
 import org.springframework.context.annotation.Bean;
@@ -134,7 +134,7 @@ private void testCustomAnnotation(List<ServiceInstance> instances) {
 	}
 
 	private void testExternalNameService(DiscoveryClient discoveryClient) {
-		KubernetesExternalNameServiceInstance externalNameService = (KubernetesExternalNameServiceInstance) discoveryClient
+		ExternalNameKubernetesServiceInstance externalNameService = (ExternalNameKubernetesServiceInstance) discoveryClient
 			.getInstances("external-name-service")
 			.get(0);