Enum for referral field in LdapProperties.java

Signed-off-by: Andras, Dobrosi <[email protected]>

Author: dobrosi

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java

@@ -17,12 +17,14 @@
 package org.springframework.boot.autoconfigure.ldap;
 
 import java.util.Collections;
+import java.util.Optional;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.ldap.LdapProperties.Referral;
 import org.springframework.boot.autoconfigure.ldap.LdapProperties.Template;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.context.properties.PropertyMapper;
@@ -67,7 +69,7 @@ public LdapContextSource ldapContextSource(LdapConnectionDetails connectionDetai
 		propertyMapper.from(connectionDetails.getUsername()).to(source::setUserDn);
 		propertyMapper.from(connectionDetails.getPassword()).to(source::setPassword);
 		propertyMapper.from(properties.getAnonymousReadOnly()).to(source::setAnonymousReadOnly);
-		propertyMapper.from(properties.getReferral()).to(source::setReferral);
+		Optional.ofNullable(properties.getReferral()).map(Referral::getMode).ifPresent(source::setReferral);
 		propertyMapper.from(connectionDetails.getBase()).to(source::setBase);
 		propertyMapper.from(connectionDetails.getUrls()).to(source::setUrls);
 		propertyMapper.from(properties.getBaseEnvironment())

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java

@@ -21,6 +21,7 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.core.env.Environment;
+import org.springframework.ldap.ReferralException;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -65,7 +66,7 @@ public class LdapProperties {
 	/**
 	 * Set the method to handle referrals.
 	 */
-	private String referral;
+	private Referral referral;
 
 	/**
 	 * LDAP specification settings.
@@ -114,11 +115,11 @@ public void setAnonymousReadOnly(Boolean anonymousReadOnly) {
 		this.anonymousReadOnly = anonymousReadOnly;
 	}
 
-	public String getReferral() {
+	public Referral getReferral() {
 		return this.referral;
 	}
 
-	public void setReferral(String referral) {
+	public void setReferral(Referral referral) {
 		this.referral = referral;
 	}
 
@@ -195,4 +196,36 @@ public void setIgnoreSizeLimitExceededException(Boolean ignoreSizeLimitExceededE
 
 	}
 
+	/**
+	 * Enum to define how referrals encountered by the service provider are to be processed.
+	 */
+	public enum Referral {
+
+		/**
+		 * follow referrals automatically
+		 */
+		FOLLOW("follow"),
+
+		/**
+		 * ignore referrals
+		 */
+		IGNORE("ignore"),
+
+		/**
+		 * throw a {@link ReferralException} for each referral
+		 */
+		THROW("throw");
+
+		private final String mode;
+
+		Referral(String mode) {
+			this.mode = mode;
+		}
+
+		public String getMode() {
+			return this.mode;
+		}
+
+	}
+
 }