isNotBlank -> StringUtils.isNotBlank로 변경

This commit is contained in:
curry772
2026-09-01 11:26:11 +09:00
parent 2240a0d604
commit 3c6c8d181d
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.eactive.eai.agent.encryption.EncryptionManager; 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 primaryConfig = decrypt(encManager, propManager.getProperty(GROUP_NAME, PROP_CONFIG));
String primaryPin = decrypt(encManager, propManager.getProperty(GROUP_NAME, PROP_PIN)); 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))); candidates.add(new HsmConfig(CONFIG_PRIMARY, normalizeConfig(primaryConfig), toPin(primaryPin)));
} }
String secondaryConfig = decrypt(encManager, propManager.getProperty(GROUP_NAME, PROP_CONFIG_SECONDARY)); String secondaryConfig = decrypt(encManager, propManager.getProperty(GROUP_NAME, PROP_CONFIG_SECONDARY));
if (isNotBlank(secondaryConfig)) { if (StringUtils.isNotBlank(secondaryConfig)) {
// PIN_SECONDARY 미설정이면 primary PIN 을 재사용한다 (슬롯만 이중화하는 구성 지원) // PIN_SECONDARY 미설정이면 primary PIN 을 재사용한다 (슬롯만 이중화하는 구성 지원)
String rawSecondaryPin = propManager.getProperty(GROUP_NAME, PROP_PIN_SECONDARY); 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))); candidates.add(new HsmConfig(CONFIG_SECONDARY, normalizeConfig(secondaryConfig), toPin(secondaryPin)));
} }
@@ -213,10 +214,6 @@ public class HsmManager implements Lifecycle, PropertyChangeListener {
return encManager.decryptDBData(value); return encManager.decryptDBData(value);
} }
private static boolean isNotBlank(String value) {
return value != null && !value.trim().isEmpty();
}
private static String normalizeConfig(String configContent) { private static String normalizeConfig(String configContent) {
return configContent.trim().replace("\\n", "\n"); return configContent.trim().replace("\\n", "\n");
} }
@@ -287,7 +284,7 @@ public class HsmManager implements Lifecycle, PropertyChangeListener {
try { try {
String value = PropManager.getInstance().getProperty(GROUP_NAME, PROP_RELOAD_INTERVAL_MINUTES, String value = PropManager.getInstance().getProperty(GROUP_NAME, PROP_RELOAD_INTERVAL_MINUTES,
String.valueOf(DEFAULT_RELOAD_INTERVAL_MINUTES)); String.valueOf(DEFAULT_RELOAD_INTERVAL_MINUTES));
if (isNotBlank(value)) { if (StringUtils.isNotBlank(value)) {
newInterval = Long.parseLong(value.trim()); newInterval = Long.parseLong(value.trim());
} }
} catch (Exception e) { } catch (Exception e) {