From 401631bc9cf7899ac6dc514e3fccdc0fdbf5c909 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 17 Nov 2023 01:45:03 +0000 Subject: [PATCH] Bumping versions --- .../ConfigServerBootstrapperTests.java | 26 +++--- .../KubernetesDiscoveryClientTests.java | 80 +++++++++---------- ...ubernetesReactiveDiscoveryClientTests.java | 72 ++++++++--------- 3 files changed, 89 insertions(+), 89 deletions(-) diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapperTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapperTests.java index ab4d97f7..ff57b137 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapperTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapperTests.java @@ -69,19 +69,19 @@ class ConfigServerBootstrapperTests { wireMockServer.start(); WireMock.configureFor(wireMockServer.port()); String APPS_NAME = """ - [{ - "instanceId": "uid2", - "serviceId": "spring-cloud-kubernetes-configserver", - "host": "localhost", - "port": "%s", - "uri": "%s", - "secure":false, - "metadata":{"spring": "true", "http": "8080", "k8s": "true"}, - "namespace": "namespace1", - "cluster": null, - "scheme":"http" - }] - """.formatted(wireMockServer.port(), wireMockServer.baseUrl()); + [{ + "instanceId": "uid2", + "serviceId": "spring-cloud-kubernetes-configserver", + "host": "localhost", + "port": "%s", + "uri": "%s", + "secure":false, + "metadata":{"spring": "true", "http": "8080", "k8s": "true"}, + "namespace": "namespace1", + "cluster": null, + "scheme":"http" + }] + """.formatted(wireMockServer.port(), wireMockServer.baseUrl()); System.out.println(APPS_NAME); diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTests.java index f620c0c8..6a81b483 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTests.java @@ -46,54 +46,54 @@ import static org.assertj.core.api.Assertions.assertThat; class KubernetesDiscoveryClientTests { private static final String APPS = """ - [{ - "name": "test-svc-1", - "serviceInstances": [{ - "instanceId": "uid1", - "serviceId": "test-svc-1", + "name": "test-svc-1", + "serviceInstances": + [{ + "instanceId": "uid1", + "serviceId": "test-svc-1", + "host": "2.2.2.2", + "port": 8080, + "uri": "http://2.2.2.2:8080", + "secure": false, + "metadata":{"http": "8080"}, + "namespace": "namespace1", + "cluster": null, + "scheme": "http" + }] + }, + { + "name": "test-svc-3", + "serviceInstances": + [{ + "instanceId": "uid2", + "serviceId": "test-svc-3", + "host": "2.2.2.2", + "port": 8080, + "uri": "http://2.2.2.2:8080", + "secure": false, + "metadata": {"spring": "true", "http": "8080", "k8s": "true"}, + "namespace": "namespace2", + "cluster":null, + "scheme":"http" + }] + }] + """; + + private static final String APPS_NAME = """ + [{ + "instanceId": "uid2", + "serviceId": "test-svc-3", "host": "2.2.2.2", "port": 8080, "uri": "http://2.2.2.2:8080", "secure": false, - "metadata":{"http": "8080"}, - "namespace": "namespace1", + "metadata": {"spring": "true", "http": "8080", "k8s": "true"}, + "namespace": "namespace2", "cluster": null, "scheme": "http" }] - }, - { - "name": "test-svc-3", - "serviceInstances": - [{ - "instanceId": "uid2", - "serviceId": "test-svc-3", - "host": "2.2.2.2", - "port": 8080, - "uri": "http://2.2.2.2:8080", - "secure": false, - "metadata": {"spring": "true", "http": "8080", "k8s": "true"}, - "namespace": "namespace2", - "cluster":null, - "scheme":"http" - }] - }] - """; - - private static final String APPS_NAME = """ - [{ - "instanceId": "uid2", - "serviceId": "test-svc-3", - "host": "2.2.2.2", - "port": 8080, - "uri": "http://2.2.2.2:8080", - "secure": false, - "metadata": {"spring": "true", "http": "8080", "k8s": "true"}, - "namespace": "namespace2", - "cluster": null, - "scheme": "http" - }] - """; + """; private static WireMockServer wireMockServer; diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesReactiveDiscoveryClientTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesReactiveDiscoveryClientTests.java index 9af8e51c..376ff2d4 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesReactiveDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesReactiveDiscoveryClientTests.java @@ -39,25 +39,41 @@ import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options class KubernetesReactiveDiscoveryClientTests { private static final String APPS = """ - [{ - "name": "test-svc-1", - "serviceInstances": - [{ - "instanceId": "uid1", - "serviceId": "test-svc-1", - "host": "2.2.2.2", - "port": 8080, - "uri": "http://2.2.2.2:8080", - "secure": false, - "metadata": {"http":"8080"}, - "namespace": "namespace1", - "cluster": null, - "scheme": "http" - }] - }, - { - "name": "test-svc-3", - "serviceInstances": + [{ + "name": "test-svc-1", + "serviceInstances": + [{ + "instanceId": "uid1", + "serviceId": "test-svc-1", + "host": "2.2.2.2", + "port": 8080, + "uri": "http://2.2.2.2:8080", + "secure": false, + "metadata": {"http":"8080"}, + "namespace": "namespace1", + "cluster": null, + "scheme": "http" + }] + }, + { + "name": "test-svc-3", + "serviceInstances": + [{ + "instanceId": "uid2", + "serviceId": "test-svc-3", + "host": "2.2.2.2", + "port": 8080, + "uri": "http://2.2.2.2:8080", + "secure": false, + "metadata": {"spring": "true", "http": "8080", "k8s": "true"}, + "namespace": "namespace1", + "cluster": null, + "scheme": "http" + }] + }] + """; + + private static final String APPS_NAME = """ [{ "instanceId": "uid2", "serviceId": "test-svc-3", @@ -70,23 +86,7 @@ class KubernetesReactiveDiscoveryClientTests { "cluster": null, "scheme": "http" }] - }] - """; - - private static final String APPS_NAME = """ - [{ - "instanceId": "uid2", - "serviceId": "test-svc-3", - "host": "2.2.2.2", - "port": 8080, - "uri": "http://2.2.2.2:8080", - "secure": false, - "metadata": {"spring": "true", "http": "8080", "k8s": "true"}, - "namespace": "namespace1", - "cluster": null, - "scheme": "http" - }] - """; + """; private static WireMockServer wireMockServer;