Skip to content

Commit 503d905

Browse files
wind57wind57
committed
dirty
1 parent 6d12070 commit 503d905

File tree

15 files changed

+28
-36
lines changed

15 files changed

+28
-36
lines changed

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ void namedSingleConfigMapFails(CapturedOutput output) {
109109

110110
stubFor(get(path).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
111111

112-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
113-
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
112+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
113+
true, name, namespace, false, true, false, RetryProperties.DEFAULT);
114114

115115
CoreV1Api api = new CoreV1Api();
116116
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadConfigMapTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ ConfigReloadProperties configReloadProperties() {
238238
@Bean
239239
@Primary
240240
ConfigMapConfigProperties configMapConfigProperties() {
241-
return new ConfigMapConfigProperties(true, List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE,
242-
false, true, FAIL_FAST, RetryProperties.DEFAULT);
241+
return new ConfigMapConfigProperties(true, List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false,
242+
true, FAIL_FAST, RetryProperties.DEFAULT);
243243
}
244244

245245
@Bean

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadSecretTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ ConfigReloadProperties configReloadProperties() {
243243
@Bean
244244
@Primary
245245
SecretsConfigProperties secretsConfigProperties() {
246-
return new SecretsConfigProperties(true, Map.of(), List.of(), true, SECRET_NAME, NAMESPACE,
247-
false, true, FAIL_FAST, RetryProperties.DEFAULT);
246+
return new SecretsConfigProperties(true, Map.of(), List.of(), true, SECRET_NAME, NAMESPACE, false, true,
247+
FAIL_FAST, RetryProperties.DEFAULT);
248248
}
249249

250250
@Bean

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ ConfigReloadProperties configReloadProperties() {
217217
@Bean
218218
@Primary
219219
ConfigMapConfigProperties configMapConfigProperties() {
220-
return new ConfigMapConfigProperties(true, List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE,
221-
false, true, FAIL_FAST, RetryProperties.DEFAULT);
220+
return new ConfigMapConfigProperties(true, List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false,
221+
true, FAIL_FAST, RetryProperties.DEFAULT);
222222
}
223223

224224
@Bean

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ ConfigReloadProperties configReloadProperties() {
219219
@Bean
220220
@Primary
221221
SecretsConfigProperties secretsConfigProperties() {
222-
return new SecretsConfigProperties(true, Map.of(), List.of(), true, SECRET_NAME, NAMESPACE,
223-
false, true, FAIL_FAST, RetryProperties.DEFAULT);
222+
return new SecretsConfigProperties(true, Map.of(), List.of(), true, SECRET_NAME, NAMESPACE, false, true,
223+
FAIL_FAST, RetryProperties.DEFAULT);
224224
}
225225

226226
@Bean

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ void namedSingleConfigMapFails(CapturedOutput output) {
7171

7272
mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
7373

74-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
75-
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
74+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
75+
true, name, namespace, false, true, false, RetryProperties.DEFAULT);
7676

7777
Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
7878
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ void namedSingleSecretFails(CapturedOutput output) {
7070

7171
mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
7272

73-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
74-
List.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
73+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(), true,
74+
name, namespace, false, true, false, RetryProperties.DEFAULT);
7575

7676
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
7777
secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -215,8 +215,8 @@ void labeledTwoSecretsOneFails(CapturedOutput output) {
215215
Source sourceTwo = new Source(null, namespace, secretTwoLabels, null, null, null);
216216

217217
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
218-
Map.of("one", "1", "two", "2"), List.of(sourceOne, sourceTwo), true, null, namespace, false,
219-
true, false, RetryProperties.DEFAULT);
218+
Map.of("one", "1", "two", "2"), List.of(sourceOne, sourceTwo), true, null, namespace, false, true,
219+
false, RetryProperties.DEFAULT);
220220

221221
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
222222
secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -255,8 +255,8 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
255255
Source sourceTwo = new Source(null, namespace, secretTwoLabels, null, null, null);
256256

257257
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
258-
Map.of("one", "1", "two", "2"), List.of(sourceOne, sourceTwo), true, null, namespace, false,
259-
true, false, RetryProperties.DEFAULT);
258+
Map.of("one", "1", "two", "2"), List.of(sourceOne, sourceTwo), true, null, namespace, false, true,
259+
false, RetryProperties.DEFAULT);
260260

261261
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
262262
secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadConfigMapTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ ConfigReloadProperties configReloadProperties() {
184184
@Bean
185185
@Primary
186186
ConfigMapConfigProperties configMapConfigProperties() {
187-
return new ConfigMapConfigProperties(true, List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE,
188-
false, true, FAIL_FAST, RetryProperties.DEFAULT);
187+
return new ConfigMapConfigProperties(true, List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false,
188+
true, FAIL_FAST, RetryProperties.DEFAULT);
189189
}
190190

191191
@Bean

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadSecretTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ ConfigReloadProperties configReloadProperties() {
191191
@Bean
192192
@Primary
193193
SecretsConfigProperties secretsConfigProperties() {
194-
return new SecretsConfigProperties(true, Map.of(), List.of(), true, SECRET_NAME, NAMESPACE,
195-
false, true, FAIL_FAST, RetryProperties.DEFAULT);
194+
return new SecretsConfigProperties(true, Map.of(), List.of(), true, SECRET_NAME, NAMESPACE, false, true,
195+
FAIL_FAST, RetryProperties.DEFAULT);
196196
}
197197

198198
@Bean

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ ConfigReloadProperties configReloadProperties() {
177177
@Bean
178178
@Primary
179179
ConfigMapConfigProperties configMapConfigProperties() {
180-
return new ConfigMapConfigProperties(true, List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE,
181-
false, true, FAIL_FAST, RetryProperties.DEFAULT);
180+
return new ConfigMapConfigProperties(true, List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false,
181+
true, FAIL_FAST, RetryProperties.DEFAULT);
182182
}
183183

184184
@Bean

0 commit comments

Comments
 (0)