Create spring-boot-data-neo4j module

Author: snicoll

Diff for: settings.gradle

@@ -57,6 +57,7 @@ include "spring-boot-project:spring-boot-data-elasticsearch"
 include "spring-boot-project:spring-boot-data-jpa"
 include "spring-boot-project:spring-boot-data-ldap"
 include "spring-boot-project:spring-boot-data-mongodb"
+include "spring-boot-project:spring-boot-data-neo4j"
 include "spring-boot-project:spring-boot-dependencies"
 include "spring-boot-project:spring-boot-devtools"
 include "spring-boot-project:spring-boot-docker-compose"

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -25,6 +25,7 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-data-elasticsearch"))
 	optional(project(":spring-boot-project:spring-boot-data-jpa"))
 	optional(project(":spring-boot-project:spring-boot-data-mongodb"))
+	optional(project(":spring-boot-project:spring-boot-data-neo4j"))
 	optional(project(":spring-boot-project:spring-boot-flyway"))
 	optional(project(":spring-boot-project:spring-boot-hazelcast"))
 	optional(project(":spring-boot-project:spring-boot-http"))
@@ -39,7 +40,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-liquibase"))
 	optional(project(":spring-boot-project:spring-boot-mail"))
 	optional(project(":spring-boot-project:spring-boot-mongodb"))
-	optional(project(":spring-boot-project:spring-boot-neo4j"))
 	optional(project(":spring-boot-project:spring-boot-quartz"))
 	optional(project(":spring-boot-project:spring-boot-r2dbc"))
 	optional(project(":spring-boot-project:spring-boot-reactor-netty"))

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java

@@ -24,8 +24,6 @@
 import org.springframework.boot.actuate.health.HealthEndpointWebExtension;
 import org.springframework.boot.actuate.health.ReactiveHealthEndpointWebExtension;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.neo4j.Neo4jDataAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.neo4j.Neo4jRepositoriesAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
@@ -35,6 +33,8 @@
 import org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration;
 import org.springframework.boot.data.mongodb.autoconfigure.MongoDataAutoConfiguration;
 import org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveDataAutoConfiguration;
+import org.springframework.boot.data.neo4j.autoconfigure.Neo4jDataAutoConfiguration;
+import org.springframework.boot.data.neo4j.autoconfigure.Neo4jReactiveDataAutoConfiguration;
 import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
 import org.springframework.boot.hazelcast.autoconfigure.HazelcastAutoConfiguration;
 import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
