SONAR-12772 Remove deprecated ldap.user.user.objectClass and ldap.user.loginAttribute

diff --git a/server/sonar-auth-ldap/src/main/java/org/sonar/auth/ldap/LdapUserMapping.java b/server/sonar-auth-ldap/src/main/java/org/sonar/auth/ldap/LdapUserMapping.java
index 0faf4faf79487d4ab7568661127143014136e323..2420008713ff5115db39b3078545e07ad1773d13 100644 (file)
--- a/server/sonar-auth-ldap/src/main/java/org/sonar/auth/ldap/LdapUserMapping.java
+++ b/server/sonar-auth-ldap/src/main/java/org/sonar/auth/ldap/LdapUserMapping.java
@@ -31,8 +31,6 @@ public class LdapUserMapping {
 
   private static final Logger LOG = Loggers.get(LdapUserMapping.class);
 
-  private static final String DEFAULT_OBJECT_CLASS = "inetOrgPerson";
-  private static final String DEFAULT_LOGIN_ATTRIBUTE = "uid";
   private static final String DEFAULT_NAME_ATTRIBUTE = "cn";
   private static final String DEFAULT_EMAIL_ATTRIBUTE = "mail";
   private static final String DEFAULT_REQUEST = "(&(objectClass=inetOrgPerson)(uid={login}))";
@@ -56,26 +54,11 @@ public class LdapUserMapping {
       }
     }
 
-    String objectClass = settings.getString(settingsPrefix + ".user.objectClass");
-    String loginAttribute = settings.getString(settingsPrefix + ".user.loginAttribute");
-
     this.baseDn = usersBaseDn;
     this.realNameAttribute = StringUtils.defaultString(settings.getString(settingsPrefix + ".user.realNameAttribute"), DEFAULT_NAME_ATTRIBUTE);
     this.emailAttribute = StringUtils.defaultString(settings.getString(settingsPrefix + ".user.emailAttribute"), DEFAULT_EMAIL_ATTRIBUTE);
 
-    String req;
-    if (StringUtils.isNotBlank(objectClass) || StringUtils.isNotBlank(loginAttribute)) {
-      objectClass = StringUtils.defaultString(objectClass, DEFAULT_OBJECT_CLASS);
-      loginAttribute = StringUtils.defaultString(loginAttribute, DEFAULT_LOGIN_ATTRIBUTE);
-      req = "(&(objectClass=" + objectClass + ")(" + loginAttribute + "={login}))";
-      // For backward compatibility with plugin versions lower than 1.2
-      Loggers.get(LdapGroupMapping.class)
-        .warn("Properties '{}.user.objectClass' and '{}.user.loginAttribute' are deprecated and should be " +
-          "replaced by single property '{}.user.request' with value: {}",
-          settingsPrefix, settingsPrefix, settingsPrefix, req);
-    } else {
-      req = StringUtils.defaultString(settings.getString(settingsPrefix + ".user.request"), DEFAULT_REQUEST);
-    }
+    String req = StringUtils.defaultString(settings.getString(settingsPrefix + ".user.request"), DEFAULT_REQUEST);
     req = StringUtils.replace(req, "{login}", "{0}");
     this.request = req;
   }

diff --git a/server/sonar-auth-ldap/src/test/java/org/sonar/auth/ldap/LdapUserMappingTest.java b/server/sonar-auth-ldap/src/test/java/org/sonar/auth/ldap/LdapUserMappingTest.java
index f0f1876e91713e11596a8420e55dac58f44b1dd1..f1c6ff24a1db776cba4b155d77f8c1620e6be6dd 100644 (file)
--- a/server/sonar-auth-ldap/src/test/java/org/sonar/auth/ldap/LdapUserMappingTest.java
+++ b/server/sonar-auth-ldap/src/test/java/org/sonar/auth/ldap/LdapUserMappingTest.java
@@ -45,8 +45,7 @@ public class LdapUserMappingTest {
   public void activeDirectory() {
     MapSettings settings = new MapSettings()
       .setProperty("ldap.user.baseDn", "cn=users")
-      .setProperty("ldap.user.objectClass", "user")
-      .setProperty("ldap.user.loginAttribute", "sAMAccountName");
+      .setProperty("ldap.user.request", "(&(objectClass=user)(sAMAccountName={0}))");
 
     LdapUserMapping userMapping = new LdapUserMapping(settings, "ldap");
     LdapSearch search = userMapping.createSearch(null, "tester");