Create spring-boot-couchbase module

Author: snicoll

settings.gradle

@@ -50,6 +50,7 @@ include "spring-boot-project:spring-boot-artemis"
 include "spring-boot-project:spring-boot-autoconfigure"
 include "spring-boot-project:spring-boot-autoconfigure-all"
 include "spring-boot-project:spring-boot-batch"
+include "spring-boot-project:spring-boot-couchbase"
 include "spring-boot-project:spring-boot-data-jpa"
 include "spring-boot-project:spring-boot-dependencies"
 include "spring-boot-project:spring-boot-devtools"

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -20,6 +20,7 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-activemq"))
 	optional(project(":spring-boot-project:spring-boot-amqp"))
 	optional(project(":spring-boot-project:spring-boot-artemis"))
+	optional(project(":spring-boot-project:spring-boot-couchbase"))
 	optional(project(":spring-boot-project:spring-boot-data-jpa"))
 	optional(project(":spring-boot-project:spring-boot-elasticsearch"))
 	optional(project(":spring-boot-project:spring-boot-flyway"))

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthContributorAutoConfiguration.java

@@ -28,7 +28,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.couchbase.CouchbaseAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -40,8 +39,8 @@
  * @author Andy Wilkinson Nicoll
  * @since 2.0.0
  */
-@AutoConfiguration(
-		after = { CouchbaseAutoConfiguration.class, CouchbaseReactiveHealthContributorAutoConfiguration.class })
+@AutoConfiguration(after = CouchbaseReactiveHealthContributorAutoConfiguration.class,
+		afterName = "org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration")
 @ConditionalOnClass(Cluster.class)
 @ConditionalOnBean(Cluster.class)
 @ConditionalOnEnabledHealthIndicator("couchbase")

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthContributorAutoConfiguration.java

@@ -29,7 +29,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.couchbase.CouchbaseAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -40,7 +39,7 @@
  * @author Stephane Nicoll
  * @since 2.1.0
  */
-@AutoConfiguration(after = CouchbaseAutoConfiguration.class)
+@AutoConfiguration(afterName = "org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration")
 @ConditionalOnClass({ Cluster.class, Flux.class })
 @ConditionalOnBean(Cluster.class)
 @ConditionalOnEnabledHealthIndicator("couchbase")

spring-boot-project/spring-boot-autoconfigure-all/build.gradle

