Merge remote-tracking branch 'origin/main' into draft-interface-clients-autoconfiguration

# Conflicts:
#	spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Author: OlgaMaciaszek

antora/package-lock.json

@@ -78,6 +78,7 @@ public Map<String, String> get() {
 		addGitHubAttributes(attributes);
 		addVersionAttributes(attributes);
 		addUrlArtifactRepository(attributes);
+		addUrlJava(attributes);
 		addUrlLibraryLinkAttributes(attributes);
 		addPropertyAttributes(attributes);
 		return attributes;
@@ -109,8 +110,12 @@ private void addVersionAttributes(Map<String, String> attributes) {
 		});
 		attributes.put("version-native-build-tools", (String) this.projectProperties.get("nativeBuildToolsVersion"));
 		attributes.put("version-graal", (String) this.projectProperties.get("graalVersion"));
+		addDependencyVersion(attributes, "jackson-annotations", "com.fasterxml.jackson.core:jackson-annotations");
+		addDependencyVersion(attributes, "jackson-core", "com.fasterxml.jackson.core:jackson-core");
+		addDependencyVersion(attributes, "jackson-databind", "com.fasterxml.jackson.core:jackson-databind");
 		addSpringDataDependencyVersion(attributes, "spring-data-commons");
 		addSpringDataDependencyVersion(attributes, "spring-data-couchbase");
+		addSpringDataDependencyVersion(attributes, "spring-data-cassandra");
 		addSpringDataDependencyVersion(attributes, "spring-data-elasticsearch");
 		addSpringDataDependencyVersion(attributes, "spring-data-jdbc");
 		addSpringDataDependencyVersion(attributes, "spring-data-jpa");
@@ -125,15 +130,23 @@ private void addSpringDataDependencyVersion(Map<String, String> attributes, Stri
 	}
 
 	private void addSpringDataDependencyVersion(Map<String, String> attributes, String name, String artifactId) {
-		String version = this.dependencyVersions.get("org.springframework.data:" + artifactId);
-		Assert.notNull(version, () -> "No version found for Spring Data artifact " + artifactId);
+		addDependencyVersion(attributes, name, "org.springframework.data:" + artifactId);
+	}
+
+	private void addDependencyVersion(Map<String, String> attributes, String name, String groupAndArtifactId) {
+		String version = this.dependencyVersions.get(groupAndArtifactId);
+		Assert.notNull(version, () -> "No version found for " + groupAndArtifactId);
 		attributes.put("version-" + name, version);
 	}
 
 	private void addUrlArtifactRepository(Map<String, String> attributes) {
 		attributes.put("url-artifact-repository", this.artifactRelease.getDownloadRepo());
 	}
 
