Skip to content

Commit 484fb92

Browse files
committed
fix-1641: fix checkstyle
Signed-off-by: wind57 <[email protected]>
1 parent 2b65fd7 commit 484fb92

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
package org.springframework.cloud.kubernetes.commons.discovery;
1818

19-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
20-
2119
import java.io.Serializable;
2220
import java.net.URI;
2321
import java.util.Map;
2422

23+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
24+
2525
import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.HTTP;
2626
import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.HTTPS;
2727
import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.NAMESPACE_METADATA_KEY;

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

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -89,38 +89,36 @@ void defaultKubernetesServiceInstanceSerializationTest() throws JsonProcessingEx
8989
void defaultKubernetesServiceInstanceDeserializationTest() throws JsonProcessingException {
9090

9191
String serialized = """
92-
{
93-
"instanceId": "instanceId",
94-
"serviceId": "serviceId",
95-
"host": "host",
96-
"port": 8080,
97-
"metadata": {
98-
"k8s_namespace": "spring-k8s"
99-
},
100-
"secure": true,
101-
"namespace": "namespace",
102-
"cluster": "cluster",
103-
"podMetadata": {
104-
"pod_root": {
105-
"pod_key": "pod_value"
106-
}
107-
},
108-
"scheme": "https",
109-
"uri": "https://host:8080"
110-
}
111-
""";
112-
113-
ServiceInstance deserialized =
114-
new ObjectMapper().readValue(serialized, DefaultKubernetesServiceInstance.class);
92+
{
93+
"instanceId": "instanceId",
94+
"serviceId": "serviceId",
95+
"host": "host",
96+
"port": 8080,
97+
"metadata": {
98+
"k8s_namespace": "spring-k8s"
99+
},
100+
"secure": true,
101+
"namespace": "namespace",
102+
"cluster": "cluster",
103+
"podMetadata": {
104+
"pod_root": {
105+
"pod_key": "pod_value"
106+
}
107+
},
108+
"scheme": "https",
109+
"uri": "https://host:8080"
110+
}
111+
""";
112+
113+
ServiceInstance deserialized = new ObjectMapper().readValue(serialized, DefaultKubernetesServiceInstance.class);
115114
assertThat(deserialized.getInstanceId()).isEqualTo("instanceId");
116115
assertThat(deserialized.getServiceId()).isEqualTo("serviceId");
117116
assertThat(deserialized.getScheme()).isEqualTo("https");
118117
assertThat(deserialized.getHost()).isEqualTo("host");
119118
assertThat(deserialized.getPort()).isEqualTo(8080);
120119
assertThat(deserialized.getUri().toASCIIString()).isEqualTo("https://host:8080");
121-
assertThat(deserialized.getMetadata()).containsExactlyInAnyOrderEntriesOf(
122-
Map.of("k8s_namespace", "spring-k8s")
123-
);
120+
assertThat(deserialized.getMetadata())
121+
.containsExactlyInAnyOrderEntriesOf(Map.of("k8s_namespace", "spring-k8s"));
124122
}
125123

126124
@Test

0 commit comments

Comments
 (0)