From 3c6c8d181d035f8f11e82d1feb152264de327fcf Mon Sep 17 00:00:00 2001 From: curry772 Date: Tue, 1 Sep 2026 11:26:11 +0900 Subject: [PATCH] =?UTF-8?q?isNotBlank=20->=20StringUtils.isNotBlank?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/eactive/eai/common/hsm/HsmManager.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/eactive/eai/common/hsm/HsmManager.java b/src/main/java/com/eactive/eai/common/hsm/HsmManager.java index 54fc3f9..0db1689 100644 --- a/src/main/java/com/eactive/eai/common/hsm/HsmManager.java +++ b/src/main/java/com/eactive/eai/common/hsm/HsmManager.java @@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit; import javax.crypto.SecretKey; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import com.eactive.eai.agent.encryption.EncryptionManager; @@ -191,15 +192,15 @@ public class HsmManager implements Lifecycle, PropertyChangeListener { String primaryConfig = decrypt(encManager, propManager.getProperty(GROUP_NAME, PROP_CONFIG)); String primaryPin = decrypt(encManager, propManager.getProperty(GROUP_NAME, PROP_PIN)); - if (isNotBlank(primaryConfig)) { + if (StringUtils.isNotBlank(primaryConfig)) { candidates.add(new HsmConfig(CONFIG_PRIMARY, normalizeConfig(primaryConfig), toPin(primaryPin))); } String secondaryConfig = decrypt(encManager, propManager.getProperty(GROUP_NAME, PROP_CONFIG_SECONDARY)); - if (isNotBlank(secondaryConfig)) { + if (StringUtils.isNotBlank(secondaryConfig)) { // PIN_SECONDARY 미설정이면 primary PIN 을 재사용한다 (슬롯만 이중화하는 구성 지원) String rawSecondaryPin = propManager.getProperty(GROUP_NAME, PROP_PIN_SECONDARY); - String secondaryPin = isNotBlank(rawSecondaryPin) ? decrypt(encManager, rawSecondaryPin) : primaryPin; + String secondaryPin = StringUtils.isNotBlank(rawSecondaryPin) ? decrypt(encManager, rawSecondaryPin) : primaryPin; candidates.add(new HsmConfig(CONFIG_SECONDARY, normalizeConfig(secondaryConfig), toPin(secondaryPin))); } @@ -213,10 +214,6 @@ public class HsmManager implements Lifecycle, PropertyChangeListener { return encManager.decryptDBData(value); } - private static boolean isNotBlank(String value) { - return value != null && !value.trim().isEmpty(); - } - private static String normalizeConfig(String configContent) { return configContent.trim().replace("\\n", "\n"); } @@ -287,7 +284,7 @@ public class HsmManager implements Lifecycle, PropertyChangeListener { try { String value = PropManager.getInstance().getProperty(GROUP_NAME, PROP_RELOAD_INTERVAL_MINUTES, String.valueOf(DEFAULT_RELOAD_INTERVAL_MINUTES)); - if (isNotBlank(value)) { + if (StringUtils.isNotBlank(value)) { newInterval = Long.parseLong(value.trim()); } } catch (Exception e) {