@@ -43,6 +43,7 @@ dependencies {
 
 	optional(project(":spring-boot-project:spring-boot-activemq"))
 	optional(project(":spring-boot-project:spring-boot-artemis"))
+	optional(project(":spring-boot-project:spring-boot-couchbase"))
 	optional(project(":spring-boot-project:spring-boot-data-jpa"))
 	optional(project(":spring-boot-project:spring-boot-elasticsearch"))
 	optional(project(":spring-boot-project:spring-boot-flyway"))

spring-boot-project/spring-boot-autoconfigure-all/src/dockerTest/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 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.
@@ -34,6 +34,7 @@
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.testsupport.container.TestImage;
 

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfiguration.java

@@ -23,7 +23,6 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
-import org.springframework.boot.autoconfigure.couchbase.CouchbaseAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,8 +37,8 @@
  * @author Stephane Nicoll
  * @since 1.4.0
  */
-@AutoConfiguration(after = CouchbaseAutoConfiguration.class,
-		afterName = "org.springframework.boot.validation.autoconfigure.ValidationAutoConfiguration")
+@AutoConfiguration(afterName = { "org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration",
+		"org.springframework.boot.validation.autoconfigure.ValidationAutoConfiguration" })
 @ConditionalOnClass({ Bucket.class, CouchbaseRepository.class })
 @EnableConfigurationProperties(CouchbaseDataProperties.class)
 @Import({ CouchbaseDataConfiguration.class, CouchbaseClientFactoryConfiguration.class,

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

@@ -63,137 +63,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.couchbase.bootstrap-hosts",
-      "type": "java.util.List<java.lang.String>",
-      "description": "Couchbase nodes (host or IP address) to bootstrap from.",
-      "deprecation": {
-        "replacement": "spring.couchbase.connection-string",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.bucket.name",
-      "type": "java.lang.String",
-      "description": "Name of the bucket to connect to.",
-      "deprecation": {
-        "reason": "A bucket is no longer auto-configured.",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.bucket.password",
-      "type": "java.lang.String",
-      "description": "Password of the bucket.",
-      "deprecation": {
-        "reason": "A bucket is no longer auto-configured.",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.bootstrap.http-direct-port",
-      "type": "java.lang.Integer",
-      "description": "Port for the HTTP bootstrap.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.bootstrap.http-ssl-port",
-      "type": "java.lang.Integer",
-      "description": "Port for the HTTPS bootstrap.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.endpoints.key-value",
-      "type": "java.lang.Integer",
-      "description": "Number of sockets per node against the key/value service.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.endpoints.query",
-      "type": "java.lang.Integer",
-      "description": "Number of sockets per node against the query (N1QL) service.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.endpoints.queryservice.max-endpoints",
-      "type": "java.lang.Integer",
-      "description": "Maximum number of sockets per node.",
-      "deprecation": {
-        "replacement": "spring.couchbase.env.io.max-endpoints",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.endpoints.queryservice.min-endpoints",
-      "type": "java.lang.Integer",
-      "description": "Minimum number of sockets per node.",
-      "deprecation": {
-        "replacement": "spring.couchbase.env.io.min-endpoints",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.endpoints.view",
-      "type": "java.lang.Integer",
-      "description": "Number of sockets per node against the view service.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.endpoints.viewservice.max-endpoints",
-      "type": "java.lang.Integer",
-      "description": "Maximum number of sockets per node.",
-      "deprecation": {
-        "replacement": "spring.couchbase.env.io.max-endpoints",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.endpoints.viewservice.min-endpoints",
-      "type": "java.lang.Integer",
-      "description": "Minimum number of sockets per node.",
-      "deprecation": {
-        "replacement": "spring.couchbase.env.io.min-endpoints",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.ssl.key-store",
-      "type": "java.lang.String",
-      "description": "Path to the JVM key store that holds the certificates.",
-      "deprecation": {
-        "replacement": "spring.couchbase.env.ssl.bundle",
-        "level": "error",
-        "since": "3.1.0"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.ssl.key-store-password",
-      "type": "java.lang.String",
-      "description": "Password used to access the key store.",
-      "deprecation": {
-        "replacement": "spring.couchbase.env.ssl.bundle",
-        "level": "error",
-        "since": "3.1.0"
-      }
-    },
-    {
-      "name": "spring.couchbase.env.timeouts.socket-connect",
-      "type": "java.time.Duration",
-      "description": "Socket connect connections timeout.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
     {
       "name": "spring.dao.exceptiontranslation.enabled",
       "type": "java.lang.Boolean",

spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,7 +1,6 @@
 org.springframework.boot.autoconfigure.aop.AopAutoConfiguration
 org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration
 org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration
-org.springframework.boot.autoconfigure.couchbase.CouchbaseAutoConfiguration
 org.springframework.boot.autoconfigure.dao.PersistenceExceptionTranslationAutoConfiguration
 org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration
 org.springframework.boot.autoconfigure.data.cassandra.CassandraReactiveDataAutoConfiguration

spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java

@@ -21,10 +21,10 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.couchbase.CouchbaseAutoConfiguration;
-import org.springframework.boot.autoconfigure.couchbase.CouchbaseProperties;
 import org.springframework.boot.autoconfigure.data.couchbase.city.City;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration;
+import org.springframework.boot.couchbase.autoconfigure.CouchbaseProperties;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.validation.autoconfigure.ValidationAutoConfiguration;
 import org.springframework.context.annotation.Bean;