6363 * @author wind57
6464 */
6565@ SpringBootTest (webEnvironment = SpringBootTest .WebEnvironment .RANDOM_PORT ,
66- properties = { "spring.cloud.bootstrap.enabled=true" , "spring.cloud.kubernetes.config.enabled=true" ,
67- "spring.cloud.bootstrap.name=polling-reload-configmap-and-secret" ,
68- "spring.main.cloud-platform=KUBERNETES" , "spring.application.name=polling-reload-configmap-and-secret" ,
69- "spring.main.allow-bean-definition-overriding=true" ,
70- "spring.cloud.kubernetes.client.namespace=spring-k8s" ,
71- "logging.level.org.springframework.cloud.kubernetes.commons.config.reload=debug" },
72- classes = { PollingReloadConfigMapAndSecretTest .TestConfig .class , App .class })
66+ properties = { "spring.cloud.bootstrap.enabled=true" , "spring.cloud.kubernetes.config.enabled=true" ,
67+ "spring.cloud.bootstrap.name=polling-reload-configmap-and-secret" ,
68+ "spring.main.cloud-platform=KUBERNETES" , "spring.application.name=polling-reload-configmap-and-secret" ,
69+ "spring.main.allow-bean-definition-overriding=true" ,
70+ "spring.cloud.kubernetes.client.namespace=spring-k8s" ,
71+ "logging.level.org.springframework.cloud.kubernetes.commons.config.reload=debug" },
72+ classes = { PollingReloadConfigMapAndSecretTest .TestConfig .class , App .class })
7373@ EnableKubernetesMockClient (crud = true , https = false )
7474@ ExtendWith (OutputCaptureExtension .class )
7575class PollingReloadConfigMapAndSecretTest {
@@ -95,12 +95,12 @@ static void beforeAll() {
9595
9696 // namespace: spring-k8s, name: secret-a
9797 Map <String , String > secretA = Collections .singletonMap ("one" ,
98- Base64 .getEncoder ().encodeToString ("a" .getBytes (StandardCharsets .UTF_8 )));
98+ Base64 .getEncoder ().encodeToString ("a" .getBytes (StandardCharsets .UTF_8 )));
9999 createSecret ("secret-a" , secretA );
100100
101101 // namespace: spring-k8s, name: secret-b
102102 Map <String , String > secretB = Collections .singletonMap ("two" ,
103- Base64 .getEncoder ().encodeToString ("b" .getBytes (StandardCharsets .UTF_8 )));
103+ Base64 .getEncoder ().encodeToString ("b" .getBytes (StandardCharsets .UTF_8 )));
104104 createSecret ("secret-b" , secretB );
105105
106106 // namespace: spring-k8s, name: configmap-a
@@ -121,8 +121,8 @@ void test(CapturedOutput output) {
121121 .map (PropertySource ::getName )
122122 .collect (Collectors .toSet ());
123123 assertThat (sources ).contains ("bootstrapProperties-configmap.configmap-b.spring-k8s" ,
124- "bootstrapProperties-configmap.configmap-a.spring-k8s" ,
125- "bootstrapProperties-secret.secret-b.spring-k8s" , "bootstrapProperties-secret.secret-a.spring-k8s" );
124+ "bootstrapProperties-configmap.configmap-a.spring-k8s" ,
125+ "bootstrapProperties-secret.secret-b.spring-k8s" , "bootstrapProperties-secret.secret-a.spring-k8s" );
126126
127127 // 1. first, wait for a cycle where we see the configmaps as being the same
128128 Awaitility .await ()
@@ -171,20 +171,20 @@ static class TestConfig {
171171 @ Bean
172172 @ Primary
173173 PollingConfigMapChangeDetector pollingConfigMapChangeDetector (AbstractEnvironment environment ,
174- ConfigReloadProperties configReloadProperties , ConfigurationUpdateStrategy configurationUpdateStrategy ,
175- Fabric8ConfigMapPropertySourceLocator fabric8ConfigMapPropertySourceLocator ) {
174+ ConfigReloadProperties configReloadProperties , ConfigurationUpdateStrategy configurationUpdateStrategy ,
175+ Fabric8ConfigMapPropertySourceLocator fabric8ConfigMapPropertySourceLocator ) {
176176 ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler ();
177177 scheduler .initialize ();
178178 return new PollingConfigMapChangeDetector (environment , configReloadProperties , configurationUpdateStrategy ,
179- Fabric8ConfigMapPropertySource .class , fabric8ConfigMapPropertySourceLocator , scheduler );
179+ Fabric8ConfigMapPropertySource .class , fabric8ConfigMapPropertySourceLocator , scheduler );
180180 }
181181
182182 @ Bean
183183 @ Primary
184184 ConfigReloadProperties configReloadProperties () {
185185 return new ConfigReloadProperties (true , true , true , ConfigReloadProperties .ReloadStrategy .REFRESH ,
186- ConfigReloadProperties .ReloadDetectionMode .POLLING , Duration .ofMillis (200 ), Set .of (NAMESPACE ),
187- false , Duration .ofSeconds (2 ));
186+ ConfigReloadProperties .ReloadDetectionMode .POLLING , Duration .ofMillis (200 ), Set .of (NAMESPACE ),
187+ false , Duration .ofSeconds (2 ));
188188 }
189189
190190 @ Bean
0 commit comments