Merge branch '3.0.x' into 3.1.x

mhalbritter · mhalbritter · commit 607ed86edba7 · 2023-10-31T10:23:01.000+01:00
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java
@@ -53,8 +53,6 @@ class ReactiveCloudFoundrySecurityService {
 
 	private final String cloudControllerUrl;
 
-	private Mono<String> uaaUrl;
-
 	ReactiveCloudFoundrySecurityService(WebClient.Builder webClientBuilder, String cloudControllerUrl,
 			boolean skipSslValidation) {
 		Assert.notNull(webClientBuilder, "WebClient must not be null");
@@ -149,15 +147,14 @@ private Map<String, String> extractTokenKeys(Map<String, Object> response) {
 	 * @return the UAA url Mono
 	 */
 	Mono<String> getUaaUrl() {
-		this.uaaUrl = this.webClient.get()
+		return this.webClient.get()
 			.uri(this.cloudControllerUrl + "/info")
 			.retrieve()
 			.bodyToMono(Map.class)
 			.map((response) -> (String) response.get("token_endpoint"))
 			.cache()
 			.onErrorMap((ex) -> new CloudFoundryAuthorizationException(Reason.SERVICE_UNAVAILABLE,
 					"Unable to fetch token keys from UAA."));
-		return this.uaaUrl;
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidator.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidator.java
@@ -24,9 +24,8 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Base64;
+import java.util.Collections;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 
 import reactor.core.publisher.Mono;
@@ -44,7 +43,7 @@ class ReactiveTokenValidator {
 
 	private final ReactiveCloudFoundrySecurityService securityService;
 
-	private volatile ConcurrentMap<String, String> cachedTokenKeys = new ConcurrentHashMap<>();
+	private volatile Map<String, String> cachedTokenKeys = Collections.emptyMap();
 
 	ReactiveTokenValidator(ReactiveCloudFoundrySecurityService securityService) {
 		this.securityService = securityService;
@@ -92,7 +91,7 @@ private Mono<String> getTokenKey(Token token) {
 	}
 
 	private void cacheTokenKeys(Map<String, String> tokenKeys) {
-		this.cachedTokenKeys = new ConcurrentHashMap<>(tokenKeys);
+		this.cachedTokenKeys = Map.copyOf(tokenKeys);
 	}
 
 	private boolean hasValidSignature(Token token, String key) {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java
@@ -67,7 +67,6 @@
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.OrRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.servlet.DispatcherServlet;
 
@@ -125,8 +124,8 @@ public CloudFoundryWebEndpointServletHandlerMapping cloudFoundryWebEndpointServl
 		allEndpoints.addAll(webEndpoints);
 		allEndpoints.addAll(servletEndpointsSupplier.getEndpoints());
 		allEndpoints.addAll(controllerEndpointsSupplier.getEndpoints());
-		return new CloudFoundryWebEndpointServletHandlerMapping(new EndpointMapping("/cloudfoundryapplication"),
-				webEndpoints, endpointMediaTypes, getCorsConfiguration(), securityInterceptor, allEndpoints);
+		return new CloudFoundryWebEndpointServletHandlerMapping(new EndpointMapping(BASE_PATH), webEndpoints,
+				endpointMediaTypes, getCorsConfiguration(), securityInterceptor, allEndpoints);
 	}
 
 	private CloudFoundrySecurityInterceptor getSecurityInterceptor(RestTemplateBuilder restTemplateBuilder,
@@ -189,9 +188,7 @@ public void customize(WebSecurity web) {
 				.forEach((path) -> requestMatchers.add(new AntPathRequestMatcher(path + "/**")));
 			requestMatchers.add(new AntPathRequestMatcher(BASE_PATH));
 			requestMatchers.add(new AntPathRequestMatcher(BASE_PATH + "/"));
-			if (!CollectionUtils.isEmpty(requestMatchers)) {
-				web.ignoring().requestMatchers(new OrRequestMatcher(requestMatchers));
-			}
+			web.ignoring().requestMatchers(new OrRequestMatcher(requestMatchers));
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactoryTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactoryTests.java
@@ -65,7 +65,7 @@ void requires128BitTraceId() {
 	}
 
 	@Nested
-	static class CompostePropagationTests {
+	class CompositePropagationTests {
 
 		@Test
 		void keys() {
diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsR2dbcAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsR2dbcAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -152,12 +152,12 @@ private void onEvent(R2dbcDatabaseShutdownEvent event) {
 
 	@Nested
 	@ClassPathExclusions("r2dbc-pool*.jar")
-	static class Embedded extends Common {
+	class Embedded extends Common {
 
 	}
 
 	@Nested
-	static class Pooled extends Common {
+	class Pooled extends Common {
 
 	}
 
diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartApplicationListenerTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartApplicationListenerTests.java
@@ -36,7 +36,6 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.nullValue;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -117,7 +116,7 @@ private void testInitialize(boolean failed, RestartApplicationListener listener)
 		SpringApplication application = new SpringApplication();
 		ConfigurableApplicationContext context = mock(ConfigurableApplicationContext.class);
 		listener.onApplicationEvent(new ApplicationStartingEvent(bootstrapContext, application, ARGS));
-		assertThat(Restarter.getInstance()).isNotEqualTo(nullValue());
+		assertThat(Restarter.getInstance()).isNotNull();
 		assertThat(Restarter.getInstance().isFinished()).isFalse();
 		listener.onApplicationEvent(new ApplicationPreparedEvent(application, ARGS, context));
 		if (failed) {
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java
@@ -253,7 +253,7 @@ static DeferredLinesWriter get(ApplicationContext applicationContext) {
 		}
 
 		void clear() {
-			this.lines.get().clear();
+			this.lines.remove();
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/JsonStream.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/JsonStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -64,13 +64,14 @@ public void get(InputStream content, Consumer<ObjectNode> consumer) throws IOExc
 	 */
 	public <T> void get(InputStream content, Class<T> type, Consumer<T> consumer) throws IOException {
 		JsonFactory jsonFactory = this.objectMapper.getFactory();
-		JsonParser parser = jsonFactory.createParser(content);
-		while (!parser.isClosed()) {
-			JsonToken token = parser.nextToken();
-			if (token != null && token != JsonToken.END_OBJECT) {
-				T node = read(parser, type);
-				if (node != null) {
-					consumer.accept(node);
+		try (JsonParser parser = jsonFactory.createParser(content)) {
+			while (!parser.isClosed()) {
+				JsonToken token = parser.nextToken();
+				if (token != null && token != JsonToken.END_OBJECT) {
+					T node = read(parser, type);
+					if (node != null) {
+						consumer.accept(node);
+					}
 				}
 			}
 		}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
@@ -265,7 +265,7 @@ private Package findPackage(CharSequence source) {
 				.getResources(ClassUtils.convertClassNameToResourcePath(source.toString()) + "/*.class");
 			for (Resource resource : resources) {
 				String className = StringUtils.stripFilenameExtension(resource.getFilename());
-				load(Class.forName(source.toString() + "." + className));
+				load(Class.forName(source + "." + className));
 				break;
 			}
 		}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataResource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataResource.java
@@ -106,7 +106,7 @@ private boolean isSameUnderlyingResource(Resource ours, Resource other) {
 	}
 
 	private boolean isSameFile(File ours, File other) {
-		return (ours != null) && (other != null) && ours.equals(other);
+		return (ours != null) && ours.equals(other);
 	}
 
 	@Override
@@ -119,9 +119,10 @@ public int hashCode() {
 	public String toString() {
 		if (this.resource instanceof FileSystemResource || this.resource instanceof FileUrlResource) {
 			try {
-				return "file [" + this.resource.getFile().toString() + "]";
+				return "file [" + this.resource.getFile() + "]";
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		}
 		return this.resource.toString();
@@ -131,11 +132,11 @@ private File getUnderlyingFile(Resource resource) {
 		try {
 			if (resource instanceof ClassPathResource || resource instanceof FileSystemResource
 					|| resource instanceof FileUrlResource) {
-				File file = resource.getFile();
-				return (file != null) ? file.getAbsoluteFile() : null;
+				return resource.getFile().getAbsoluteFile();
 			}
 		}
 		catch (IOException ex) {
+			// Ignore
 		}
 		return null;
 	}

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ void requires128BitTraceId() {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Nested`
`68`		`- static class CompostePropagationTests {`
	`68`	`+ class CompositePropagationTests {`
`69`	`69`
`70`	`70`	`@Test`
`71`	`71`	`void keys() {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2022 the original author or authors.`
	`2`	`+ * Copyright 2012-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -152,12 +152,12 @@ private void onEvent(R2dbcDatabaseShutdownEvent event) {`
`152`	`152`
`153`	`153`	`@Nested`
`154`	`154`	`@ClassPathExclusions("r2dbc-pool*.jar")`
`155`		`- static class Embedded extends Common {`
	`155`	`+ class Embedded extends Common {`
`156`	`156`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`@Nested`
`160`		`- static class Pooled extends Common {`
	`160`	`+ class Pooled extends Common {`
`161`	`161`
`162`	`162`	`}`
`163`	`163`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ static DeferredLinesWriter get(ApplicationContext applicationContext) {`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`void clear() {`
`256`		`- this.lines.get().clear();`
	`256`	`+ this.lines.remove();`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ private Package findPackage(CharSequence source) {`
`265`	`265`	`.getResources(ClassUtils.convertClassNameToResourcePath(source.toString()) + "/*.class");`
`266`	`266`	`for (Resource resource : resources) {`
`267`	`267`	`String className = StringUtils.stripFilenameExtension(resource.getFilename());`
`268`		`- load(Class.forName(source.toString() + "." + className));`
	`268`	`+ load(Class.forName(source + "." + className));`
`269`	`269`	`break;`
`270`	`270`	`}`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ private boolean isSameUnderlyingResource(Resource ours, Resource other) {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`private boolean isSameFile(File ours, File other) {`
`109`		`- return (ours != null) && (other != null) && ours.equals(other);`
	`109`	`+ return (ours != null) && ours.equals(other);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`@Override`
`@@ -119,9 +119,10 @@ public int hashCode() {`
`119`	`119`	`public String toString() {`
`120`	`120`	`if (this.resource instanceof FileSystemResource \|\| this.resource instanceof FileUrlResource) {`
`121`	`121`	`try {`
`122`		`- return "file [" + this.resource.getFile().toString() + "]";`
	`122`	`+ return "file [" + this.resource.getFile() + "]";`
`123`	`123`	`}`
`124`	`124`	`catch (IOException ex) {`
	`125`	`+ // Ignore`
`125`	`126`	`}`
`126`	`127`	`}`
`127`	`128`	`return this.resource.toString();`
`@@ -131,11 +132,11 @@ private File getUnderlyingFile(Resource resource) {`
`131`	`132`	`try {`
`132`	`133`	`if (resource instanceof ClassPathResource \|\| resource instanceof FileSystemResource`
`133`	`134`	`\|\| resource instanceof FileUrlResource) {`
`134`		`- File file = resource.getFile();`
`135`		`- return (file != null) ? file.getAbsoluteFile() : null;`
	`135`	`+ return resource.getFile().getAbsoluteFile();`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`catch (IOException ex) {`
	`139`	`+ // Ignore`
`139`	`140`	`}`
`140`	`141`	`return null;`
`141`	`142`	`}`