diff --git a/elink-online-common b/elink-online-common index 9589bc6..437961e 160000 --- a/elink-online-common +++ b/elink-online-common @@ -1 +1 @@ -Subproject commit 9589bc635aac190ddea60f065fe397231fbfcd7b +Subproject commit 437961e7d518df958b2b3109bf19d0c8beec4b3f diff --git a/src/main/java/com/eactive/eai/manage/inflow/InflowGroupBucketService.java b/src/main/java/com/eactive/eai/manage/inflow/InflowGroupBucketService.java index ceabb45..d0496ae 100644 --- a/src/main/java/com/eactive/eai/manage/inflow/InflowGroupBucketService.java +++ b/src/main/java/com/eactive/eai/manage/inflow/InflowGroupBucketService.java @@ -5,15 +5,16 @@ import java.util.List; import org.springframework.stereotype.Service; +import com.eactive.eai.common.inflow.AbstractInflowControlManager; import com.eactive.eai.common.inflow.CustomGroupBucket; -import com.eactive.eai.common.inflow.InflowControlManager; +import com.eactive.eai.common.inflow.InflowControlUtil; import com.eactive.eai.common.inflow.InflowGroupVO; @Service public class InflowGroupBucketService { public GroupBucketStatusDTO getGroupBucketStatus(String groupId) { - InflowControlManager manager = InflowControlManager.getInstance(); + AbstractInflowControlManager manager = InflowControlUtil.getInflowControlManager(); InflowGroupVO groupVo = manager.getGroupInflowThreshold(groupId); if (groupVo == null) { @@ -71,11 +72,11 @@ public class InflowGroupBucketService { } public CustomGroupBucket getCustomGroupBucket(String groupId) { - return InflowControlManager.getInstance().getGroupBucket(groupId); + return InflowControlUtil.getInflowControlManager().getGroupBucket(groupId); } public List getAllGroupBucketStatus() { - InflowControlManager manager = InflowControlManager.getInstance(); + AbstractInflowControlManager manager = InflowControlUtil.getInflowControlManager(); String[] groupIds = manager.getGroupAllKeys(); List result = new ArrayList<>(); diff --git a/src/main/java/com/eactive/eai/manage/inflow/InflowTargetBucketService.java b/src/main/java/com/eactive/eai/manage/inflow/InflowTargetBucketService.java index 6168aae..5773a9c 100644 --- a/src/main/java/com/eactive/eai/manage/inflow/InflowTargetBucketService.java +++ b/src/main/java/com/eactive/eai/manage/inflow/InflowTargetBucketService.java @@ -6,7 +6,8 @@ import java.util.Map; import org.springframework.stereotype.Service; -import com.eactive.eai.common.inflow.InflowControlManager; +import com.eactive.eai.common.inflow.AbstractInflowControlManager; +import com.eactive.eai.common.inflow.InflowControlUtil; import com.eactive.eai.common.inflow.InflowTargetVO; import com.eactive.eai.common.inflow.dual.DualCustomBucket; import com.eactive.eai.common.inflow.dual.DualInflowControlManager; @@ -79,7 +80,7 @@ public class InflowTargetBucketService { // ------------------------------------------------------------------------- protected DualInflowControlManager getDualManager() { - InflowControlManager base = InflowControlManager.getInstance(); + AbstractInflowControlManager base = InflowControlUtil.getInflowControlManager(); return (base instanceof DualInflowControlManager) ? (DualInflowControlManager) base : null; }