LPD-43475 DRY, extract default implementation to interface

Author: rafaprax

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

@@ -5,7 +5,6 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
-import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.exception.PwdEncryptorException;
 import com.liferay.portal.kernel.security.SecureRandom;
 import com.liferay.portal.kernel.security.pwd.PasswordEncryptor;
@@ -54,14 +53,6 @@ public String encrypt(
 		}
 	}
 
-	@Override
-	public String getEncryptionAlgorithmConfiguration(
-		String encryptedPassword) {
-
-		return encryptedPassword.substring(
-			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
-	}
-
 	protected byte[] getSalt(String encryptedPassword)
 		throws PwdEncryptorException {
 

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

@@ -5,7 +5,6 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
-import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.security.pwd.PasswordEncryptor;
 import com.liferay.portal.kernel.util.DigesterUtil;
 
@@ -29,12 +28,4 @@ public String encrypt(
 		return DigesterUtil.digest(algorithm, plainTextPassword);
 	}
 
-	@Override
-	public String getEncryptionAlgorithmConfiguration(
-		String encryptedPassword) {
-
-		return encryptedPassword.substring(
-			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
-	}
-
 }

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

@@ -5,7 +5,6 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
-import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.security.pwd.PasswordEncryptor;
 
 import org.osgi.service.component.annotations.Component;
@@ -28,12 +27,4 @@ public String encrypt(
 		return plainTextPassword;
 	}
 
-	@Override
-	public String getEncryptionAlgorithmConfiguration(
-		String encryptedPassword) {
-
-		return encryptedPassword.substring(
-			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
-	}
-
 }

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

@@ -5,7 +5,6 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
-import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.exception.PwdEncryptorException;
 import com.liferay.portal.kernel.io.BigEndianCodec;
 import com.liferay.portal.kernel.security.SecureRandomUtil;
@@ -68,14 +67,6 @@ public String encrypt(
 		}
 	}
 
-	@Override
-	public String getEncryptionAlgorithmConfiguration(
-		String encryptedPassword) {
-
-		return encryptedPassword.substring(
-			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
-	}
-
 	protected byte[] getSaltBytes(String encryptedPassword)
 		throws PwdEncryptorException {
 

modules/apps/portal-security/portal-security-password-encryptor-impl/src/test/java/com/liferay/portal/security/password/encryptor/internal/PasswordEncryptorUtilTest.java

@@ -344,13 +344,6 @@ public String encrypt(
 				algorithm.substring(algorithm.indexOf('/') + 1);
 		}
 
-		@Override
-		public String getEncryptionAlgorithmConfiguration(
-			String encryptedPassword) {
-
-			return null;
-		}
-
 	}
 
 }

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

@@ -5,6 +5,7 @@
 
 package com.liferay.portal.kernel.security.pwd;
 
+import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.exception.PwdEncryptorException;
 
 import org.osgi.annotation.versioning.ProviderType;
@@ -50,6 +51,11 @@ public String encrypt(
 			String encryptedPassword, boolean upgradeHashSecurity)
 		throws PwdEncryptorException;
 
-	public String getEncryptionAlgorithmConfiguration(String encryptedPassword);
+	public default String getEncryptionAlgorithmConfiguration(
+		String encryptedPassword) {
+
+		return encryptedPassword.substring(
+			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
+	}
 
 }