Merge pull request #132 from egovframe-contribution/change-anno-crypt…

…ography Changed Require Annotation, Deprecated. as of 5.1, in favor of using …
eGovFramework · Nov 3, 2023 · ebd5e42 · ebd5e42
2 parents 40c3865 + 9a5b8be
commit ebd5e42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/....rte.fdl.crypto/src/main/java/org/egovframe/rte/fdl/cryptography/EgovPasswordEncoder.java b/....rte.fdl.crypto/src/main/java/org/egovframe/rte/fdl/cryptography/EgovPasswordEncoder.java
@@ -33,7 +33,7 @@
 package org.egovframe.rte.fdl.cryptography;
 
 import org.jasypt.util.password.ConfigurablePasswordEncryptor;
-import org.springframework.beans.factory.annotation.Required;
+import org.springframework.beans.factory.annotation.Autowired;
 
 public class EgovPasswordEncoder {
 
@@ -49,7 +49,7 @@ public void setAlgorithm(String algorithm) {
 		this.algorithm = algorithm;
 	}
 
-	@Required
+	@Autowired(required=true)
 	public void setHashedPassword(String hashedPassword) {
 		this.hashedPassword = hashedPassword;
 	}

diff --git a/...ypto/src/main/java/org/egovframe/rte/fdl/cryptography/impl/EgovARIACryptoServiceImpl.java b/...ypto/src/main/java/org/egovframe/rte/fdl/cryptography/impl/EgovARIACryptoServiceImpl.java
@@ -22,7 +22,7 @@
 import org.egovframe.rte.fdl.logging.util.EgovResourceReleaser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Required;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ReflectionUtils;
 
 import java.io.ByteArrayOutputStream;
@@ -41,7 +41,7 @@ public class EgovARIACryptoServiceImpl implements EgovARIACryptoService {
 	private EgovPasswordEncoder passwordEncoder;
 	private int blockSize = DEFAULT_BLOCKSIZE;
 
-	@Required
+	@Autowired(required=true)
 	public void setPasswordEncoder(EgovPasswordEncoder passwordEncoder) {
 		this.passwordEncoder = passwordEncoder;
 		LOGGER.debug("passwordEncoder's algorithm : {}", passwordEncoder.getAlgorithm());

diff --git a/...o/src/main/java/org/egovframe/rte/fdl/cryptography/impl/EgovGeneralCryptoServiceImpl.java b/...o/src/main/java/org/egovframe/rte/fdl/cryptography/impl/EgovGeneralCryptoServiceImpl.java
@@ -23,7 +23,7 @@
 import org.jasypt.encryption.pbe.StandardPBEByteEncryptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Required;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ReflectionUtils;
 
 import java.io.*;
@@ -48,7 +48,7 @@ public void setAlgorithm(String algorithm) {
 		LOGGER.debug("General Crypto Service's algorithm : {}", algorithm);
 	}
 
-	@Required
+	@Autowired(required=true)
 	public void setPasswordEncoder(EgovPasswordEncoder passwordEncoder) {
 		this.passwordEncoder = passwordEncoder;
 		LOGGER.debug("passwordEncoder's algorithm : {}", passwordEncoder.getAlgorithm());