Polishing.

First round of polishing.

Author: mp911de

src/main/java/org/springframework/data/ldap/repository/query/AnnotatedLdapRepositoryQuery.java

@@ -44,11 +44,11 @@ public class AnnotatedLdapRepositoryQuery extends AbstractLdapRepositoryQuery {
 	/**
 	 * Construct a new instance.
 	 *
-	 * @param queryMethod             the QueryMethod.
-	 * @param entityType              the managed class.
-	 * @param ldapOperations          the LdapOperations instance to use.
-	 * @param mappingContext          must not be {@literal null}.
-	 * @param instantiators           must not be {@literal null}.
+	 * @param queryMethod the QueryMethod.
+	 * @param entityType the managed class.
+	 * @param ldapOperations the LdapOperations instance to use.
+	 * @param mappingContext must not be {@literal null}.
+	 * @param instantiators must not be {@literal null}.
 	 * @deprecated use the constructor with {@link ValueExpressionDelegate}
 	 */
 	@Deprecated(since = "3.4")
@@ -62,11 +62,11 @@ public AnnotatedLdapRepositoryQuery(LdapQueryMethod queryMethod, Class<?> entity
 	/**
 	 * Construct a new instance.
 	 *
-	 * @param queryMethod             the QueryMethod.
-	 * @param entityType              the managed class.
-	 * @param ldapOperations          the LdapOperations instance to use.
-	 * @param mappingContext          must not be {@literal null}.
-	 * @param instantiators           must not be {@literal null}.
+	 * @param queryMethod the QueryMethod.
+	 * @param entityType the managed class.
+	 * @param ldapOperations the LdapOperations instance to use.
+	 * @param mappingContext must not be {@literal null}.
+	 * @param instantiators must not be {@literal null}.
 	 * @param valueExpressionDelegate must not be {@literal null}
 	 * @since 3.4
 	 */
@@ -87,10 +87,13 @@ public AnnotatedLdapRepositoryQuery(LdapQueryMethod queryMethod, Class<?> entity
 
 	@Override
 	protected LdapQuery createQuery(LdapParameterAccessor parameters) {
-		ValueEvaluationContextProvider valueContextProvider = valueExpressionDelegate.createValueContextProvider(
-				getQueryMethod().getParameters());
-		ValueEvaluationContext evaluationContext = valueContextProvider.getEvaluationContext(
-				parameters.getBindableParameterValues(), stringBasedQuery.getExpressionDependencies());
+
+		ValueEvaluationContextProvider valueContextProvider = valueExpressionDelegate
+				.createValueContextProvider(getQueryMethod().getParameters());
+
+		ValueEvaluationContext evaluationContext = valueContextProvider
+				.getEvaluationContext(parameters.getBindableParameterValues(), stringBasedQuery.getExpressionDependencies());
+
 		String boundQuery = stringBasedQuery.bindQuery(parameters,
 				new ContextualValueExpressionEvaluator(valueExpressionDelegate, evaluationContext));
 

src/test/java/org/springframework/data/ldap/config/EmbeddedLdapProperties.java

@@ -3,27 +3,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.core.io.Resource;
-import org.springframework.util.StringUtils;
-
-/**
- * Configuration properties for Embedded LDAP. Taken from Spring Boot.
- *
- * @author Eddú Meléndez
- * @author Mathieu Ouellet
- */
 public class EmbeddedLdapProperties {
 
 	/**
 	 * Embedded LDAP port.
 	 */
 	private int port = 0;
 
-	/**
-	 * Embedded LDAP credentials.
-	 */
-	private Credential credential = new Credential();
-
 	/**
 	 * List of base DNs.
 	 */
@@ -34,11 +20,6 @@ public class EmbeddedLdapProperties {
 	 */
 	private String ldif = "classpath:schema.ldif";
 
-	/**
-	 * Schema validation.
-	 */
-	private final Validation validation = new Validation();
-
 	public int getPort() {
 		return this.port;
 	}
@@ -47,14 +28,6 @@ public void setPort(int port) {
 		this.port = port;
 	}
 
-	public Credential getCredential() {
-		return this.credential;
-	}
-
-	public void setCredential(Credential credential) {
-		this.credential = credential;
-	}
-
 	public List<String> getBaseDn() {
 		return this.baseDn;
 	}
@@ -71,72 +44,4 @@ public void setLdif(String ldif) {
 		this.ldif = ldif;
 	}
 
-	public Validation getValidation() {
-		return this.validation;
-	}
-
-	public static class Credential {
-
-		/**
-		 * Embedded LDAP username.
-		 */
-		private String username;
-
-		/**
-		 * Embedded LDAP password.
-		 */
-		private String password;
-
-		public String getUsername() {
-			return this.username;
-		}
-
-		public void setUsername(String username) {
-			this.username = username;
-		}
-
-		public String getPassword() {
-			return this.password;
-		}
-
-		public void setPassword(String password) {
-			this.password = password;
-		}
-
-		boolean isAvailable() {
-			return StringUtils.hasText(this.username) && StringUtils.hasText(this.password);
-		}
-
-	}
-
-	public static class Validation {
-
-		/**
-		 * Whether to enable LDAP schema validation.
-		 */
-		private boolean enabled = false;
-
-		/**
-		 * Path to the custom schema.
-		 */
-		private Resource schema;
-
-		public boolean isEnabled() {
-			return this.enabled;
-		}
-
-		public void setEnabled(boolean enabled) {
-			this.enabled = enabled;
-		}
-
-		public Resource getSchema() {
-			return this.schema;
-		}
-
-		public void setSchema(Resource schema) {
-			this.schema = schema;
-		}
-
-	}
-
-}
+}

src/test/java/org/springframework/data/ldap/config/InMemoryLdapConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 the original author or authors.
+ * Copyright 2024 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.
@@ -15,18 +15,12 @@
  */
 package org.springframework.data.ldap.config;
 
+import jakarta.annotation.PreDestroy;
+
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.unboundid.ldap.listener.InMemoryDirectoryServer;
-import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
-import com.unboundid.ldap.listener.InMemoryListenerConfig;
-import com.unboundid.ldap.sdk.LDAPException;
-import com.unboundid.ldap.sdk.schema.Schema;
-import com.unboundid.ldif.LDIFReader;
-import jakarta.annotation.PreDestroy;
-
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -42,6 +36,12 @@
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
+import com.unboundid.ldap.listener.InMemoryDirectoryServer;
+import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
+import com.unboundid.ldap.listener.InMemoryListenerConfig;
+import com.unboundid.ldap.sdk.LDAPException;
+import com.unboundid.ldif.LDIFReader;
+
 /**
  * Taken from Spring Boot
  */
@@ -63,10 +63,6 @@ public InMemoryDirectoryServer directoryServer(ApplicationContext applicationCon
 			throws LDAPException {
 		String[] baseDn = StringUtils.toStringArray(this.embeddedProperties.getBaseDn());
 		InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig(baseDn);
-		if (this.embeddedProperties.getCredential().isAvailable()) {
-			config.addAdditionalBindCredentials(this.embeddedProperties.getCredential().getUsername(),
-					this.embeddedProperties.getCredential().getPassword());
-		}
 		setSchema(config);
 		InMemoryListenerConfig listenerConfig = InMemoryListenerConfig.createLDAPConfig("LDAP",
 				this.embeddedProperties.getPort());
@@ -86,10 +82,6 @@ LdapContextSource ldapContextSource(Environment environment, EmbeddedLdapPropert
 		LdapContextSource source = new LdapContextSource();
 		Assert.notEmpty(properties.getBaseDn(), "Base DN must be set with at least one value");
 		source.setBase(properties.getBaseDn().get(0));
-		if (embeddedProperties.getCredential().isAvailable()) {
-			source.setUserDn(embeddedProperties.getCredential().getUsername());
-			source.setPassword(embeddedProperties.getCredential().getPassword());
-		}
 		source.setUrls(determineUrls(environment, properties.getPort()));
 		return source;
 	}
@@ -104,25 +96,7 @@ private String[] determineUrls(Environment environment, int port) {
 	}
 
 	private void setSchema(InMemoryDirectoryServerConfig config) {
-		if (!this.embeddedProperties.getValidation().isEnabled()) {
 			config.setSchema(null);
-			return;
-		}
-		Resource schema = this.embeddedProperties.getValidation().getSchema();
-		if (schema != null) {
-			setSchema(config, schema);
-		}
-	}
-
-	private void setSchema(InMemoryDirectoryServerConfig config, Resource resource) {
-		try {
-			Schema defaultSchema = Schema.getDefaultStandardSchema();
-			Schema schema = Schema.getSchema(resource.getInputStream());
-			config.setSchema(Schema.mergeSchemas(defaultSchema, schema));
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException("Unable to load schema " + resource.getDescription(), ex);
-		}
 	}
 
 	private void importLdif(ApplicationContext applicationContext) {

src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTests.java

@@ -60,8 +60,6 @@ class SimpleLdapRepositoryTests {
 	@BeforeEach
 	void prepareTestedInstance() {
 		tested = new SimpleLdapRepository<>(ldapOperationsMock, odmMock, Object.class);
-
-
 	}
 
 	@Test

src/test/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTests.java

@@ -29,7 +29,6 @@
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.query.LdapQuery;
 import org.springframework.test.context.ContextConfiguration;