SEC-2071: Move optional constructor arg last

ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java

@@ -107,11 +107,11 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda
      * @param url an LDAP url (or multiple URLs)
      * @param rootDn the root DN (may be null or empty)
      */
-    public ActiveDirectoryLdapAuthenticationProvider(String rootDn, String domain, String url) {
+    public ActiveDirectoryLdapAuthenticationProvider(String domain, String url, String rootDn) {
         Assert.isTrue(StringUtils.hasText(url), "Url cannot be empty");
         this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null;
-        this.rootDn = StringUtils.hasText(rootDn) ? rootDn.toLowerCase() : null;
         this.url = url;
+        this.rootDn = StringUtils.hasText(rootDn) ? rootDn.toLowerCase() : null;
     }
 
     /**

ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java

@@ -314,7 +314,7 @@ public class ActiveDirectoryLdapAuthenticationProviderTests {
 
     @Test
     public void rootDnProvidedSeparatelyFromDomainAlsoWorks() throws Exception {
-        ActiveDirectoryLdapAuthenticationProvider provider = new ActiveDirectoryLdapAuthenticationProvider("dc=ad,dc=eu,dc=mydomain", "mydomain.eu", "ldap://192.168.1.200/");
+        ActiveDirectoryLdapAuthenticationProvider provider = new ActiveDirectoryLdapAuthenticationProvider("mydomain.eu", "ldap://192.168.1.200/", "dc=ad,dc=eu,dc=mydomain");
         checkAuthentication("dc=ad,dc=eu,dc=mydomain", provider);
 
     }