Create spring-boot-data-ldap module

snicoll · wilkinsona · commit ae00ac30898b · 2025-03-26T19:28:47.000Z
diff --git a/settings.gradle b/settings.gradle
@@ -53,6 +53,7 @@ include "spring-boot-project:spring-boot-batch"
 include "spring-boot-project:spring-boot-cassandra"
 include "spring-boot-project:spring-boot-couchbase"
 include "spring-boot-project:spring-boot-data-jpa"
+include "spring-boot-project:spring-boot-data-ldap"
 include "spring-boot-project:spring-boot-dependencies"
 include "spring-boot-project:spring-boot-devtools"
 include "spring-boot-project:spring-boot-docker-compose"
diff --git a/spring-boot-project/spring-boot-autoconfigure-all/build.gradle b/spring-boot-project/spring-boot-autoconfigure-all/build.gradle
@@ -52,7 +52,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-jackson"))
 	optional(project(":spring-boot-project:spring-boot-jdbc"))
 	optional(project(":spring-boot-project:spring-boot-jsonb"))
-	optional(project(":spring-boot-project:spring-boot-ldap"))
 	optional(project(":spring-boot-project:spring-boot-liquibase"))
 	optional(project(":spring-boot-project:spring-boot-neo4j"))
 	optional(project(":spring-boot-project:spring-boot-r2dbc"))
@@ -113,7 +112,6 @@ dependencies {
 	optional("com.sendgrid:sendgrid-java") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
-	optional("com.unboundid:unboundid-ldapsdk")
 	optional("com.zaxxer:HikariCP")
 	optional("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect")
 	optional("org.aspectj:aspectjweaver")
@@ -185,7 +183,6 @@ dependencies {
 		exclude group: "org.elasticsearch.client", module: "transport"
 	}
 	optional("org.springframework.data:spring-data-jdbc")
-	optional("org.springframework.data:spring-data-ldap")
 	optional("org.springframework.data:spring-data-mongodb")
 	optional("org.springframework.data:spring-data-neo4j")
 	optional("org.springframework.data:spring-data-r2dbc")
diff --git a/spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -326,12 +326,6 @@
       "description": "Whether to enable JDBC repositories.",
       "defaultValue": true
     },
-    {
-      "name": "spring.data.ldap.repositories.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether to enable LDAP repositories.",
-      "defaultValue": true
-    },
     {
       "name": "spring.data.mongodb.grid-fs-database",
       "type": "java.lang.String",
diff --git a/spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -13,7 +13,6 @@ org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoC
 org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration
 org.springframework.boot.autoconfigure.data.elasticsearch.ReactiveElasticsearchRepositoriesAutoConfiguration
 org.springframework.boot.autoconfigure.data.jdbc.JdbcRepositoriesAutoConfiguration
-org.springframework.boot.autoconfigure.data.ldap.LdapRepositoriesAutoConfiguration
 org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration
 org.springframework.boot.autoconfigure.data.mongo.MongoReactiveDataAutoConfiguration
 org.springframework.boot.autoconfigure.data.mongo.MongoReactiveRepositoriesAutoConfiguration
diff --git a/spring-boot-project/spring-boot-data-ldap/build.gradle b/spring-boot-project/spring-boot-data-ldap/build.gradle
@@ -0,0 +1,22 @@
+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.optional-dependencies"
+}
+
+description = "Spring Boot Data LDAP"
+
+dependencies {
+	api(project(":spring-boot-project:spring-boot-ldap"))
+	api("org.springframework.data:spring-data-ldap")
+
+	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+
+	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")))
+
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+}
diff --git a/spring-boot-project/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.data.ldap;
+package org.springframework.boot.data.ldap.autoconfigure;
 
 import javax.naming.ldap.LdapContext;
 
@@ -31,7 +31,7 @@
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's LDAP Repositories.
  *
  * @author Eddú Meléndez
- * @since 1.5.0
+ * @since 4.0.0
  */
 @AutoConfiguration
 @ConditionalOnClass({ LdapContext.class, LdapRepository.class })
diff --git a/spring-boot-project/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesRegistrar.java b/spring-boot-project/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesRegistrar.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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.data.ldap;
+package org.springframework.boot.data.ldap.autoconfigure;
 
 import java.lang.annotation.Annotation;
 
diff --git a/spring-boot-project/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/package-info.java b/spring-boot-project/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 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.
@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Spring Data LDAP.
  */
