Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/eactive/workspaces/eapim-bundle/bundles/251211/eapim-admin_incremental_2025-11-15.bundle into jenkins_with_weblogic

src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java

@@ -2,6 +2,7 @@ package com.eactive.eai.rms.data.entity.man.monitoringProperty.service;
 
 import java.util.Optional;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -14,13 +15,14 @@ import com.querydsl.core.types.dsl.BooleanExpression;
 
 @Service
 @Transactional
+@Slf4j
 public class MonitoringPropertyService
 		extends AbstractDataService<MonitoringProperty, MonitoringPropertyId, MonitoringPropertyRepository> {
 
 	public String findPrpty2ValById(String prptyGroupName, String key) {
 		MonitoringPropertyId id = new MonitoringPropertyId();
 		id.setPrptyGroupName(prptyGroupName);
-		id.setPrptyGroupName(key);
+		id.setPrptyName(key);
 
 		Optional<MonitoringProperty> property = repository.findById(id);
 		return property.map(MonitoringProperty::getPrpty2Val).orElse(null);
@@ -44,9 +46,12 @@ public class MonitoringPropertyService
 		if (property.isPresent()) {
 			String value = property.get().getPrpty2Val();
 			if (value != null && !value.isEmpty()) {
+				log.debug("getPropertyValue - {} : {}", prptyName, value);
 				return value;
 			}
 		}
+
+		log.debug("getPropertyValue - {} : {} (defaultValue)", prptyName, defaultValue);
 		return defaultValue;
 	}
 

src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java

@@ -94,12 +94,12 @@ public class KjbPropertyInjector {
     private static Object convertValue(Class<?> type, String rawValue) {
         if (rawValue == null) return null;
 
-        if (type == String.class) return rawValue;
+        // 빈 문자열인 경우 null 반환 (필드의 기본값 유지)
-
-        // 빈 문자열인 경우 primitive 타입은 null 반환 (필드의 기본값 유지)
         if (StringUtils.isEmpty(rawValue)) {
             return null;
         }
+        
+        if (type == String.class) return rawValue;
 
         try {
             if (type == Integer.class || type == int.class) return Integer.valueOf(rawValue);