Skip to content

Commit 736a365

Browse files
wind57wind57
committed
checkstyle
1 parent 8c0474b commit 736a365

File tree

1 file changed

+15
-21
lines changed

1 file changed

+15
-21
lines changed

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

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void kubernetesReloadEnabledButSecretAndConfigDisabled() {
175175
@Test
176176
void reloadEventEnabledMonitoringConfigMapsEnabledByDefault() {
177177
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
178-
"spring.main.cloud-platform=KUBERNETES");
178+
"spring.main.cloud-platform=KUBERNETES");
179179
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
180180
Assertions.assertEquals(map.size(), 1);
181181
Assertions.assertTrue(map.values()
@@ -199,8 +199,7 @@ void reloadEventEnabledMonitoringConfigMapsEnabledByDefault() {
199199
@Test
200200
void reloadEventEnabledMonitoringConfigMapsEnabled() {
201201
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
202-
"spring.cloud.kubernetes.reload.mode=event",
203-
"spring.main.cloud-platform=KUBERNETES");
202+
"spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES");
204203
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
205204
Assertions.assertEquals(map.size(), 1);
206205
Assertions.assertTrue(map.values()
@@ -262,8 +261,7 @@ void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsDisabled()
262261
@Test
263262
void reloadPollingEnabledMonitoringConfigMapsEnabled() {
264263
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
265-
"spring.cloud.kubernetes.reload.mode=polling",
266-
"spring.main.cloud-platform=KUBERNETES");
264+
"spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES");
267265
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
268266
Assertions.assertEquals(map.size(), 1);
269267
Assertions.assertTrue(
@@ -285,8 +283,7 @@ void reloadPollingEnabledMonitoringConfigMapsEnabled() {
285283
@Test
286284
void reloadEventEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() {
287285
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
288-
"spring.main.cloud-platform=KUBERNETES",
289-
"spring.cloud.kubernetes.reload.monitoring-secrets=true",
286+
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true",
290287
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
291288
"spring.cloud.kubernetes.reload.mode=event");
292289
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
@@ -313,8 +310,7 @@ void reloadEventEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() {
313310
@Test
314311
void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() {
315312
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
316-
"spring.main.cloud-platform=KUBERNETES",
317-
"spring.cloud.kubernetes.reload.monitoring-secrets=true",
313+
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true",
318314
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
319315
"spring.cloud.kubernetes.reload.mode=polling");
320316
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
@@ -338,8 +334,7 @@ void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled()
338334
@Test
339335
void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
340336
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
341-
"spring.main.cloud-platform=KUBERNETES",
342-
"spring.cloud.kubernetes.reload.monitoring-secrets=true",
337+
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true",
343338
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
344339
"spring.cloud.kubernetes.reload.mode=event");
345340
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
@@ -366,9 +361,8 @@ void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
366361
*/
367362
@Test
368363
void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
369-
setup("spring.cloud.bootstrap.enabled=true","spring.cloud.kubernetes.reload.enabled=true",
370-
"spring.main.cloud-platform=KUBERNETES",
371-
"spring.cloud.kubernetes.reload.monitoring-secrets=true",
364+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
365+
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true",
372366
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
373367
"spring.cloud.kubernetes.reload.mode=polling");
374368
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
@@ -438,8 +432,8 @@ void reloadPollingEnabledMonitorConfigMapsDisabledMonitoringSecretsDisabled() {
438432
@Test
439433
void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() {
440434
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
441-
"spring.cloud.kubernetes.reload.mode=event",
442-
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=true",
435+
"spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES",
436+
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
443437
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
444438
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
445439
Assertions.assertEquals(map.size(), 1);
@@ -465,8 +459,8 @@ void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() {
465459
@Test
466460
void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() {
467461
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
468-
"spring.cloud.kubernetes.reload.mode=polling",
469-
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=true",
462+
"spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES",
463+
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
470464
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
471465
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
472466
Assertions.assertEquals(map.size(), 1);
@@ -489,15 +483,15 @@ void kubernetesConfigAndSecretEnabledByDefault() {
489483
@Test
490484
void kubernetesConfigEnabledButSecretDisabled() {
491485
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.secrets.enabled=false",
492-
"spring.main.cloud-platform=KUBERNETES");
486+
"spring.main.cloud-platform=KUBERNETES");
493487
assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue();
494488
assertThat(context.containsBean("secretsPropertySourceLocator")).isFalse();
495489
}
496490

497491
@Test
498492
void kubernetesSecretsEnabledButConfigDisabled() {
499-
setup("spring.cloud.bootstrap.enabled=true",
500-
"spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES");
493+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.config.enabled=false",
494+
"spring.main.cloud-platform=KUBERNETES");
501495
assertThat(context.containsBean("configMapPropertySourceLocator")).isFalse();
502496
assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue();
503497
}

0 commit comments

Comments
 (0)