Merge branch '3.5.x' into 4.0.x

Closes gh-48622

Author: snicoll

buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java

@@ -332,15 +332,15 @@ void shouldReturnErrorsAndMessage() throws IOException {
 	}
 
 	@Test
-	void shouldReturnErrorsAndConentIfProxyAuthError() throws IOException {
+	void shouldReturnContentIfProxyAuthError() throws IOException {
 		givenClientWillReturnResponse();
 		given(this.entity.getContent()).willReturn(getClass().getResourceAsStream("proxy-error.txt"));
 		given(this.response.getCode()).willReturn(HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED);
 		assertThatExceptionOfType(DockerEngineException.class).isThrownBy(() -> this.http.get(this.uri))
 			.satisfies((ex) -> {
 				assertThat(ex.getErrors()).isNull();
 				assertThat(ex.getResponseMessage()).isNull();
-				assertThat(ex.getMessage()).contains("Some kind of procy auth problem!");
+				assertThat(ex.getMessage()).contains("Some kind of proxy auth problem!");
 			});
 	}
 

buildpack/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/transport/proxy-error.txt

@@ -1,2 +1,2 @@
-Some kind of procy auth problem!
+Some kind of proxy auth problem!
 

core/spring-boot/src/main/java/org/springframework/boot/json/JsonWriter.java

@@ -307,7 +307,7 @@ public void applyingPathFilter(Predicate<MemberPath> predicate) {
 		}
 
 		/**
-		 * Add the a {@link NameProcessor} to be applied when the JSON is written.
+		 * Add a {@link NameProcessor} to be applied when the JSON is written.
 		 * @param nameProcessor the name processor to add
 		 */
 		public void applyingNameProcessor(NameProcessor nameProcessor) {
@@ -316,7 +316,7 @@ public void applyingNameProcessor(NameProcessor nameProcessor) {
 		}
 
 		/**
-		 * Add the a {@link ValueProcessor} to be applied when the JSON is written.
+		 * Add a {@link ValueProcessor} to be applied when the JSON is written.
 		 * @param valueProcessor the value processor to add
 		 */
 		public void applyingValueProcessor(ValueProcessor<?> valueProcessor) {

module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheCondition.java

@@ -41,10 +41,10 @@ class CacheCondition extends SpringBootCondition {
 	@Override
 	public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
 		Assert.isInstanceOf(AnnotationMetadata.class, metadata);
-		return extracted(context, (AnnotationMetadata) metadata);
+		return getOutcome(context, (AnnotationMetadata) metadata);
 	}
 
-	private ConditionOutcome extracted(ConditionContext context, AnnotationMetadata metadata) {
+	private ConditionOutcome getOutcome(ConditionContext context, AnnotationMetadata metadata) {
 		String sourceClass = metadata.getClassName();
 		ConditionMessage.Builder message = ConditionMessage.forCondition("Cache", sourceClass);
 		Environment environment = context.getEnvironment();
@@ -53,7 +53,7 @@ private ConditionOutcome extracted(ConditionContext context, AnnotationMetadata
 			if (!specified.isBound()) {
 				return ConditionOutcome.match(message.because("automatic cache type"));
 			}
-			CacheType required = CacheConfigurations.getType(metadata.getClassName());
+			CacheType required = CacheConfigurations.getType(sourceClass);
 			if (specified.get() == required) {
 				return ConditionOutcome.match(message.because(specified.get() + " cache type"));
 			}

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesDataRedisConnectionDetails.java

@@ -102,14 +102,14 @@ public Standalone getStandalone() {
 		return DataRedisUrl.of(this.properties.getUrl());
 	}
 
-	private List<Node> asNodes(@Nullable List<String> nodes) {
+	private static List<Node> asNodes(@Nullable List<String> nodes) {
 		if (nodes == null) {
 			return Collections.emptyList();
 		}
-		return nodes.stream().map(this::asNode).toList();
+		return nodes.stream().map(PropertiesDataRedisConnectionDetails::asNode).toList();
 	}
 
-	private Node asNode(String node) {
+	private static Node asNode(String node) {
 		int portSeparatorIndex = node.lastIndexOf(':');
 		String host = node.substring(0, portSeparatorIndex);
 		int port = Integer.parseInt(node.substring(portSeparatorIndex + 1));
@@ -119,7 +119,7 @@ private Node asNode(String node) {
 	/**
 	 * {@link Cluster} implementation backed by properties.
 	 */
-	private class PropertiesCluster implements Cluster {
+	private static class PropertiesCluster implements Cluster {
 
 		private final List<Node> nodes;
 
@@ -137,7 +137,7 @@ public List<Node> getNodes() {
 	/**
 	 * {@link MasterReplica} implementation backed by properties.
 	 */
-	private class PropertiesMasterReplica implements MasterReplica {
+	private static class PropertiesMasterReplica implements MasterReplica {
 
 		private final List<Node> nodes;
 
@@ -155,7 +155,7 @@ public List<Node> getNodes() {
 	/**
 	 * {@link Sentinel} implementation backed by properties.
 	 */
-	private class PropertiesSentinel implements Sentinel {
+	private static class PropertiesSentinel implements Sentinel {
 
 		private final int database;
 

module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchConnectionDetails.java

@@ -58,7 +58,7 @@ public interface ElasticsearchConnectionDetails extends ConnectionDetails {
 	}
 
 	/**
-	 * APIKey for authentication with Elasticsearch.
+	 * API key for authentication with Elasticsearch.
 	 * @return the API key for authentication with Elasticsearch or {@code null}
 	 */
 	default @Nullable String getApiKey() {

module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientConfigurations.java

@@ -105,7 +105,7 @@ Rest5ClientBuilder elasticsearchRestClientBuilder(ElasticsearchConnectionDetails
 				.toArray(HttpHost[]::new));
 			if (connectionDetails.getApiKey() != null) {
 				builder.setDefaultHeaders(
-						new Header[] { new BasicHeader("Authorization", "ApiKey " + connectionDetails.getApiKey()), });
+						new Header[] { new BasicHeader("Authorization", "ApiKey " + connectionDetails.getApiKey()) });
 			}
 			builder.setHttpClientConfigCallback((httpClientBuilder) -> builderCustomizers.orderedStream()
 				.forEach((customizer) -> customizer.customize(httpClientBuilder)));

module/spring-boot-health/src/test/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/AvailabilityProbesAutoConfigurationTests.java

@@ -60,7 +60,7 @@ void probesWhenNoActuatorDependencyDoesNotAddBeans() {
 	}
 
 	@Test
-	void probesWhenPropertyDisabledAddsNotBeans() {
+	void probesWhenPropertyDisabledDoesNotAddBeans() {
 		this.contextRunner.withPropertyValues("management.endpoint.health.probes.enabled=false")
 			.run(this::doesNotHaveProbeBeans);
 	}

module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoAutoConfigurationTests.java

@@ -233,7 +233,7 @@ void configuresCredentialsFromUriPropertyWithAuthDatabase() {
 	}
 
 	@Test
-	void configureUUidRepresentation() {
+	void configureUuidRepresentation() {
 		this.contextRunner.withPropertyValues("spring.mongodb.representation.uuid=standard")
 			.run((context) -> assertThat(getSettings(context).getUuidRepresentation())
 				.isEqualTo(UuidRepresentation.STANDARD));

module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoPropertiesTests.java

@@ -33,7 +33,7 @@
 class MongoPropertiesTests {
 
 	@Test
-	void defaultUUidRepresentationIsAlignedWithSpringData() {
+	void defaultUuidRepresentationIsAlignedWithSpringData() {
 		UuidRepresentation springDataDefault = springDataDefaultUuidRepresentation();
 		UuidRepresentation springBootDefault = new MongoProperties().getRepresentation().getUuid();
 		assertThat(springBootDefault).isEqualTo(springDataDefault);