refactor for testing, avoid FAKE parameter

Author: Vladimir Kotal

plugins/src/main/java/opengrok/auth/plugin/AbstractLdapPlugin.java

@@ -30,7 +30,6 @@
 import opengrok.auth.plugin.configuration.Configuration;
 import opengrok.auth.plugin.entity.User;
 import opengrok.auth.plugin.ldap.AbstractLdapProvider;
-import opengrok.auth.plugin.ldap.FakeLdapFacade;
 import opengrok.auth.plugin.ldap.LdapFacade;
 import org.opengrok.indexer.authorization.IAuthorizationPlugin;
 import org.opengrok.indexer.configuration.Group;
@@ -60,7 +59,6 @@ public abstract class AbstractLdapPlugin implements IAuthorizationPlugin {
     public static long nextId = 1;
 
     protected static final String CONFIGURATION_PARAM = "configuration";
-    protected static final String FAKE_PARAM = "fake";
 
     private static final String SESSION_PREFIX = "opengrok-abstract-ldap-plugin-";
     protected String SESSION_USERNAME = SESSION_PREFIX + "username";
@@ -124,15 +122,8 @@ void load(AbstractLdapProvider provider) {
      */
     @Override
     public void load(Map<String, Object> parameters) {
-        Boolean fake;
         String configurationPath;
 
-        if ((fake = (Boolean) parameters.get(FAKE_PARAM)) != null
-                && fake) {
-            ldapProvider = new FakeLdapFacade();
-            return;
-        }
-        
         if ((configurationPath = (String) parameters.get(CONFIGURATION_PARAM)) == null) {
             throw new NullPointerException("Missing param [" + CONFIGURATION_PARAM + "]");
         }

plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java

@@ -76,10 +76,21 @@ public LdapAttrPlugin() {
         sessionAllowed += "-" + nextId++;
     }
 
+    // for testing
+    void load(Map<String, Object> parameters, AbstractLdapProvider provider) {
+        super.load(provider);
+
+        init(parameters);
+    }
+
     @Override
     public void load(Map<String, Object> parameters) {
         super.load(parameters);
 
+        init(parameters);
+    }
+
+    void init(Map<String, Object> parameters) {
         if ((ldapAttr = (String) parameters.get(ATTR_PARAM)) == null) {
             throw new NullPointerException("Missing param [" + ATTR_PARAM + "] in the setup");
         }

plugins/src/test/java/opengrok/auth/plugin/LdapAttrPluginTest.java

@@ -37,6 +37,7 @@
 import javax.servlet.http.HttpServletRequest;
 import opengrok.auth.entity.LdapUser;
 import opengrok.auth.plugin.entity.User;
+import opengrok.auth.plugin.ldap.FakeLdapFacade;
 import opengrok.auth.plugin.util.DummyHttpServletRequestLdap;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -73,11 +74,10 @@ public void setUp() {
         plugin = new LdapAttrPlugin();
         Map<String, Object> parameters = new TreeMap<>();
 
-        parameters.put(AbstractLdapPlugin.FAKE_PARAM, true);
         parameters.put(LdapAttrPlugin.FILE_PARAM, whitelistFile.getAbsolutePath());
         parameters.put(LdapAttrPlugin.ATTR_PARAM, "mail");
 
-        plugin.load(parameters);
+        plugin.load(parameters, new FakeLdapFacade());
     }
 
     @SuppressWarnings("unchecked")