Skip to content

Rename external name class (5) #2067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 13, 2025
Merged

Rename external name class (5) #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3611ed9
rename
wind57 Oct 12, 2025
72bafc3
Merge branch 'move-discovery-conditionals-to-separate-package' into r…
wind57 Oct 12, 2025
11cd7c8
fix checkstyle
wind57 Oct 12, 2025
109eec5
Merge branch 'main' into rename-external-name-class
wind57 Oct 13, 2025
3912a06
Merge branch 'move-discovery-conditionals-to-separate-package' into r…
wind57 Oct 13, 2025
4a58ff5
Merge branch 'main' into rename-external-name-class
wind57 Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ework/cloud/kubernetes/client/discovery/KubernetesClientInformerDiscoveryClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/springframework/cloud/kubernetes/commons/discovery/DiscoveryClientUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}
Expand Down
2 changes: 1 addition & 1 deletion ...ubernetesExternalNameServiceInstance.java → ...xternalNameKubernetesServiceInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...springframework/cloud/kubernetes/commons/discovery/ServiceInstanceSerializationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions ...rg/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientTwoTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions ...ingframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySimpleIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
Loading