LPD-43475 SF, inline

Author: rafaprax

modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/BCryptPasswordEncryptor.java

@@ -69,10 +69,10 @@ public String getEncryptionAlgorithmConfiguration(
 			rounds = matcher.group(1);
 		}
 
-		String algorithm = encryptedPassword.substring(
-			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
-
-		return StringBundler.concat(algorithm, CharPool.FORWARD_SLASH, rounds);
+		return StringBundler.concat(
+			encryptedPassword.substring(
+				1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE)),
+			CharPool.FORWARD_SLASH, rounds);
 	}
 
 	private static final int _ROUNDS = 10;

modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/PBKDF2PasswordEncryptor.java

@@ -105,10 +105,8 @@ public String getEncryptionAlgorithmConfiguration(
 			pbkdf2EncryptionConfiguration.configure(
 				StringPool.BLANK, encryptedPassword.substring(index + 1));
 
-			String algorithm = encryptedPassword.substring(1, index);
-
 			return StringBundler.concat(
-				algorithm, StringPool.FORWARD_SLASH,
+				encryptedPassword.substring(1, index), StringPool.FORWARD_SLASH,
 				pbkdf2EncryptionConfiguration.getKeySize(),
 				StringPool.FORWARD_SLASH,
 				pbkdf2EncryptionConfiguration.getRounds());

modules/apps/user/user-test/src/testIntegration/java/com/liferay/user/service/test/UserLocalServiceTest.java

@@ -1515,16 +1515,14 @@ private void _assertUserHasPasswordPolicy(boolean ldapUser, User user)
 
 		User user = UserTestUtil.addUser();
 
-		String password = "password";
-
 		try (AutoCloseable autoCloseable =
 				ReflectionTestUtil.setFieldValueWithAutoCloseable(
 					PasswordEncryptorUtil.class,
 					"_PASSWORDS_ENCRYPTION_ALGORITHM",
 					oldPasswordsEncryptionAlgorithm)) {
 
 			user = _userLocalService.updatePassword(
-				user.getUserId(), password, password, false, true);
+				user.getUserId(), "password", "password", false, true);
 
 			Assert.assertEquals(
 				oldPasswordsEncryptionAlgorithm,
@@ -1547,7 +1545,7 @@ private void _assertUserHasPasswordPolicy(boolean ldapUser, User user)
 				Authenticator.SUCCESS,
 				_userLocalService.authenticateByEmailAddress(
 					user.getCompanyId(), user.getDisplayEmailAddress(),
-					password, null, null, null));
+					"password", null, null, null));
 
 			user = _userLocalService.getUser(user.getUserId());
 

portal-kernel/src/com/liferay/portal/kernel/security/pwd/PasswordEncryptorUtil.java

@@ -83,9 +83,8 @@ public static String encrypt(
 	public static String getEncryptionAlgorithmConfiguration(
 		String encryptedPassword) {
 
-		String algorithm = _getEncryptedPasswordAlgorithm(encryptedPassword);
-
-		PasswordEncryptor passwordEncryptor = _select(algorithm);
+		PasswordEncryptor passwordEncryptor = _select(
+			_getEncryptedPasswordAlgorithm(encryptedPassword));
 
 		return passwordEncryptor.getEncryptionAlgorithmConfiguration(
 			encryptedPassword);