Fix small warning-generating bugs (#43)

* fix: duplicate code

+ add new method to avoid code duplicate
+ use universal param's name: "pass" instead of "otp"

* Update PrivacyIDEA class

+ invert the serviceAccountAvailable method and change name to seviceAccountInaccessible
+ serverURL and userAgent: make them final and rm redundant initializers

* Revert "Update PrivacyIDEA class"

This reverts commit 2b37054.

* make serverURL and userAgent final

rm initializers

Author: lukasmatusiewicz

src/main/java/org/privacyidea/PrivacyIDEA.java

@@ -60,7 +60,7 @@ public class PrivacyIDEA
     private final IPISimpleLogger simpleLog;
     private final Endpoint endpoint;
     // Thread pool for connections
-    private final BlockingQueue<Runnable> queue = new ArrayBlockingQueue<Runnable>(100);
+    private final BlockingQueue<Runnable> queue = new ArrayBlockingQueue<>(100);
     private final ExecutorService threadPool = new ThreadPoolExecutor(20, 20, 10, TimeUnit.SECONDS, queue);
     final JSONParser parser;
     // Responses from these endpoints will not be logged. The list can be overwritten.
@@ -79,25 +79,25 @@ private PrivacyIDEA(PIConfig configuration, IPILogger logger, IPISimpleLogger si
     /**
      * @see PrivacyIDEA#validateCheck(String, String, String, Map)
      */
-    public PIResponse validateCheck(String username, String otp)
+    public PIResponse validateCheck(String username, String pass)
     {
-        return this.validateCheck(username, otp, null, Collections.emptyMap());
+        return this.validateCheck(username, pass, null, Collections.emptyMap());
     }
 
     /**
      * @see PrivacyIDEA#validateCheck(String, String, String, Map)
      */
-    public PIResponse validateCheck(String username, String otp, Map<String, String> headers)
+    public PIResponse validateCheck(String username, String pass, Map<String, String> headers)
     {
-        return this.validateCheck(username, otp, null, headers);
+        return this.validateCheck(username, pass, null, headers);
     }
 
     /**
      * @see PrivacyIDEA#validateCheck(String, String, String, Map)
      */
-    public PIResponse validateCheck(String username, String otp, String transactionId)
+    public PIResponse validateCheck(String username, String pass, String transactionId)
     {
-        return this.validateCheck(username, otp, transactionId, Collections.emptyMap());
+        return this.validateCheck(username, pass, transactionId, Collections.emptyMap());
     }
 
     /**
@@ -106,75 +106,75 @@ public PIResponse validateCheck(String username, String otp, String transactionI
      * (E.g. this can also be used to trigger challenges without a service account)
      *
      * @param username      username
-     * @param otp           the OTP, PIN+OTP or password to use.
+     * @param pass          pass/otp value
      * @param transactionId optional, will be appended if set
      * @param headers       optional headers for the request
      * @return PIResponse object containing the response or null if error
      */
-    public PIResponse validateCheck(String username, String otp, String transactionId, Map<String, String> headers)
+    public PIResponse validateCheck(String username, String pass, String transactionId, Map<String, String> headers)
     {
-        Map<String, String> params = new LinkedHashMap<>();
-
-        params.put(USER, username);
-        params.put(PASS, (otp != null ? otp : ""));
-
-        if (transactionId != null && !transactionId.isEmpty())
-        {
-            params.put(TRANSACTION_ID, transactionId);
-        }
-
-        appendRealm(params);
-
-        String response = runRequestAsync(ENDPOINT_VALIDATE_CHECK, params, headers, false, POST);
-        return this.parser.parsePIResponse(response);
+        return getPIResponse(USER, username, pass, headers, transactionId);
     }
 
-
     /**
      * @see PrivacyIDEA#validateCheckSerial(String, String, String, Map)
      */
-    public PIResponse validateCheckSerial(String serial, String otp)
+    public PIResponse validateCheckSerial(String serial, String pass)
     {
-        return this.validateCheckSerial(serial, otp, null, Collections.emptyMap());
+        return this.validateCheckSerial(serial, pass, null, Collections.emptyMap());
     }
 
     /**
      * @see PrivacyIDEA#validateCheckSerial(String, String, String, Map)
      */
-    public PIResponse validateCheckSerial(String serial, String otp, Map<String, String> headers)
+    public PIResponse validateCheckSerial(String serial, String pass, Map<String, String> headers)
     {
-        return this.validateCheckSerial(serial, otp, null, headers);
+        return this.validateCheckSerial(serial, pass, null, headers);
     }
 
     /**
      * @see PrivacyIDEA#validateCheckSerial(String, String, String, Map)
      */
-    public PIResponse validateCheckSerial(String serial, String otp, String transactionId)
+    public PIResponse validateCheckSerial(String serial, String pass, String transactionId)
     {
-        return this.validateCheckSerial(serial, otp, transactionId, Collections.emptyMap());
+        return this.validateCheckSerial(serial, pass, transactionId, Collections.emptyMap());
     }
 
     /**
-     * Send a request to /validate/check with the serial rather than the username to identify the token.
+     * Send a request to /validate/check with the serial rather than the username to identify exact token.
      *
      * @param serial        serial of the token
-     * @param otp           otp value
+     * @param pass          pass/otp value
      * @param transactionId transactionId
      * @return PIResponse or null if error
      */
-    public PIResponse validateCheckSerial(String serial, String otp, String transactionId, Map<String, String> headers)
+    public PIResponse validateCheckSerial(String serial, String pass, String transactionId, Map<String, String> headers)
     {
-        Map<String, String> params = new LinkedHashMap<>();
+        return getPIResponse(SERIAL, serial, pass, headers, transactionId);
+    }
 
-        params.put(SERIAL, serial);
-        params.put(PASS, (otp != null ? otp : ""));
+    /**
+     * Used by validateCheck and validateCheckSerial to get the PI Response.
+     *
+     * @param type          distinguish between user and serial to set forwarded input to the right PI-request param
+     * @param input         forwarded username for classic validateCheck or serial to trigger exact token
+     * @param pass          OTP, PIN+OTP or password to use
+     * @param headers       optional headers for the request
+     * @param transactionId optional, will be appended if set
+     * @return              PIResponse object containing the response or null if error
+     */
+    private PIResponse getPIResponse(String type, String input, String pass, Map<String, String> headers,
+                                     String transactionId)
+    {
+        Map<String, String> params = new LinkedHashMap<>();
+        // Add forwarded user or serial to the params
+        params.put(type, input);
+        params.put(PASS, (pass != null ? pass : ""));
+        appendRealm(params);
         if (transactionId != null && !transactionId.isEmpty())
         {
             params.put(TRANSACTION_ID, transactionId);
         }
-
-        appendRealm(params);
-
         String response = runRequestAsync(ENDPOINT_VALIDATE_CHECK, params, headers, false, POST);
         return this.parser.parsePIResponse(response);
     }
@@ -555,13 +555,13 @@ public static Builder newBuilder(String serverURL, String userAgent)
 
     public static class Builder
     {
-        private String serverURL = "";
+        private final String serverURL;
+        private final String userAgent;
         private String realm = "";
         private boolean doSSLVerify = true;
         private String serviceAccountName = "";
         private String serviceAccountPass = "";
         private String serviceAccountRealm = "";
-        private String userAgent = "";
         private IPILogger logger = null;
         private boolean disableLog = false;
         private IPISimpleLogger simpleLogBridge = null;