[Minor] Code cleanup

privilege/src/main/java/li/strolch/privilege/handler/BasicPasswordStrengthHandler.java

@@ -37,8 +37,8 @@ public class BasicPasswordStrengthHandler implements PasswordStrengthHandler {
 		String description;
 
 		if (this.maxLength < 100)
-			description = MessageFormat
+			description = MessageFormat.format(getString(locale, "Privilege.passwordLengthBetween"), this.minLength,
-					.format(getString(locale, "Privilege.passwordLengthBetween"), this.minLength, this.maxLength);
+					this.maxLength);
 		else
 			description = MessageFormat.format(getString(locale, "Privilege.passwordLengthAtLeast"), this.minLength);
 

privilege/src/main/java/li/strolch/privilege/handler/JsonConfigLdapPrivilegeHandler.java

@@ -42,15 +42,14 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
 		DBC.PRE.assertNotEmpty("realm must be set!", realm);
 
 		this.defaultLocale = parameterMap.containsKey("defaultLocale") ?
-				Locale.forLanguageTag(parameterMap.get("defaultLocale")) :
+				Locale.forLanguageTag(parameterMap.get("defaultLocale")) : Locale.getDefault();
-				Locale.getDefault();
 
 		String configFileS = parameterMap.get("configFile");
 		DBC.PRE.assertNotEmpty("configFile param must be set!", configFileS);
 		File configFile = new File(configFileS);
 		if (!configFile.exists() || !configFile.isFile() || !configFile.canRead())
-			throw new IllegalStateException("configFile does not exist, is not a file, or can not be read at path "
+			throw new IllegalStateException("configFile does not exist, is not a file, or can not be read at path " +
-					+ configFile.getAbsolutePath());
+					configFile.getAbsolutePath());
 
 		// parse the configuration file
 		JsonObject configJ;
@@ -82,14 +81,14 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
 		// validate the configuration
 		for (String name : this.ldapGroupNames) {
 			JsonObject config = ldapGroupConfigs.get(name).getAsJsonObject();
-			if (!config.has(LOCATION) || !config.get(LOCATION).isJsonArray()
+			if (!config.has(LOCATION) || !config.get(LOCATION).isJsonArray() ||
-					|| config.get(LOCATION).getAsJsonArray().size() == 0)
+					config.get(LOCATION).getAsJsonArray().isEmpty())
-				throw new IllegalStateException("LDAP Group " + name
+				throw new IllegalStateException("LDAP Group " + name +
-						+ " is missing a location attribute, or it is not an array or the array is empty");
+						" is missing a location attribute, or it is not an array or the array is empty");
-			if (!config.has(LOCATION) || !config.get(LOCATION).isJsonArray()
+			if (!config.has(LOCATION) || !config.get(LOCATION).isJsonArray() ||
-					|| config.get(LOCATION).getAsJsonArray().size() == 0)
+					config.get(LOCATION).getAsJsonArray().isEmpty())
-				throw new IllegalStateException("LDAP Group " + name
+				throw new IllegalStateException("LDAP Group " + name +
-						+ " is missing a roles attribute, or it is not an array or the array is empty");
+						" is missing a roles attribute, or it is not an array or the array is empty");
 		}
 
 		this.userLdapGroupOverrides = new HashMap<>();
@@ -133,17 +132,16 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
 			logger.info("Overriding LDAP group for user " + username + " to " + overrideGroup);
 		}
 
-		Set<String> relevantLdapGroups = ldapGroups.stream()
+		Set<String> relevantLdapGroups = ldapGroups.stream().filter(s -> this.ldapGroupNames.contains(s))
-				.filter(s -> this.ldapGroupNames.contains(s))
 				.collect(toSet());
 		if (relevantLdapGroups.isEmpty())
-			throw new IllegalStateException("User " + username
+			throw new IllegalStateException("User " + username +
-					+ " can not login, as none of their LDAP Groups have mappings to Strolch Roles!");
+					" can not login, as none of their LDAP Groups have mappings to Strolch Roles!");
 
 		if (relevantLdapGroups.size() > 1) {
 			logger.warn(
-					"User " + username + " has multiple relevant LDAP Groups which will lead to undefined behaviour: "
+					"User " + username + " has multiple relevant LDAP Groups which will lead to undefined behaviour: " +
-							+ join(",", relevantLdapGroups));
+							join(",", relevantLdapGroups));
 		}
 
 		return relevantLdapGroups;
