From bff7e33c16698496f1702b6cdd7406ac1b80f676 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Tue, 19 Nov 2024 14:29:53 +0100
Subject: [PATCH] Adopt to deprecation removals in Commons.

Closes #519
---
 .../repository/support/LdapRepositoryFactory.java | 15 +++++++--------
 ...RepositoryConfigurationExtensionUnitTests.java |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java b/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java
index 37d56db..838cffe 100644
--- a/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java
@@ -40,10 +40,8 @@
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ValueExpressionDelegate;
-import org.springframework.lang.Nullable;
 import org.springframework.ldap.core.LdapOperations;
 import org.springframework.util.Assert;
 
@@ -146,15 +144,15 @@ protected Object getTargetRepository(RepositoryInformation information) {
 					ldapOperations.getObjectDirectoryMapper(), information.getDomainType());
 		}
 
-		return getTargetRepositoryViaReflection(information, ldapOperations,
-				ldapOperations.getObjectDirectoryMapper(),
+		return getTargetRepositoryViaReflection(information, ldapOperations, ldapOperations.getObjectDirectoryMapper(),
 				information.getDomainType());
 	}
 
 	@Override
 	protected Optional<QueryLookupStrategy> getQueryLookupStrategy(Key key,
 			ValueExpressionDelegate valueExpressionDelegate) {
-		return Optional.of(new LdapQueryLookupStrategy(ldapOperations, instantiators, mappingContext, valueExpressionDelegate));
+		return Optional
+				.of(new LdapQueryLookupStrategy(ldapOperations, instantiators, mappingContext, valueExpressionDelegate));
 	}
 
 	/**
@@ -183,8 +181,8 @@ private static boolean acceptsMappingContext(RepositoryInformation information)
 		return acceptsMappingContext;
 	}
 
-	private record LdapQueryLookupStrategy(LdapOperations ldapOperations,
-			EntityInstantiators instantiators, MappingContext<? extends PersistentEntity<?, ?>, ? extends PersistentProperty<?>> mappingContext,
+	private record LdapQueryLookupStrategy(LdapOperations ldapOperations, EntityInstantiators instantiators,
+			MappingContext<? extends PersistentEntity<?, ?>, ? extends PersistentProperty<?>> mappingContext,
 			ValueExpressionDelegate valueExpressionDelegate) implements QueryLookupStrategy {
 
 		@Override
@@ -195,7 +193,8 @@ public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata,
 			Class<?> domainType = metadata.getDomainType();
 
 			if (queryMethod.hasQueryAnnotation()) {
-				return new AnnotatedLdapRepositoryQuery(queryMethod, domainType, ldapOperations, mappingContext, instantiators, valueExpressionDelegate);
+				return new AnnotatedLdapRepositoryQuery(queryMethod, domainType, ldapOperations, mappingContext, instantiators,
+						valueExpressionDelegate);
 			} else {
 				return new PartTreeLdapRepositoryQuery(queryMethod, domainType, ldapOperations, mappingContext, instantiators);
 			}
diff --git a/src/test/java/org/springframework/data/ldap/repository/config/LdapRepositoryConfigurationExtensionUnitTests.java b/src/test/java/org/springframework/data/ldap/repository/config/LdapRepositoryConfigurationExtensionUnitTests.java
index e6be5d9..94d9f60 100644
--- a/src/test/java/org/springframework/data/ldap/repository/config/LdapRepositoryConfigurationExtensionUnitTests.java
+++ b/src/test/java/org/springframework/data/ldap/repository/config/LdapRepositoryConfigurationExtensionUnitTests.java
@@ -47,7 +47,7 @@ class LdapRepositoryConfigurationExtensionUnitTests {
 	private BeanDefinitionRegistry registry = new DefaultListableBeanFactory();
 
 	private RepositoryConfigurationSource configurationSource = new AnnotationRepositoryConfigurationSource(metadata,
-			EnableLdapRepositories.class, loader, environment, registry);
+			EnableLdapRepositories.class, loader, environment, registry, null);
 
 	@Test // DATALDAP-60
 	void isStrictMatchIfDomainTypeIsAnnotatedWithEntry() {