Merge remote-tracking branch 'origin/4.1.x' into 4.2.x

Signed-off-by: Olga Maciaszek-Sharma <[email protected]>

# Conflicts:
#	docs/package.json

Author: OlgaMaciaszek

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.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.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 void interceptDisableRetry() throws Throwable {
 
 		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 void interceptInvalidHost() throws Throwable {
 				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 void interceptFailedRetry() throws Exception {
 				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 <T, E extends Throwable> boolean open(RetryContext context, RetryCallback
 				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

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 @@
 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.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,27 +71,27 @@ public void close() {
 	@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);
 	}
 
 	@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 void testRefresh() {
 	@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 void testRefreshBean() {
 	@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 void setDelay(long delay) {
 
 		@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 @@ protected static class TestConfiguration {
 		@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 @@ protected static class TestProperties {
 
 		@ManagedAttribute
 		public String getMessage() {
-			return this.message;
+			return message;
 		}
 
 		public void setMessage(String message) {
@@ -252,7 +252,7 @@ public void setMessage(String message) {
 
 		@ManagedAttribute
 		public int getDelay() {
-			return this.delay;
+			return delay;
 		}
 
 		public void setDelay(int delay) {