From 815f34e954fa254a29d870982922563824d50e06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 15:41:57 -0400 Subject: [PATCH 1/2] Bump @springio/asciidoctor-extensions in /docs (#1482) Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.16 to 1.0.0-alpha.17. - [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.16...v1.0.0-alpha.17) --- updated-dependencies: - dependency-name: "@springio/asciidoctor-extensions" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 9e455a6d..45cdd10b 100644 --- a/docs/package.json +++ b/docs/package.json @@ -5,6 +5,6 @@ "@antora/collector-extension": "1.0.1", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.4", - "@springio/asciidoctor-extensions": "1.0.0-alpha.16" + "@springio/asciidoctor-extensions": "1.0.0-alpha.17" } } From 10ed7213ecb0210f4ef8cb86e94fcf80b3f5a104 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 11 Apr 2025 15:50:10 +0200 Subject: [PATCH 2/2] Fix checkstyle. Revert debug changes. Refactor. Signed-off-by: Olga Maciaszek-Sharma --- .../loadbalancer/LoadBalancerUriTools.java | 2 +- .../client/loadbalancer/RequestData.java | 1 - .../RetryLoadBalancerInterceptorTests.java | 16 +- .../RefreshScopeIntegrationTests.java | 62 ++--- .../config/BootstrapConfigurationTests.java | 239 +++++++++--------- .../encrypt/EncryptorFactoryTests.java | 7 +- .../refresh/RefreshScopeIntegrationTests.java | 62 ++--- ...rviceInstanceListSupplierBuilderTests.java | 4 +- 8 files changed, 197 insertions(+), 196 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriTools.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriTools.java index 7715875d..c23d0f29 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriTools.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriTools.java @@ -56,7 +56,7 @@ public final class LoadBalancerUriTools { boolean encoded = (uri.getRawQuery() != null && uri.getRawQuery().contains(PERCENTAGE_SIGN)) || (uri.getRawPath() != null && uri.getRawPath().contains(PERCENTAGE_SIGN)) || (uri.getRawFragment() != null && uri.getRawFragment().contains(PERCENTAGE_SIGN)); - // Verify if it is really fully encoded. Treat partial encoded as unencoded. + // Verify if it is real ly fully encoded. Treat partial encoded as unencoded. if (encoded) { try { UriComponentsBuilder.fromUri(uri).build(true); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RequestData.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RequestData.java index 8c320190..94821a70 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RequestData.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RequestData.java @@ -19,7 +19,6 @@ package org.springframework.cloud.client.loadbalancer; import java.net.URI; import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptorTests.java index 62205271..3f3f2936 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,6 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -56,6 +55,9 @@ import org.springframework.retry.backoff.NoBackOffPolicy; import org.springframework.retry.listener.RetryListenerSupport; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIOException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.BDDAssertions.then; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -117,7 +119,7 @@ public class RetryLoadBalancerInterceptorTests { when(lbRequestFactory.createRequest(any(), any(), any())).thenReturn(mock(LoadBalancerRequest.class)); - Assertions.assertThrows(IOException.class, () -> interceptor.intercept(request, body, execution)); + assertThatIOException().isThrownBy(() -> interceptor.intercept(request, body, execution)); verify(lbRequestFactory).createRequest(request, body, execution); } @@ -130,7 +132,7 @@ public class RetryLoadBalancerInterceptorTests { loadBalancedRetryFactory, lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); - Assertions.assertThrows(IllegalStateException.class, () -> interceptor.intercept(request, body, execution)); + assertThatIllegalStateException().isThrownBy(() -> interceptor.intercept(request, body, execution)); } @Test @@ -288,7 +290,7 @@ public class RetryLoadBalancerInterceptorTests { new MyLoadBalancedRetryFactory(policy), lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); - Assertions.assertThrows(IOException.class, () -> interceptor.intercept(request, body, execution)); + assertThatIOException().isThrownBy(() -> interceptor.intercept(request, body, execution)); verify(lbRequestFactory).createRequest(request, body, execution); } @@ -370,8 +372,8 @@ public class RetryLoadBalancerInterceptorTests { new MyLoadBalancedRetryFactory(policy, backOffPolicy, new RetryListener[] { myRetryListener }), lbFactory); ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); - Assertions.assertThrows(TerminatedRetryException.class, - () -> interceptor.intercept(request, new byte[] {}, execution)); + assertThatExceptionOfType(TerminatedRetryException.class) + .isThrownBy(() -> interceptor.intercept(request, new byte[] {}, execution)); } @Test diff --git a/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/RefreshScopeIntegrationTests.java b/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/RefreshScopeIntegrationTests.java index 57cc81f3..fa6fb5e7 100644 --- a/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/RefreshScopeIntegrationTests.java +++ b/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/RefreshScopeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ package org.springframework.cloud.context.integration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -42,6 +41,7 @@ import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.test.annotation.DirtiesContext; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.BDDAssertions.then; @SpringBootTest(classes = TestConfiguration.class) @@ -71,12 +71,12 @@ public class RefreshScopeIntegrationTests { @Test @DirtiesContext public void testSimpleProperties() { - then(this.service.getMessage()).isEqualTo("Hello scope!"); - then(this.service instanceof Advised).isTrue(); + then(service.getMessage()).isEqualTo("Hello scope!"); + then(service instanceof Advised).isTrue(); // Change the dynamic property source... - this.properties.setMessage("Foo"); + properties.setMessage("Foo"); // ...but don't refresh, so the bean stays the same: - then(this.service.getMessage()).isEqualTo("Hello scope!"); + then(service.getMessage()).isEqualTo("Hello scope!"); then(ExampleService.getInitCount()).isEqualTo(0); then(ExampleService.getDestroyCount()).isEqualTo(0); } @@ -84,14 +84,14 @@ public class RefreshScopeIntegrationTests { @Test @DirtiesContext public void testRefresh() { - then(this.service.getMessage()).isEqualTo("Hello scope!"); - String id1 = this.service.toString(); + then(service.getMessage()).isEqualTo("Hello scope!"); + String id1 = service.toString(); // Change the dynamic property source... - this.properties.setMessage("Foo"); + properties.setMessage("Foo"); // ...and then refresh, so the bean is re-initialized: - this.scope.refreshAll(); - String id2 = this.service.toString(); - then(this.service.getMessage()).isEqualTo("Foo"); + scope.refreshAll(); + String id2 = service.toString(); + then(service.getMessage()).isEqualTo("Foo"); then(ExampleService.getInitCount()).isEqualTo(1); then(ExampleService.getDestroyCount()).isEqualTo(1); then(id2).isNotSameAs(id1); @@ -102,15 +102,15 @@ public class RefreshScopeIntegrationTests { @Test @DirtiesContext public void testRefreshBean() { - then(this.service.getMessage()).isEqualTo("Hello scope!"); - String id1 = this.service.toString(); + then(service.getMessage()).isEqualTo("Hello scope!"); + String id1 = service.toString(); // Change the dynamic property source... - this.properties.setMessage("Foo"); + properties.setMessage("Foo"); // ...and then refresh, so the bean is re-initialized: - this.scope.refresh("service"); - String id2 = this.service.toString(); - then(this.service.getMessage()).isEqualTo("Foo"); - then(this.service.getMessage()).isEqualTo("Foo"); + scope.refresh("service"); + String id2 = service.toString(); + then(service.getMessage()).isEqualTo("Foo"); + then(service.getMessage()).isEqualTo("Foo"); then(ExampleService.getInitCount()).isEqualTo(1); then(ExampleService.getDestroyCount()).isEqualTo(1); then(id2).isNotSameAs(id1); @@ -122,7 +122,7 @@ public class RefreshScopeIntegrationTests { @Test @DirtiesContext public void testCheckedException() { - Assertions.assertThrows(ServiceException.class, () -> this.service.throwsException()); + assertThatExceptionOfType(ServiceException.class).isThrownBy(() -> service.throwsException()); } public interface Service { @@ -168,28 +168,28 @@ public class RefreshScopeIntegrationTests { @Override public void afterPropertiesSet() { - logger.debug("Initializing message: " + this.message); + logger.debug("Initializing message: " + message); initCount++; } @Override public void destroy() { - logger.debug("Destroying message: " + this.message); + logger.debug("Destroying message: " + message); destroyCount++; - this.message = null; + message = null; } @Override public String getMessage() { - logger.debug("Getting message: " + this.message); + logger.debug("Getting message: " + message); try { - Thread.sleep(this.delay); + Thread.sleep(delay); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } - logger.info("Returning message: " + this.message); - return this.message; + logger.info("Returning message: " + message); + return message; } public void setMessage(String message) { @@ -226,8 +226,8 @@ public class RefreshScopeIntegrationTests { @RefreshScope public ExampleService service() { ExampleService service = new ExampleService(); - service.setMessage(this.properties.getMessage()); - service.setDelay(this.properties.getDelay()); + service.setMessage(properties.getMessage()); + service.setDelay(properties.getDelay()); return service; } @@ -243,7 +243,7 @@ public class RefreshScopeIntegrationTests { @ManagedAttribute public String getMessage() { - return this.message; + return message; } public void setMessage(String message) { @@ -252,7 +252,7 @@ public class RefreshScopeIntegrationTests { @ManagedAttribute public int getDelay() { - return this.delay; + return delay; } public void setDelay(int delay) { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java index a9ac9132..8a81f7d2 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -45,11 +44,12 @@ import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertySource; import org.springframework.core.env.StandardEnvironment; +import static org.assertj.core.api.Assertions.assertThatRuntimeException; import static org.assertj.core.api.BDDAssertions.then; /** * @author Dave Syer - * + * @author Olga Maciaszek-Sharma */ public class BootstrapConfigurationTests { @@ -67,11 +67,11 @@ public class BootstrapConfigurationTests { PropertySourceConfiguration.MAP.clear(); CompositePropertySourceConfiguration.MAP1.clear(); CompositePropertySourceConfiguration.MAP2.clear(); - if (this.context != null) { - this.context.close(); + if (context != null) { + context.close(); } - if (this.sibling != null) { - this.sibling.close(); + if (sibling != null) { + sibling.close(); } } @@ -90,13 +90,13 @@ public class BootstrapConfigurationTests { } private void pickupOnlyExternalBootstrapProperties(String... properties) { - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .sources(BareConfiguration.class) .properties(properties) .run(); - then(this.context.getEnvironment().getProperty("info.name")).isEqualTo("externalPropertiesInfoName"); - then(this.context.getEnvironment().getProperty("info.desc")).isNull(); - then(this.context.getEnvironment() + then(context.getEnvironment().getProperty("info.name")).isEqualTo("externalPropertiesInfoName"); + then(context.getEnvironment().getProperty("info.desc")).isNull(); + then(context.getEnvironment() .getPropertySources() .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")).isTrue(); } @@ -118,13 +118,13 @@ public class BootstrapConfigurationTests { } private void pickupAdditionalExternalBootstrapProperties(String... properties) { - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .sources(BareConfiguration.class) .properties(properties) .run(); - then(this.context.getEnvironment().getProperty("info.name")).isEqualTo("externalPropertiesInfoName"); - then(this.context.getEnvironment().getProperty("info.desc")).isEqualTo("defaultPropertiesInfoDesc"); - then(this.context.getEnvironment() + then(context.getEnvironment().getProperty("info.name")).isEqualTo("externalPropertiesInfoName"); + then(context.getEnvironment().getProperty("info.desc")).isEqualTo("defaultPropertiesInfoDesc"); + then(context.getEnvironment() .getPropertySources() .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")).isTrue(); } @@ -141,7 +141,7 @@ public class BootstrapConfigurationTests { } private void bootstrapPropertiesAvailableInInitializer(String... properties) { - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) .initializers(applicationContext -> { @@ -149,7 +149,7 @@ public class BootstrapConfigurationTests { then(applicationContext.getEnvironment().getProperty("info.name")).isEqualTo("child"); }) .run(); - then(this.context.getEnvironment() + then(context.getEnvironment() .getPropertySources() .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")).isTrue(); } @@ -177,12 +177,12 @@ public class BootstrapConfigurationTests { private void picksUpAdditionalPropertySource(String... properties) { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); - then(this.context.getEnvironment() + then(context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); + then(context.getEnvironment() .getPropertySources() .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")).isTrue(); } @@ -200,13 +200,12 @@ public class BootstrapConfigurationTests { private void failsOnPropertySource(String... properties) { System.setProperty("expected.fail", "true"); - Throwable throwable = Assertions.assertThrows(RuntimeException.class, () -> { - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + assertThatRuntimeException() + .isThrownBy(() -> context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) - .run(); - }); - then(throwable.getMessage().equals("Planned")); + .run()) + .withMessage("Planned"); } @Test @@ -225,11 +224,11 @@ public class BootstrapConfigurationTests { private void overrideSystemPropertySourceByDefault(String... properties) { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); System.setProperty("bootstrap.foo", "system"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); + then(context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); } @Test @@ -247,11 +246,11 @@ public class BootstrapConfigurationTests { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); PropertySourceConfiguration.MAP.put("spring.cloud.config.overrideSystemProperties", "false"); System.setProperty("bootstrap.foo", "system"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("system"); + then(context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("system"); } @Test @@ -273,11 +272,11 @@ public class BootstrapConfigurationTests { // their own remote property source. PropertySourceConfiguration.MAP.put("spring.cloud.config.allowOverride", "false"); System.setProperty("bootstrap.foo", "system"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); + then(context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); } @Test @@ -296,11 +295,11 @@ public class BootstrapConfigurationTests { PropertySourceConfiguration.MAP.put("spring.cloud.config.overrideSystemProperties", "false"); PropertySourceConfiguration.MAP.put("spring.cloud.config.allowOverride", "true"); System.setProperty("bootstrap.foo", "system"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("system"); + then(context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("system"); } @Test @@ -321,12 +320,12 @@ public class BootstrapConfigurationTests { ConfigurableEnvironment environment = new StandardEnvironment(); environment.getPropertySources() .addLast(new MapPropertySource("last", Collections.singletonMap("bootstrap.foo", "splat"))); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .environment(environment) .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("splat"); + then(context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("splat"); } @Test @@ -344,18 +343,18 @@ public class BootstrapConfigurationTests { private void applicationNameInBootstrapAndMain(String... properties) { System.setProperty("expected.name", "main"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().getProperty("spring.application.name")).isEqualTo("app"); + then(context.getEnvironment().getProperty("spring.application.name")).isEqualTo("app"); // The parent is called "main" because spring.application.name is specified in // other.properties (the bootstrap properties) - then(this.context.getParent().getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); + then(context.getParent().getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); // The bootstrap context has the same "bootstrap" property source - then(((ConfigurableEnvironment) this.context.getParent().getEnvironment()).getPropertySources() - .get("bootstrap")).isEqualTo(this.context.getEnvironment().getPropertySources().get("bootstrap")); - then(this.context.getId()).isEqualTo("main-1"); + then(((ConfigurableEnvironment) context.getParent().getEnvironment()).getPropertySources().get("bootstrap")) + .isEqualTo(context.getEnvironment().getPropertySources().get("bootstrap")); + then(context.getId()).isEqualTo("main-1"); } @Test @@ -373,14 +372,14 @@ public class BootstrapConfigurationTests { private void applicationNameNotInBootstrap(String... properties) { System.setProperty("expected.name", "main"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); + then(context.getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); // The parent has no name because spring.application.name is not // defined in the bootstrap properties - then(this.context.getParent().getEnvironment().getProperty("spring.application.name")).isEqualTo(null); + then(context.getParent().getEnvironment().getProperty("spring.application.name")).isEqualTo(null); } @Test @@ -396,17 +395,17 @@ public class BootstrapConfigurationTests { private void applicationNameOnlyInBootstrap(String... properties) { System.setProperty("expected.name", "main"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) .run(); // The main context is called "main" because spring.application.name is specified // in other.properties (and not in the main config file) - then(this.context.getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); + then(context.getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); // The parent is called "main" because spring.application.name is specified in // other.properties (the bootstrap properties this time) - then(this.context.getParent().getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); - then(this.context.getId()).isEqualTo("main-1"); + then(context.getParent().getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); + then(context.getId()).isEqualTo("main-1"); } @Test @@ -422,15 +421,15 @@ public class BootstrapConfigurationTests { private void environmentEnrichedOnceWhenSharedWithChildContext(String... properties) { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); - this.context = new SpringApplicationBuilder().sources(BareConfiguration.class) + context = new SpringApplicationBuilder().sources(BareConfiguration.class) .properties(properties) .environment(new StandardEnvironment()) .child(BareConfiguration.class) .web(WebApplicationType.NONE) .run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); - then(this.context.getParent().getEnvironment()).isEqualTo(this.context.getEnvironment()); - MutablePropertySources sources = this.context.getEnvironment().getPropertySources(); + then(context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); + then(context.getParent().getEnvironment()).isEqualTo(context.getEnvironment()); + MutablePropertySources sources = context.getEnvironment().getPropertySources(); PropertySource bootstrap = sources .get(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap"); then(bootstrap).isNotNull(); @@ -451,16 +450,16 @@ public class BootstrapConfigurationTests { private void onlyOneBootstrapContext(String... properties) { TestHigherPriorityBootstrapConfiguration.count.set(0); PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); - this.context = new SpringApplicationBuilder().sources(BareConfiguration.class) + context = new SpringApplicationBuilder().sources(BareConfiguration.class) .properties(properties) .child(BareConfiguration.class) .web(WebApplicationType.NONE) .run(); then(TestHigherPriorityBootstrapConfiguration.count.get()).isEqualTo(1); - then(this.context.getParent()).isNotNull(); - then(this.context.getParent().getParent().getId()).isEqualTo("bootstrap"); - then(this.context.getParent().getParent().getParent()).isNull(); - then(this.context.getEnvironment().getProperty("custom.foo")).isEqualTo("bar"); + then(context.getParent()).isNotNull(); + then(context.getParent().getParent().getId()).isEqualTo("bootstrap"); + then(context.getParent().getParent().getParent()).isNull(); + then(context.getEnvironment().getProperty("custom.foo")).isEqualTo("bar"); } @Test @@ -475,13 +474,13 @@ public class BootstrapConfigurationTests { } private void listOverride(String... properties) { - this.context = new SpringApplicationBuilder().sources(BareConfiguration.class) + context = new SpringApplicationBuilder().sources(BareConfiguration.class) .properties(properties) .child(BareConfiguration.class) .web(WebApplicationType.NONE) .run(); ListProperties listProperties = new ListProperties(); - Binder.get(this.context.getEnvironment()).bind("list", Bindable.ofInstance(listProperties)); + Binder.get(context.getEnvironment()).bind("list", Bindable.ofInstance(listProperties)); then(listProperties.getFoo().size()).isEqualTo(1); then(listProperties.getFoo().get(0)).isEqualTo("hello world"); } @@ -502,25 +501,25 @@ public class BootstrapConfigurationTests { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); SpringApplicationBuilder builder = new SpringApplicationBuilder().properties(properties) .sources(BareConfiguration.class); - this.sibling = builder.child(BareConfiguration.class) + sibling = builder.child(BareConfiguration.class) .properties("spring.application.name=sibling") .web(WebApplicationType.NONE) .run(); - this.context = builder.child(BareConfiguration.class) + context = builder.child(BareConfiguration.class) .properties("spring.application.name=context") .web(WebApplicationType.NONE) .run(); then(TestHigherPriorityBootstrapConfiguration.count.get()).isEqualTo(1); - then(this.context.getParent()).isNotNull(); - then(this.context.getParent().getParent().getId()).isEqualTo("bootstrap"); - then(this.context.getParent().getParent().getParent()).isNull(); - then(this.context.getEnvironment().getProperty("custom.foo")).isEqualTo("context"); - then(this.context.getEnvironment().getProperty("spring.application.name")).isEqualTo("context"); - then(this.sibling.getParent()).isNotNull(); - then(this.sibling.getParent().getParent().getId()).isEqualTo("bootstrap"); - then(this.sibling.getParent().getParent().getParent()).isNull(); - then(this.sibling.getEnvironment().getProperty("custom.foo")).isEqualTo("sibling"); - then(this.sibling.getEnvironment().getProperty("spring.application.name")).isEqualTo("sibling"); + then(context.getParent()).isNotNull(); + then(context.getParent().getParent().getId()).isEqualTo("bootstrap"); + then(context.getParent().getParent().getParent()).isNull(); + then(context.getEnvironment().getProperty("custom.foo")).isEqualTo("context"); + then(context.getEnvironment().getProperty("spring.application.name")).isEqualTo("context"); + then(sibling.getParent()).isNotNull(); + then(sibling.getParent().getParent().getId()).isEqualTo("bootstrap"); + then(sibling.getParent().getParent().getParent()).isNull(); + then(sibling.getEnvironment().getProperty("custom.foo")).isEqualTo("sibling"); + then(sibling.getEnvironment().getProperty("spring.application.name")).isEqualTo("sibling"); } @Test @@ -536,17 +535,17 @@ public class BootstrapConfigurationTests { private void environmentEnrichedInParentContext(String... properties) { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); - this.context = new SpringApplicationBuilder().sources(BareConfiguration.class) + context = new SpringApplicationBuilder().sources(BareConfiguration.class) .properties(properties) .child(BareConfiguration.class) .web(WebApplicationType.NONE) .run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); - then(this.context.getParent().getEnvironment()).isNotSameAs(this.context.getEnvironment()); - then(this.context.getEnvironment() + then(context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); + then(context.getParent().getEnvironment()).isNotSameAs(context.getEnvironment()); + then(context.getEnvironment() .getPropertySources() .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")).isTrue(); - then(((ConfigurableEnvironment) this.context.getParent().getEnvironment()).getPropertySources() + then(((ConfigurableEnvironment) context.getParent().getEnvironment()).getPropertySources() .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")).isTrue(); } @@ -559,29 +558,29 @@ public class BootstrapConfigurationTests { .profiles("parent") .web(WebApplicationType.NONE) .run(); - this.context = new SpringApplicationBuilder(BareConfiguration.class) + context = new SpringApplicationBuilder(BareConfiguration.class) .properties("spring.config.use-legacy-processing=true") .profiles("child") .parent(parent) .web(WebApplicationType.NONE) .run(); - then(this.context.getParent().getEnvironment()).isNotSameAs(this.context.getEnvironment()); + then(context.getParent().getEnvironment()).isNotSameAs(context.getEnvironment()); // The ApplicationContext merges profiles (profiles and property sources), see // AbstractEnvironment.merge() - then(this.context.getEnvironment().acceptsProfiles("child", "parent")).isTrue(); + then(context.getEnvironment().acceptsProfiles("child", "parent")).isTrue(); // But the parent is not a child - then(this.context.getParent().getEnvironment().acceptsProfiles("child")).isFalse(); - then(this.context.getParent().getEnvironment().acceptsProfiles("parent")).isTrue(); - then(((ConfigurableEnvironment) this.context.getParent().getEnvironment()).getPropertySources() + then(context.getParent().getEnvironment().acceptsProfiles("child")).isFalse(); + then(context.getParent().getEnvironment().acceptsProfiles("parent")).isTrue(); + then(((ConfigurableEnvironment) context.getParent().getEnvironment()).getPropertySources() .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")).isTrue(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); + then(context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); // The "bootstrap" property source is not shared now, but it has the same // properties in it because they are pulled from the PropertySourceConfiguration // below - then(this.context.getParent().getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); + then(context.getParent().getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); // The parent property source is there in the child because they are both in the // "parent" profile (by virtue of the merge in AbstractEnvironment) - then(this.context.getEnvironment().getProperty("info.name")).isEqualTo("parent"); + then(context.getEnvironment().getProperty("info.name")).isEqualTo("parent"); } @Test @@ -597,37 +596,37 @@ public class BootstrapConfigurationTests { private void includeProfileFromBootstrapPropertySource(String... properties) { PropertySourceConfiguration.MAP.put("spring.profiles.include", "bar,baz"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .profiles("foo") .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().acceptsProfiles("baz")).isTrue(); - then(this.context.getEnvironment().acceptsProfiles("bar")).isTrue(); + then(context.getEnvironment().acceptsProfiles("baz")).isTrue(); + then(context.getEnvironment().acceptsProfiles("bar")).isTrue(); } @Test public void activeProfileFromBootstrapPropertySource() { activeProfileFromBootstrapPropertySource("spring.config.use-legacy-processing=true"); - then(this.context.getEnvironment().getActiveProfiles()).contains("foo"); + then(context.getEnvironment().getActiveProfiles()).contains("foo"); } @Test public void activeProfileFromBootstrapPropertySourceWithAppContext() { activeProfileFromBootstrapPropertySource("spring.config.use-legacy-processing=true", "spring.cloud.config.initialize-on-context-refresh=true"); - then(this.context.getEnvironment().getActiveProfiles()).doesNotContain("after"); - then(this.context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo"); + then(context.getEnvironment().getActiveProfiles()).doesNotContain("after"); + then(context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo"); } private void activeProfileFromBootstrapPropertySource(String... properties) { PropertySourceConfiguration.MAP.put("spring.profiles.active", "bar,baz"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .profiles("foo") .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().acceptsProfiles("baz", "bar", "foo")).isTrue(); + then(context.getEnvironment().acceptsProfiles("baz", "bar", "foo")).isTrue(); } @@ -645,13 +644,13 @@ public class BootstrapConfigurationTests { private void activeAndIncludeProfileFromBootstrapPropertySource(String... properties) { PropertySourceConfiguration.MAP.put("spring.profiles.active", "bar,baz"); PropertySourceConfiguration.MAP.put("spring.profiles.include", "bar,baz,hello"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .profiles("foo") .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().acceptsProfiles("baz", "bar", "hello", "foo")).isTrue(); - then(this.context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo", "hello"); + then(context.getEnvironment().acceptsProfiles("baz", "bar", "hello", "foo")).isTrue(); + then(context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo", "hello"); } @Test @@ -669,13 +668,13 @@ public class BootstrapConfigurationTests { private void activeAndIncludeProfileFromBootstrapPropertySourceWithReplacement(String... properties) { PropertySourceConfiguration.MAP.put("spring.profiles.active", "${barreplacement},baz"); PropertySourceConfiguration.MAP.put("spring.profiles.include", "${barreplacement},baz,hello"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .profiles("foo") .sources(BareConfiguration.class) .run(); - then(this.context.getEnvironment().acceptsProfiles("baz", "bar", "hello", "foo")).isTrue(); - then(this.context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo", "hello"); + then(context.getEnvironment().acceptsProfiles("baz", "bar", "hello", "foo")).isTrue(); + then(context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo", "hello"); } @Test @@ -691,12 +690,12 @@ public class BootstrapConfigurationTests { } private void includeProfileFromBootstrapProperties(String... properties) { - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .sources(BareConfiguration.class) .properties(properties) .run(); - then(this.context.getEnvironment().acceptsProfiles("local")).isTrue(); - then(this.context.getEnvironment().getProperty("added")).isEqualTo("Hello added!"); + then(context.getEnvironment().acceptsProfiles("local")).isTrue(); + then(context.getEnvironment().getProperty("added")).isEqualTo("Hello added!"); } @Test @@ -712,28 +711,28 @@ public class BootstrapConfigurationTests { } private void nonEnumerablePropertySourceWorks(String... properties) { - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .sources(BareConfiguration.class) .properties(properties) .run(); - then(this.context.getEnvironment().getProperty("foo")).isEqualTo("bar"); + then(context.getEnvironment().getProperty("foo")).isEqualTo("bar"); } @Test void activeAndIncludeProfileFromBootstrapPropertySource_WhenMultiplePlacesHaveActiveProfileProperties_ShouldOnlyAcceptTheTopPriority() { String[] properties = new String[] { "spring.config.use-legacy-processing=true" }; - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .properties(properties) .sources(BareConfiguration.class) .run("--spring.profiles.active=prod,secure"); - then(this.context.getEnvironment().acceptsProfiles("prod", "secure")).isTrue(); + then(context.getEnvironment().acceptsProfiles("prod", "secure")).isTrue(); // active profile from property sources with lower priority should not be included - then(this.context.getEnvironment().acceptsProfiles("local")).isFalse(); - then(this.context.getEnvironment().getActiveProfiles()).contains("prod", "secure"); - then(this.context.getEnvironment().getActiveProfiles()).doesNotContain("local"); + then(context.getEnvironment().acceptsProfiles("local")).isFalse(); + then(context.getEnvironment().getActiveProfiles()).contains("prod", "secure"); + then(context.getEnvironment().getActiveProfiles()).doesNotContain("local"); // check if active profile value could possibly exist in other property sources // with lower priority - then(this.context.getEnvironment() + then(context.getEnvironment() .getPropertySources() .stream() .map(p -> p.getProperty(AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME)) @@ -787,10 +786,10 @@ public class BootstrapConfigurationTests { } } } - if (this.name != null) { - then(this.name).isEqualTo(environment.getProperty("spring.application.name")); + if (name != null) { + then(name).isEqualTo(environment.getProperty("spring.application.name")); } - if (this.fail) { + if (fail) { throw new RuntimeException("Planned"); } @@ -798,7 +797,7 @@ public class BootstrapConfigurationTests { } public String getName() { - return this.name; + return name; } public void setName(String name) { @@ -806,7 +805,7 @@ public class BootstrapConfigurationTests { } public boolean isFail() { - return this.fail; + return fail; } public void setFail(boolean fail) { @@ -836,10 +835,10 @@ public class BootstrapConfigurationTests { @Override public PropertySource locate(Environment environment) { - if (this.name != null) { - then(this.name).isEqualTo(environment.getProperty("spring.application.name")); + if (name != null) { + then(name).isEqualTo(environment.getProperty("spring.application.name")); } - if (this.fail) { + if (fail) { throw new RuntimeException("Planned"); } CompositePropertySource compositePropertySource = new CompositePropertySource("listTestBootstrap"); @@ -849,7 +848,7 @@ public class BootstrapConfigurationTests { } public String getName() { - return this.name; + return name; } public void setName(String name) { @@ -857,7 +856,7 @@ public class BootstrapConfigurationTests { } public boolean isFail() { - return this.fail; + return fail; } public void setFail(boolean fail) { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptorFactoryTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptorFactoryTests.java index e6ef9d39..468d7d5d 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptorFactoryTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptorFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ package org.springframework.cloud.bootstrap.encrypt; import java.nio.charset.StandardCharsets; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.cloud.context.encrypt.EncryptorFactory; @@ -26,10 +25,12 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.security.crypto.encrypt.TextEncryptor; import org.springframework.util.StreamUtils; +import static org.assertj.core.api.Assertions.assertThatRuntimeException; import static org.assertj.core.api.BDDAssertions.then; /** * @author Biju Kunjummen + * @author Olga Maciaszek-Sharma */ public class EncryptorFactoryTests { @@ -51,7 +52,7 @@ public class EncryptorFactoryTests { -----BEGIN RSA PRIVATE KEY----- MIIEowIBAAKCAQEAwClFgrRa/PUHPIJr9gvIPL6g6Rjp/TVZmVNOf2fL96DYbkj5 """; - Assertions.assertThrows(RuntimeException.class, () -> new EncryptorFactory().create(key)); + assertThatRuntimeException().isThrownBy(() -> new EncryptorFactory().create(key)); } } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java index 2516b1d7..ededcf34 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ package org.springframework.cloud.context.scope.refresh; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -41,6 +40,7 @@ import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.test.annotation.DirtiesContext; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.BDDAssertions.then; @SpringBootTest(classes = TestConfiguration.class) @@ -69,12 +69,12 @@ public class RefreshScopeIntegrationTests { @Test @DirtiesContext public void testSimpleProperties() { - then(this.service.getMessage()).isEqualTo("Hello scope!"); - then(this.service instanceof Advised).isTrue(); + then(service.getMessage()).isEqualTo("Hello scope!"); + then(service instanceof Advised).isTrue(); // Change the dynamic property source... - this.properties.setMessage("Foo"); + properties.setMessage("Foo"); // ...but don't refresh, so the bean stays the same: - then(this.service.getMessage()).isEqualTo("Hello scope!"); + then(service.getMessage()).isEqualTo("Hello scope!"); then(ExampleService.getInitCount()).isEqualTo(0); then(ExampleService.getDestroyCount()).isEqualTo(0); } @@ -82,14 +82,14 @@ public class RefreshScopeIntegrationTests { @Test @DirtiesContext public void testRefresh() { - then(this.service.getMessage()).isEqualTo("Hello scope!"); - String id1 = this.service.toString(); + then(service.getMessage()).isEqualTo("Hello scope!"); + String id1 = service.toString(); // Change the dynamic property source... - this.properties.setMessage("Foo"); + properties.setMessage("Foo"); // ...and then refresh, so the bean is re-initialized: - this.scope.refreshAll(); - String id2 = this.service.toString(); - then(this.service.getMessage()).isEqualTo("Foo"); + scope.refreshAll(); + String id2 = service.toString(); + then(service.getMessage()).isEqualTo("Foo"); then(ExampleService.getInitCount()).isEqualTo(1); then(ExampleService.getDestroyCount()).isEqualTo(1); then(id2).isNotSameAs(id1); @@ -100,15 +100,15 @@ public class RefreshScopeIntegrationTests { @Test @DirtiesContext public void testRefreshBean() { - then(this.service.getMessage()).isEqualTo("Hello scope!"); - String id1 = this.service.toString(); + then(service.getMessage()).isEqualTo("Hello scope!"); + String id1 = service.toString(); // Change the dynamic property source... - this.properties.setMessage("Foo"); + properties.setMessage("Foo"); // ...and then refresh, so the bean is re-initialized: - this.scope.refresh("service"); - String id2 = this.service.toString(); - then(this.service.getMessage()).isEqualTo("Foo"); - then(this.service.getMessage()).isEqualTo("Foo"); + scope.refresh("service"); + String id2 = service.toString(); + then(service.getMessage()).isEqualTo("Foo"); + then(service.getMessage()).isEqualTo("Foo"); then(ExampleService.getInitCount()).isEqualTo(1); then(ExampleService.getDestroyCount()).isEqualTo(1); then(id2).isNotSameAs(id1); @@ -120,7 +120,7 @@ public class RefreshScopeIntegrationTests { @Test @DirtiesContext public void testCheckedException() { - Assertions.assertThrows(ServiceException.class, () -> this.service.throwsException()); + assertThatExceptionOfType(ServiceException.class).isThrownBy(() -> service.throwsException()); } public interface Service { @@ -166,28 +166,28 @@ public class RefreshScopeIntegrationTests { @Override public void afterPropertiesSet() throws Exception { - logger.debug("Initializing message: " + this.message); + logger.debug("Initializing message: " + message); initCount++; } @Override public void destroy() throws Exception { - logger.debug("Destroying message: " + this.message); + logger.debug("Destroying message: " + message); destroyCount++; - this.message = null; + message = null; } @Override public String getMessage() { - logger.debug("Getting message: " + this.message); + logger.debug("Getting message: " + message); try { - Thread.sleep(this.delay); + Thread.sleep(delay); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } - logger.info("Returning message: " + this.message); - return this.message; + logger.info("Returning message: " + message); + return message; } public void setMessage(String message) { @@ -224,8 +224,8 @@ public class RefreshScopeIntegrationTests { @RefreshScope public ExampleService service() { ExampleService service = new ExampleService(); - service.setMessage(this.properties.getMessage()); - service.setDelay(this.properties.getDelay()); + service.setMessage(properties.getMessage()); + service.setDelay(properties.getDelay()); return service; } @@ -241,7 +241,7 @@ public class RefreshScopeIntegrationTests { @ManagedAttribute public String getMessage() { - return this.message; + return message; } public void setMessage(String message) { @@ -250,7 +250,7 @@ public class RefreshScopeIntegrationTests { @ManagedAttribute public int getDelay() { - return this.delay; + return delay; } public void setDelay(int delay) { diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilderTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilderTests.java index 7b12ca1a..45f526dc 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilderTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 the original author or authors. + * Copyright 2013-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Import; import org.springframework.web.reactive.function.client.WebClient; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.fail; +import static org.assertj.core.api.Fail.fail; import static org.mockito.Mockito.mock; public class ServiceInstanceListSupplierBuilderTests {