@@ -194,9 +192,8 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
 				} else {
 					String location = primaryLocationJ.getAsString();
 					if (!secondaryLocations.contains(location)) {
-						logger.warn(
+						logger.warn("Primary location already set by previous LDAP Group config for LDAP Group " +
-								"Primary location already set by previous LDAP Group config for LDAP Group " + ldapGroup
+								ldapGroup + ", adding to secondary locations.");
-										+ ", adding to secondary locations.");
 						secondaryLocations.add(location);
 					}
 				}
@@ -210,9 +207,8 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
 					else
 						secondaryLocationsJ.getAsJsonArray().forEach(s -> secondaryLocations.add(s.getAsString()));
 				} else {
-					logger.warn(
+					logger.warn("Secondary locations already set by previous LDAP Group config for LDAP Group " +
-							"Secondary locations already set by previous LDAP Group config for LDAP Group " + ldapGroup
+							ldapGroup + ", adding additional");
-									+ ", adding additional");
 					if (secondaryLocationsJ.isJsonPrimitive())
 						secondaryLocations.add(secondaryLocationsJ.getAsString());
 					else

privilege/src/main/java/li/strolch/privilege/handler/MailUserChallengeHandler.java

@@ -16,9 +16,9 @@ public class MailUserChallengeHandler extends UserChallengeHandler {
 
 		String subject = "Mail TAN";
 
-		String text = "Hello " + user.getFirstname() + " " + user.getLastname() + "\n\n"
+		String text = "Hello " + user.getFirstname() + " " + user.getLastname() + "\n\n" +
-				+ "You have requested an action which requires you to respond to a challenge.\n\n"
+				"You have requested an action which requires you to respond to a challenge.\n\n" +
-				+ "Please use the following code to response to the challenge:\n\n" + challenge;
+				"Please use the following code to response to the challenge:\n\n" + challenge;
 		String recipient = user.getEmail();
 		if (StringHelper.isEmpty(recipient)) {
 			String msg = "User {0} has no property {1}, so can not initiate challenge!";

privilege/src/main/java/li/strolch/privilege/handler/PasswordStrengthHandler.java

@@ -12,8 +12,7 @@ public interface PasswordStrengthHandler {
 	 * Initialize the concrete {@link PasswordStrengthHandler}. The passed parameter map contains any configuration the
 	 * concrete {@link PasswordStrengthHandler} might need
 	 *
-	 * @param parameterMap
+	 * @param parameterMap a map containing configuration properties
-	 * 		a map containing configuration properties
 	 */
 	void initialize(Map<String, String> parameterMap);
 
@@ -21,16 +20,16 @@ public interface PasswordStrengthHandler {
 	 * Returns a description what a password must contain in order to be regarded as strong for this concrete
 	 * implementation
 	 *
+	 * @param locale the locale in which to return the description
+	 *
 	 * @return a description of a strong password
-	 * @param locale
 	 */
 	String getDescription(Locale locale);
 
 	/**
 	 * Performs the validation of the given password
 	 *
-	 * @param password
+	 * @param password the password to validate
-	 * 		the password to validate
 	 *
 	 * @return true if the password meets the criteria for a strong password
 	 */

privilege/src/main/java/li/strolch/privilege/handler/SimpleLdapPrivilegeHandler.java

@@ -39,8 +39,7 @@ public class SimpleLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
 		this.realm = parameterMap.getOrDefault(REALM, "");
 
 		this.defaultLocale = parameterMap.containsKey("defaultLocale") ?
-				Locale.forLanguageTag(parameterMap.get("defaultLocale")) :
+				Locale.forLanguageTag(parameterMap.get("defaultLocale")) : Locale.getDefault();
-				Locale.getDefault();
 
 		this.adminUsers = parameterMap.get("adminUsers");
 		this.rolesForLdapGroups = getLdapGroupToRolesMappingFromConfig(parameterMap);