Extract Querydsl fragment from QuerydslLdapRepository.

Closes #273

Author: mp911de

src/main/java/org/springframework/data/ldap/repository/support/LdapEntityInformation.java

@@ -20,7 +20,7 @@
 
 import org.springframework.data.repository.core.support.AbstractEntityInformation;
 import org.springframework.lang.Nullable;
-import org.springframework.ldap.odm.core.impl.DefaultObjectDirectoryMapper;
+import org.springframework.ldap.odm.core.ObjectDirectoryMapper;
 
 /**
  * ODM-based {@link org.springframework.data.repository.core.EntityInformation} for LDAP entities.
@@ -32,16 +32,17 @@
  */
 class LdapEntityInformation<T> extends AbstractEntityInformation<T, Name> {
 
-	private final DefaultObjectDirectoryMapper MAPPER = new DefaultObjectDirectoryMapper();
+	private final ObjectDirectoryMapper odm;
 
-	public LdapEntityInformation(Class<T> domainClass) {
+	public LdapEntityInformation(Class<T> domainClass, ObjectDirectoryMapper odm) {
 		super(domainClass);
+		this.odm = odm;
 	}
 
 	@Nullable
 	@Override
 	public Name getId(T entity) {
-		return MAPPER.getId(entity);
+		return odm.getId(entity);
 	}
 
 	@Override

src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java

@@ -16,11 +16,13 @@
 package org.springframework.data.ldap.repository.support;
 
 import static org.springframework.data.querydsl.QuerydslUtils.*;
+import static org.springframework.data.repository.core.support.RepositoryComposition.*;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.Optional;
 
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.ldap.core.mapping.LdapMappingContext;
 import org.springframework.data.ldap.repository.query.AnnotatedLdapRepositoryQuery;
 import org.springframework.data.ldap.repository.query.LdapQueryMethod;
@@ -94,9 +96,9 @@ public LdapRepositoryFactory(LdapOperations ldapOperations) {
 	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
 	 */
 	@Override
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public <T, ID> EntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-		return new LdapEntityInformation(domainClass);
+		return new LdapEntityInformation(domainClass, ldapOperations.getObjectDirectoryMapper());
 	}
 
 	/*
@@ -105,11 +107,46 @@ public <T, ID> EntityInformation<T, ID> getEntityInformation(Class<T> domainClas
 	 */
 	@Override
 	protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
+		return SimpleLdapRepository.class;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryFragments(org.springframework.data.repository.core.RepositoryMetadata)
+	 */
+	@Override
+	protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) {
+		return getRepositoryFragments(metadata, this.ldapOperations);
+	}
+
+	/**
+	 * Creates {@link RepositoryFragments} based on {@link RepositoryMetadata} to add LDAP-specific extensions. Typically,
+	 * adds a {@link QuerydslLdapPredicateExecutor} if the repository interface uses Querydsl.
+	 * <p>
+	 * Can be overridden by subclasses to customize {@link RepositoryFragments}.
+	 *
+	 * @param metadata repository metadata.
+	 * @param operations the LDAP operations manager.
+	 * @return
+	 * @since 2.6
+	 */
+	protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata, LdapOperations operations) {
 
 		boolean isQueryDslRepository = QUERY_DSL_PRESENT
 				&& QuerydslPredicateExecutor.class.isAssignableFrom(metadata.getRepositoryInterface());
 
-		return isQueryDslRepository ? QuerydslLdapRepository.class : SimpleLdapRepository.class;
+		if (isQueryDslRepository) {
+
+			if (metadata.isReactiveRepository()) {
+				throw new InvalidDataAccessApiUsageException(
+						"Cannot combine Querydsl and reactive repository support in a single interface");
+			}
+
+			return RepositoryFragments.just(new QuerydslLdapPredicateExecutor<>(
+					getEntityInformation(metadata.getDomainType()), getProjectionFactory(), operations, mappingContext));
+		}
+
+		return RepositoryFragments.empty();
 	}
 
 	/*