+	private void addUrlJava(Map<String, String> attributes) {
+		attributes.put("url-javase-javadoc", "https://docs.oracle.com/en/java/javase/17/docs/api/");
+	}
+
 	private void addUrlLibraryLinkAttributes(Map<String, String> attributes) {
 		this.libraries.forEach((library) -> {
 			String prefix = "url-" + library.getLinkRootName() + "-";

buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java

@@ -33,10 +33,13 @@ url-paketo-docs=https://paketo.io/docs
 url-paketo-docs-java-buildpack={url-paketo-docs}/buildpacks/language-family-buildpacks/java
 url-spring-boot-for-apache-geode-docs=https://docs.spring.io/spring-boot-data-geode-build/2.0.x/reference/html5
 url-spring-boot-for-apache-geode-site=https://github.com/spring-projects/spring-boot-data-geode
+url-spring-data-cassandra-javadoc=https://docs.spring.io/spring-data/cassandra/docs/{version-spring-data-cassandra}/api
 url-spring-data-cassandra-site=https://spring.io/projects/spring-data-cassandra
 url-spring-data-commons-javadoc=https://docs.spring.io/spring-data/commons/docs/{version-spring-data-commons}/api
 url-spring-data-couchbase-docs=https://docs.spring.io/spring-data/couchbase/reference/{version-spring-data-couchbase}
 url-spring-data-couchbase-site=https://spring.io/projects/spring-data-couchbase
+url-spring-data-couchbase-javadoc=https://docs.spring.io/spring-data/couchbase/docs/{version-spring-data-couchbase}/api
+url-spring-data-elasticsearch-javadoc=https://docs.spring.io/spring-data/elasticsearch/docs/{version-spring-data-elasticsearch}/api
 url-spring-data-elasticsearch-docs=https://docs.spring.io/spring-data/elasticsearch/reference/{version-spring-data-elasticsearch}
 url-spring-data-elasticsearch-site=https://spring.io/projects/spring-data-elasticsearch
 url-spring-data-envers-site=https://spring.io/projects/spring-data-envers
@@ -50,13 +53,17 @@ url-spring-data-ldap-site=https://spring.io/projects/spring-data-ldap
 url-spring-data-mongodb-javadoc=https://docs.spring.io/spring-data/mongodb/docs/{version-spring-data-mongodb}/api
 url-spring-data-mongodb-site=https://spring.io/projects/spring-data-mongodb
 url-spring-data-mongodb-docs=https://docs.spring.io/spring-data/mongodb/reference/{version-spring-data-mongodb}
+url-spring-data-neo4j-javadoc=https://docs.spring.io/spring-data/neo4j/docs/{version-spring-data-neo4j}/api
 url-spring-data-neo4j-docs=https://docs.spring.io/spring-data/neo4j/reference/{version-spring-data-neo4j}
 url-spring-data-neo4j-site=https://spring.io/projects/spring-data-neo4j
 url-spring-data-r2dbc-javadoc=https://docs.spring.io/spring-data/r2dbc/docs/{version-spring-data-r2dbc}/api
 url-spring-data-r2dbc-docs=https://docs.spring.io/spring-data/relational/reference/{version-spring-data-r2dbc}
 url-spring-data-redis-site=https://spring.io/projects/spring-data-redis
 url-spring-data-rest-javadoc=https://docs.spring.io/spring-data/rest/docs/{version-spring-data-rest}/api
 url-spring-data-site=https://spring.io/projects/spring-data
+url-jackson-annotations=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/{version-jackson-annotations}
+url-jackson-core=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/{version-jackson-core}
+url-jackson-databind=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/{version-jackson-databind}
 
 # === API References ===
 

buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties

@@ -154,6 +154,7 @@ private Library mockLibrary(Map<String, Function<LibraryVersion, String>> links)
 	private Map<String, String> mockDependencyVersions() {
 		Map<String, String> versions = new LinkedHashMap<>();
 		addMockSpringDataVersion(versions, "spring-data-commons");
+		addMockSpringDataVersion(versions, "spring-data-cassandra");
 		addMockSpringDataVersion(versions, "spring-data-couchbase");
 		addMockSpringDataVersion(versions, "spring-data-elasticsearch");
 		addMockSpringDataVersion(versions, "spring-data-jdbc");
@@ -162,11 +163,18 @@ private Map<String, String> mockDependencyVersions() {
 		addMockSpringDataVersion(versions, "spring-data-neo4j");
 		addMockSpringDataVersion(versions, "spring-data-r2dbc");
 		addMockSpringDataVersion(versions, "spring-data-rest-core");
+		addMockJacksonVersion(versions, "jackson-annotations");
+		addMockJacksonVersion(versions, "jackson-core");
+		addMockJacksonVersion(versions, "jackson-databind");
 		return versions;
 	}
 
 	private void addMockSpringDataVersion(Map<String, String> versions, String artifactId) {
 		versions.put("org.springframework.data:" + artifactId, "1.2.3");
 	}
 
+	private void addMockJacksonVersion(Map<String, String> versions, String artifactId) {
+		versions.put("com.fasterxml.jackson.core:" + artifactId, "2.3.4");
+	}
+
 }

buildSrc/src/test/java/org/springframework/boot/build/antora/AntoraAsciidocAttributesTests.java

@@ -30,14 +30,6 @@
       "description": "Whether to enable default metrics exporters.",
       "defaultValue": true
     },
-    {
-      "name": "management.endpoint.configprops.show-values",
-      "defaultValue": "never"
-    },
-    {
-      "name": "management.endpoint.env.show-values",
-      "defaultValue": "never"
-    },
     {
       "name": "management.endpoint.health.probes.add-additional-paths",
       "type": "java.lang.Boolean",
@@ -50,10 +42,6 @@
       "description": "Whether to enable liveness and readiness probes.",
       "defaultValue": false
     },
-    {
-      "name": "management.endpoint.health.show-details",
-      "defaultValue": "never"
-    },
     {
       "name": "management.endpoint.health.status.order",
       "defaultValue": [
@@ -69,10 +57,6 @@
       "description": "Whether to validate health group membership on startup. Validation fails if a group includes or excludes a health contributor that does not exist.",
       "defaultValue": true
     },
-    {
-      "name": "management.endpoint.quartz.show-values",
-      "defaultValue": "never"
-    },
     {
       "name": "management.endpoints.enabled-by-default",
       "type": "java.lang.Boolean",
@@ -107,26 +91,6 @@
         "health"
       ]
     },
-    {
-      "name": "management.ganglia.metrics.export.addressing-mode",
-      "defaultValue": "multicast"
-    },
-    {
-      "name": "management.ganglia.metrics.export.duration-units",
-      "defaultValue": "milliseconds"
-    },
-    {
-      "name": "management.graphite.metrics.export.duration-units",
-      "defaultValue": "milliseconds"
-    },
-    {
-      "name": "management.graphite.metrics.export.protocol",
-      "defaultValue": "pickled"
-    },
-    {
-      "name": "management.graphite.metrics.export.rate-units",
-      "defaultValue": "seconds"
-    },
     {
       "name": "management.health.cassandra.enabled",
       "type": "java.lang.Boolean",
@@ -277,10 +241,6 @@
         "errors"
       ]
     },
-    {
-      "name": "management.influx.metrics.export.consistency",
-      "defaultValue": "one"
-    },
     {
       "name": "management.info.build.enabled",
       "type": "java.lang.Boolean",
@@ -305,10 +265,6 @@
       "description": "Whether to enable git info.",
       "defaultValue": true
     },
-    {
-      "name": "management.info.git.mode",
-      "defaultValue": "simple"
-    },
     {
       "name": "management.info.java.enabled",
       "type": "java.lang.Boolean",
@@ -2085,31 +2041,11 @@
       "description": "Whether auto-configuration of Micrometer annotations is enabled.",
       "defaultValue": false
     },
-    {
-      "name": "management.otlp.logging.compression",
-      "defaultValue": "none"
-    },
-    {
-      "name": "management.otlp.metrics.export.base-time-unit",
-      "defaultValue": "milliseconds"
-    },
-    {
-      "name": "management.otlp.tracing.compression",
-      "defaultValue": "none"
-    },
     {
       "name": "management.otlp.tracing.export.enabled",
       "type": "java.lang.Boolean",
       "description": "Whether auto-configuration of tracing is enabled to export OTLP traces."
     },
-    {
-      "name": "management.prometheus.metrics.export.histogram-flavor",
-      "defaultValue": "prometheus"
-    },
-    {
-      "name": "management.prometheus.metrics.export.pushgateway.shutdown-operation",
-      "defaultValue": "none"
-    },
     {
       "name": "management.server.add-application-context-header",
       "type": "java.lang.Boolean",
@@ -2210,22 +2146,6 @@
       "name": "management.server.ssl.trust-store-type",
       "description": "Type of the trust store."
     },
-    {
-      "name": "management.signalfx.metrics.export.published-histogram-type",
-      "defaultValue": "default"
-    },
-    {
-      "name": "management.simple.metrics.export.mode",
-      "defaultValue": "cumulative"
-    },
-    {
-      "name": "management.statsd.metrics.export.flavor",
-      "defaultValue": "datadog"
-    },
-    {
-      "name": "management.statsd.metrics.export.protocol",
-      "defaultValue": "udp"
-    },
     {
       "name": "management.trace.http.enabled",
       "deprecation": {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -20,6 +20,7 @@
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import reactor.core.publisher.Mono;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
@@ -30,6 +31,7 @@
 import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchClientAutoConfiguration;
 import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
 import org.springframework.boot.autoconfigure.elasticsearch.ReactiveElasticsearchClientAutoConfiguration;
+import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.testsupport.container.TestImage;
 import org.springframework.context.annotation.Configuration;
@@ -62,6 +64,14 @@ class ReactiveElasticsearchRepositoriesAutoConfigurationTests {
 				"spring.elasticsearch.uris=" + elasticsearch.getHost() + ":" + elasticsearch.getFirstMappedPort(),
 				"spring.elasticsearch.socket-timeout=30s");
 
+	@Test
+	void backsOffWithoutReactor() {
+		this.contextRunner.withUserConfiguration(TestConfiguration.class)
+			.withClassLoader(new FilteredClassLoader(Mono.class))
+			.run((context) -> assertThat(context)
+				.doesNotHaveBean(ReactiveElasticsearchRepositoriesAutoConfiguration.class));
+	}
+
 	@Test
 	void testDefaultRepositoryConfiguration() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class)

spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.data.elasticsearch;
 
+import reactor.core.publisher.Mono;
+
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -36,7 +38,7 @@
  * @see EnableReactiveElasticsearchRepositories
  */
 @AutoConfiguration
-@ConditionalOnClass({ ReactiveElasticsearchClient.class, ReactiveElasticsearchRepository.class })
+@ConditionalOnClass({ ReactiveElasticsearchClient.class, ReactiveElasticsearchRepository.class, Mono.class })
 @ConditionalOnProperty(prefix = "spring.data.elasticsearch.repositories", name = "enabled", havingValue = "true",
 		matchIfMissing = true)
 @ConditionalOnMissingBean(ReactiveElasticsearchRepositoryFactoryBean.class)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfiguration.java

@@ -55,6 +55,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.codec.ServerCodecConfigurer;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.reactive.HandlerMapping;
@@ -112,6 +113,7 @@ public RouterFunction<ServerResponse> graphQlRouterFunction(GraphQlHttpHandler h
 		RouterFunctions.Builder builder = RouterFunctions.route();
 		builder.route(GraphQlRequestPredicates.graphQlHttp(path), httpHandler::handleRequest);
 		builder.route(GraphQlRequestPredicates.graphQlSse(path), sseHandler::handleRequest);
+		builder.POST(path, this::unsupportedMediaType);
 		builder.GET(path, this::onlyAllowPost);
 		if (properties.getGraphiql().isEnabled()) {
 			GraphiQlHandler graphQlHandler = new GraphiQlHandler(path, properties.getWebsocket().getPath());
@@ -124,6 +126,14 @@ public RouterFunction<ServerResponse> graphQlRouterFunction(GraphQlHttpHandler h
 		return builder.build();
 	}
 
+	private Mono<ServerResponse> unsupportedMediaType(ServerRequest request) {
+		return ServerResponse.status(HttpStatus.UNSUPPORTED_MEDIA_TYPE).headers(this::acceptJson).build();
+	}
+
+	private void acceptJson(HttpHeaders headers) {
+		headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+	}
+
 	private Mono<ServerResponse> onlyAllowPost(ServerRequest request) {
 		return ServerResponse.status(HttpStatus.METHOD_NOT_ALLOWED).headers(this::onlyAllowPost).build();
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfiguration.java

@@ -117,6 +117,7 @@ public RouterFunction<ServerResponse> graphQlRouterFunction(GraphQlHttpHandler h
 		RouterFunctions.Builder builder = RouterFunctions.route();
 		builder.route(GraphQlRequestPredicates.graphQlHttp(path), httpHandler::handleRequest);
 		builder.route(GraphQlRequestPredicates.graphQlSse(path), sseHandler::handleRequest);
+		builder.POST(path, this::unsupportedMediaType);
 		builder.GET(path, this::onlyAllowPost);
 		if (properties.getGraphiql().isEnabled()) {
 			GraphiQlHandler graphiQLHandler = new GraphiQlHandler(path, properties.getWebsocket().getPath());
@@ -129,6 +130,14 @@ public RouterFunction<ServerResponse> graphQlRouterFunction(GraphQlHttpHandler h
 		return builder.build();
 	}
 
+	private ServerResponse unsupportedMediaType(ServerRequest request) {
+		return ServerResponse.status(HttpStatus.UNSUPPORTED_MEDIA_TYPE).headers(this::acceptJson).build();
+	}
+
+	private void acceptJson(HttpHeaders headers) {
+		headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+	}
+
 	private ServerResponse onlyAllowPost(ServerRequest request) {
 		return ServerResponse.status(HttpStatus.METHOD_NOT_ALLOWED).headers(this::onlyAllowPost).build();
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfiguration.java

@@ -44,7 +44,7 @@
  * @author Olga Maciaszek-Sharma
  */
 @AutoConfiguration(after = { RestTemplateAutoConfiguration.class, RestClientAutoConfiguration.class,
-		WebClientAutoConfiguration.class})
+		WebClientAutoConfiguration.class })
 @Import(HttpInterfaceClientsImportRegistrar.class)
 @EnableConfigurationProperties(HttpInterfaceClientsProperties.class)
 public class HttpInterfaceClientsAutoConfiguration {