Spring/spring-data-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adopt to deprecation removals in Commons.

Browse Source 
Closes #519
This commit is contained in:
Mark Paluch
2024-11-19 14:29:53 +01:00
parent db08094001
commit 064c854cf4
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,10 +40,8 @@ import org.springframework.data.repository.core.RepositoryMetadata;
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 @@ public class LdapRepositoryFactory extends RepositoryFactorySupport {
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 @@ public class LdapRepositoryFactory extends RepositoryFactorySupport {
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 class LdapRepositoryFactory extends RepositoryFactorySupport {
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);
}

2
src/test/java/org/springframework/data/ldap/repository/config/LdapRepositoryConfigurationExtensionUnitTests.java
View File

@@ -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() {