-package org.springframework.boot.autoconfigure.data.ldap;
+package org.springframework.boot.data.ldap.autoconfigure;
diff --git a/spring-boot-project/spring-boot-data-ldap/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-data-ldap/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,11 @@
+{
+  "groups": [],
+  "properties": [
+    {
+      "name": "spring.data.ldap.repositories.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable LDAP repositories.",
+      "defaultValue": true
+    }
+  ]
+}
diff --git a/spring-boot-project/spring-boot-data-ldap/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-data-ldap/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.springframework.boot.data.ldap.autoconfigure.LdapRepositoriesAutoConfiguration
diff --git a/spring-boot-project/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesAutoConfigurationTests.java
@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.data.ldap;
+package org.springframework.boot.data.ldap.autoconfigure;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.alt.ldap.PersonLdapRepository;
-import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage;
-import org.springframework.boot.autoconfigure.data.ldap.person.Person;
-import org.springframework.boot.autoconfigure.data.ldap.person.PersonRepository;
+import org.springframework.boot.data.ldap.autoconfigure.domain.empty.EmptyDataPackage;
+import org.springframework.boot.data.ldap.autoconfigure.domain.person.Person;
+import org.springframework.boot.data.ldap.autoconfigure.domain.person.PersonRepository;
 import org.springframework.boot.ldap.autoconfigure.LdapAutoConfiguration;
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -64,7 +63,7 @@ void testNoRepositoryConfiguration() {
 	@Test
 	void doesNotTriggerDefaultRepositoryDetectionIfCustomized() {
 		load(CustomizedConfiguration.class);
-		assertThat(this.context.getBean(PersonLdapRepository.class)).isNotNull();
+		assertThat(this.context.getBean(PersonRepository.class)).isNotNull();
 	}
 
 	private void load(Class<?>... configurationClasses) {
@@ -90,7 +89,7 @@ static class EmptyConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@TestAutoConfigurationPackage(LdapRepositoriesAutoConfigurationTests.class)
-	@EnableLdapRepositories(basePackageClasses = PersonLdapRepository.class)
+	@EnableLdapRepositories(basePackageClasses = PersonRepository.class)
 	static class CustomizedConfiguration {
 
 	}
diff --git a/spring-boot-project/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/domain/empty/EmptyDataPackage.java b/spring-boot-project/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/domain/empty/EmptyDataPackage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 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.
@@ -14,13 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.data.alt.ldap;
+package org.springframework.boot.data.ldap.autoconfigure.domain.empty;
 
-import javax.naming.Name;
-
-import org.springframework.boot.autoconfigure.data.ldap.person.Person;
-import org.springframework.data.repository.Repository;
-
-public interface PersonLdapRepository extends Repository<Person, Name> {
+public class EmptyDataPackage {
 
 }
diff --git a/spring-boot-project/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/domain/person/Person.java b/spring-boot-project/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/domain/person/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.data.ldap.person;
+package org.springframework.boot.data.ldap.autoconfigure.domain.person;
 
 import javax.naming.Name;
 
diff --git a/spring-boot-project/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/domain/person/PersonRepository.java b/spring-boot-project/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/domain/person/PersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.data.ldap.person;
+package org.springframework.boot.data.ldap.autoconfigure.domain.person;
 
 import javax.naming.Name;
 
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1998,6 +1998,7 @@ bom {
 				"spring-boot-configuration-processor",
 				"spring-boot-couchbase",
 				"spring-boot-data-jpa",
+				"spring-boot-data-ldap",
 				"spring-boot-devtools",
 				"spring-boot-docker-compose",
 				"spring-boot-elasticsearch",
diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
@@ -63,6 +63,7 @@ dependencies {
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-cassandra", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-couchbase", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-data-jpa", configuration: "autoConfigurationMetadata"))
+	autoConfiguration(project(path: ":spring-boot-project:spring-boot-data-ldap", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-elasticsearch", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-flyway", configuration: "autoConfigurationMetadata"))
@@ -105,6 +106,7 @@ dependencies {
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-cassandra", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-couchbase", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-data-jpa", configuration: "configurationPropertiesMetadata"))
+	configurationProperties(project(path: ":spring-boot-project:spring-boot-data-ldap", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-docker-compose", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-elasticsearch", configuration: "configurationPropertiesMetadata"))
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-ldap/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-ldap/build.gradle
@@ -6,7 +6,6 @@ description = "Starter for using Spring Data LDAP"
 
 dependencies {
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
-	api(project(":spring-boot-project:spring-boot-ldap"))
+	api(project(":spring-boot-project:spring-boot-data-ldap"))
 	api(project(":spring-boot-project:spring-boot-tx"))
-	api("org.springframework.data:spring-data-ldap")
 }
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle
@@ -39,14 +39,14 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-cassandra"))
 	optional(project(":spring-boot-project:spring-boot-couchbase"))
 	optional(project(":spring-boot-project:spring-boot-data-jpa"))
+	optional(project(":spring-boot-project:spring-boot-data-ldap"))
 	optional(project(":spring-boot-project:spring-boot-elasticsearch"))
 	optional(project(":spring-boot-project:spring-boot-flyway"))
 	optional(project(":spring-boot-project:spring-boot-groovy-templates"))
 	optional(project(":spring-boot-project:spring-boot-jackson"))
 	optional(project(":spring-boot-project:spring-boot-jdbc"))
 	optional(project(":spring-boot-project:spring-boot-jooq"))
 	optional(project(":spring-boot-project:spring-boot-jsonb"))
-	optional(project(":spring-boot-project:spring-boot-ldap"))
 	optional(project(":spring-boot-project:spring-boot-liquibase")) {
 		exclude(group: "org.liquibase")
 	}
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.data.ldap.AutoConfigureDataLdap.imports b/spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.data.ldap.AutoConfigureDataLdap.imports
@@ -1,5 +1,5 @@
 # AutoConfigureDataLdap auto-configuration imports
-org.springframework.boot.autoconfigure.data.ldap.LdapRepositoriesAutoConfiguration
+org.springframework.boot.data.ldap.autoconfigure.LdapRepositoriesAutoConfiguration
 org.springframework.boot.ldap.autoconfigure.LdapAutoConfiguration
 org.springframework.boot.ldap.autoconfigure.embedded.EmbeddedLdapAutoConfiguration
 optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+org.springframework.boot.data.ldap.autoconfigure.LdapRepositoriesAutoConfiguration`