Skip to content

Commit f8b18ae

Browse files
committed
Bumping versions
1 parent a7ac576 commit f8b18ae

File tree

376 files changed

+8611
-4570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

376 files changed

+8611
-4570
lines changed

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,15 @@ class ActuatorDisabledHealthTest {
4747

4848
@Test
4949
void healthEndpointShouldNotContainKubernetes() {
50-
this.webClient.get().uri("http://localhost:{port}/actuator/health", this.port)
51-
.accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk().expectBody()
52-
.jsonPath("components.kubernetes").doesNotExist();
50+
this.webClient.get()
51+
.uri("http://localhost:{port}/actuator/health", this.port)
52+
.accept(MediaType.APPLICATION_JSON)
53+
.exchange()
54+
.expectStatus()
55+
.isOk()
56+
.expectBody()
57+
.jsonPath("components.kubernetes")
58+
.doesNotExist();
5359

5460
Assertions.assertNull(registry.getContributor("kubernetes"),
5561
"reactive kubernetes contributor must NOT be present when 'management.health.kubernetes.enabled=false'");

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private static void mocks() {
7777
pathsMockedStatic = Mockito.mockStatic(Paths.class);
7878

7979
envReaderMockedStatic.when(() -> EnvReader.getEnv(KubernetesClientPodUtils.KUBERNETES_SERVICE_HOST))
80-
.thenReturn("k8s-host");
80+
.thenReturn("k8s-host");
8181
envReaderMockedStatic.when(() -> EnvReader.getEnv(KubernetesClientPodUtils.HOSTNAME)).thenReturn("host");
8282

8383
Path serviceAccountTokenPath = Mockito.mock(Path.class);
@@ -104,7 +104,7 @@ KubernetesClientPodUtils kubernetesPodUtils() throws ApiException {
104104
mocks();
105105

106106
Mockito.when(coreV1Api.readNamespacedPod("host", "my-namespace", null))
107-
.thenThrow(new RuntimeException("just because"));
107+
.thenThrow(new RuntimeException("just because"));
108108

109109
return new KubernetesClientPodUtils(coreV1Api, "my-namespace", FAIL_FAST);
110110
}

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,15 @@ class ActuatorEnabledHealthTest {
4444

4545
@Test
4646
void healthEndpointShouldContainKubernetes() {
47-
this.webClient.get().uri("http://localhost:{port}/actuator/health", this.port)
48-
.accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk().expectBody()
49-
.jsonPath("components.kubernetes").exists();
47+
this.webClient.get()
48+
.uri("http://localhost:{port}/actuator/health", this.port)
49+
.accept(MediaType.APPLICATION_JSON)
50+
.exchange()
51+
.expectStatus()
52+
.isOk()
53+
.expectBody()
54+
.jsonPath("components.kubernetes")
55+
.exists();
5056

5157
Assertions.assertNotNull(registry.getContributor("kubernetes"),
5258
"reactive kubernetes contributor must be present when 'management.health.kubernetes.enabled=true'");

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private static void mocks() {
8080
pathsMockedStatic = Mockito.mockStatic(Paths.class);
8181

8282
envReaderMockedStatic.when(() -> EnvReader.getEnv(KubernetesClientPodUtils.KUBERNETES_SERVICE_HOST))
83-
.thenReturn("k8s-host");
83+
.thenReturn("k8s-host");
8484
envReaderMockedStatic.when(() -> EnvReader.getEnv(KubernetesClientPodUtils.HOSTNAME)).thenReturn("host");
8585

8686
Path serviceAccountTokenPath = Mockito.mock(Path.class);
@@ -107,7 +107,7 @@ KubernetesClientPodUtils kubernetesPodUtils() throws ApiException {
107107
mocks();
108108

109109
Mockito.when(coreV1Api.readNamespacedPod("host", "my-namespace", null))
110-
.thenThrow(new RuntimeException("just because"));
110+
.thenThrow(new RuntimeException("just because"));
111111

112112
return new KubernetesClientPodUtils(coreV1Api, "my-namespace", FAIL_FAST);
113113
}

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientHealthIndicatorNotInsideTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class KubernetesClientHealthIndicatorNotInsideTests {
4040
@Test
4141
public void test() {
4242
assertThatThrownBy(() -> context.getBean(KubernetesClientHealthIndicator.class))
43-
.isInstanceOf(NoSuchBeanDefinitionException.class);
43+
.isInstanceOf(NoSuchBeanDefinitionException.class);
4444
}
4545

4646
}

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientInfoContributorNotInsideTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class KubernetesClientInfoContributorNotInsideTests {
4040
@Test
4141
public void test() {
4242
assertThatThrownBy(() -> context.getBean(KubernetesClientInfoContributor.class))
43-
.isInstanceOf(NoSuchBeanDefinitionException.class);
43+
.isInstanceOf(NoSuchBeanDefinitionException.class);
4444
}
4545

4646
}

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtilsTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ void after() {
8484
@Test
8585
void constructorThrowsIllegalArgumentExceptionWhenKubeClientIsNull() {
8686
assertThatThrownBy(() -> new KubernetesClientPodUtils(null, "namespace", false))
87-
.isInstanceOf(IllegalArgumentException.class)
88-
.hasMessage("Must provide an instance of KubernetesClient");
87+
.isInstanceOf(IllegalArgumentException.class)
88+
.hasMessage("Must provide an instance of KubernetesClient");
8989
}
9090

9191
@Test

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientUtilsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void testNamespaceFromProvider() {
4848
@Test
4949
void testNamespaceResolutionFailed() {
5050
assertThatThrownBy(() -> KubernetesClientUtils.getApplicationNamespace("", "target", null))
51-
.isInstanceOf(NamespaceResolutionFailedException.class);
51+
.isInstanceOf(NamespaceResolutionFailedException.class);
5252
}
5353

5454
}

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentDefaultHeader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void testApiClientUserAgentDefaultHeader() throws MalformedURLException {
5353
Request.Builder builder = new Request.Builder();
5454
apiClient.processHeaderParams(Collections.emptyMap(), builder);
5555
assertThat(builder.url(new URL("http://example.com")).build().headers().get("User-Agent"))
56-
.isEqualTo("Spring-Cloud-Kubernetes-Application");
56+
.isEqualTo("Spring-Cloud-Kubernetes-Application");
5757
}
5858

5959
}

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/default_api/ApiClientUserAgentNonDefaultHeader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void testApiClientUserAgentDefaultHeader() throws MalformedURLException {
5757
Request.Builder builder = new Request.Builder();
5858
apiClient.processHeaderParams(Collections.emptyMap(), builder);
5959
assertThat(builder.url(new URL("http://example.com")).build().headers().get("User-Agent"))
60-
.isEqualTo("non-default");
60+
.isEqualTo("non-default");
6161
}
6262

6363
}

0 commit comments

Comments
 (0)