@@ -80,7 +80,7 @@ private ReactiveWebApplicationContextRunner reactiveWebRunner() {
 
 	@EnableAutoConfiguration(exclude = { FlywayAutoConfiguration.class, LiquibaseAutoConfiguration.class,
 			CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class, Neo4jDataAutoConfiguration.class,
-			Neo4jRepositoriesAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
+			Neo4jReactiveDataAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
 			MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class,
 			RepositoryRestMvcAutoConfiguration.class, HazelcastAutoConfiguration.class,
 			ElasticsearchDataAutoConfiguration.class, RedisAutoConfiguration.class,

Diff for: spring-boot-project/spring-boot-autoconfigure-all/build.gradle

@@ -36,7 +36,6 @@ dependencies {
 	dockerTestImplementation("org.testcontainers:couchbase")
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:mongodb")
-	dockerTestImplementation("org.testcontainers:neo4j")
 	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	optional(project(":spring-boot-project:spring-boot-activemq"))
@@ -53,7 +52,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-jsonb"))
 	optional(project(":spring-boot-project:spring-boot-liquibase"))
 	optional(project(":spring-boot-project:spring-boot-mongodb"))
-	optional(project(":spring-boot-project:spring-boot-neo4j"))
 	optional(project(":spring-boot-project:spring-boot-r2dbc"))
 	optional(project(":spring-boot-project:spring-boot-reactor-netty"))
 	optional(project(":spring-boot-project:spring-boot-rsocket"))
@@ -162,7 +160,6 @@ dependencies {
 	optional("org.springframework.data:spring-data-rest-webmvc")
 	optional("org.springframework.data:spring-data-jdbc")
 	optional("org.springframework.data:spring-data-mongodb")
-	optional("org.springframework.data:spring-data-neo4j")
 	optional("org.springframework.data:spring-data-r2dbc")
 	optional("org.springframework.data:spring-data-redis")
 	optional("org.springframework.graphql:spring-graphql")

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

@@ -38,84 +38,6 @@
       "description": "Whether to enable JDBC repositories.",
       "defaultValue": true
     },
-    {
-      "name": "spring.data.neo4j.auto-index",
-      "description": "Auto index mode.",
-      "defaultValue": "none",
-      "deprecation": {
-        "reason": "Automatic index creation is no longer supported.",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.neo4j.embedded.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether to enable embedded mode if the embedded driver is available.",
-      "deprecation": {
-        "reason": "Embedded mode is no longer supported, please use Testcontainers instead.",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.neo4j.open-in-view",
-      "type": "java.lang.Boolean",
-      "description": "Register OpenSessionInViewInterceptor that binds a Neo4j Session to the thread for the entire processing of the request.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.neo4j.password",
-      "type": "java.lang.String",
-      "description": "Login password of the server.",
-      "deprecation": {
-        "replacement": "spring.neo4j.authentication.password",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.neo4j.repositories.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether to enable Neo4j repositories.",
-      "defaultValue": true,
-      "deprecation": {
-        "replacement": "spring.data.neo4j.repositories.type",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.neo4j.repositories.type",
-      "type": "org.springframework.boot.autoconfigure.data.RepositoryType",
-      "description": "Type of Neo4j repositories to enable.",
-      "defaultValue": "auto"
-    },
-    {
-      "name": "spring.data.neo4j.uri",
-      "type": "java.lang.String",
-      "description": "URI used by the driver. Auto-detected by default.",
-      "deprecation": {
-        "replacement": "spring.neo4j.uri",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.neo4j.use-native-types",
-      "type": "java.lang.Boolean",
-      "description": "Whether to use Neo4j native types wherever possible.",
-      "deprecation": {
-        "reason": "Native type support is now built-in.",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.neo4j.username",
-      "type": "java.lang.String",
-      "description": "Login user of the server.",
-      "deprecation": {
-        "replacement": "spring.neo4j.authentication.username",
-        "level": "error"
-      }
-    },
     {
       "name": "spring.data.r2dbc.repositories.enabled",
       "type": "java.lang.Boolean",

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

@@ -6,10 +6,6 @@ org.springframework.boot.autoconfigure.data.couchbase.CouchbaseReactiveDataAutoC
 org.springframework.boot.autoconfigure.data.couchbase.CouchbaseReactiveRepositoriesAutoConfiguration
 org.springframework.boot.autoconfigure.data.couchbase.CouchbaseRepositoriesAutoConfiguration
 org.springframework.boot.autoconfigure.data.jdbc.JdbcRepositoriesAutoConfiguration
-org.springframework.boot.autoconfigure.data.neo4j.Neo4jDataAutoConfiguration
-org.springframework.boot.autoconfigure.data.neo4j.Neo4jReactiveDataAutoConfiguration
-org.springframework.boot.autoconfigure.data.neo4j.Neo4jReactiveRepositoriesAutoConfiguration
-org.springframework.boot.autoconfigure.data.neo4j.Neo4jRepositoriesAutoConfiguration
 org.springframework.boot.autoconfigure.data.r2dbc.R2dbcDataAutoConfiguration
 org.springframework.boot.autoconfigure.data.r2dbc.R2dbcRepositoriesAutoConfiguration
 org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration

Diff for: spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/data/alt/neo4j/CityNeo4jRepository.java

@@ -0,0 +1,33 @@
+plugins {
+	id "java-library"
+	id "org.springframework.boot.auto-configuration"
+	id "org.springframework.boot.configuration-properties"
+	id "org.springframework.boot.deployed"
+	id "org.springframework.boot.docker-test"
+	id "org.springframework.boot.optional-dependencies"
+}
+
+description = "Spring Boot New Project"
+
+dependencies {
+	api(project(":spring-boot-project:spring-boot-neo4j"))
+	api(project(":spring-boot-project:spring-boot-tx"))
+	api("org.springframework.data:spring-data-neo4j")
+
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation("ch.qos.logback:logback-classic")
+	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
+	dockerTestImplementation("org.testcontainers:neo4j")
+	dockerTestImplementation("org.testcontainers:junit-jupiter")
+
+	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional("io.projectreactor:reactor-core")
+
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
+	testImplementation("io.projectreactor:reactor-test")
+
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+}