diff options
Diffstat (limited to 'intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule')
3 files changed, 17 insertions, 25 deletions
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/ActuationModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/ActuationModule.java index 5e7792d..49768b1 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/ActuationModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/ActuationModule.java @@ -15,7 +15,6 @@ */ package org.onap.usecaseui.intentanalysis.intentBaseService.intentModule; -import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType; import org.onap.usecaseui.intentanalysis.bean.models.Intent; import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean; import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; @@ -23,22 +22,15 @@ import org.onap.usecaseui.intentanalysis.intentBaseService.intentinterfaceservic import org.onap.usecaseui.intentanalysis.service.IntentService; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Map; - public abstract class ActuationModule { @Autowired IntentInterfaceService intentInterfaceService; @Autowired IntentService intentService; - //send to the next level intent handler - public abstract void toNextIntentHandler(IntentGoalBean intentGoalBean, IntentManagementFunction IntentHandler); - //Direct operation public abstract void directOperation(IntentGoalBean intentGoalBean); - public abstract void interactWithIntentHandle(); - //Save intent information to the intent instance database public void saveIntentToDb(Intent intent) { intentService.createIntent(intent); @@ -54,11 +46,6 @@ public abstract class ActuationModule { intentService.deleteIntent(intent.getIntentId()); } - public boolean distrubuteIntentToHandler(Map.Entry<IntentGoalBean, IntentManagementFunction> entry) { - IntentGoalType intentGoalType = entry.getKey().getIntentGoalType(); - return false; - } - //determine if the intent is to be processed directly or sent to the next-level processor public abstract void fulfillIntent(IntentGoalBean intentGoalBean, IntentManagementFunction intentHandler); diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/DecisionModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/DecisionModule.java index 549672c..8c1c5eb 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/DecisionModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/DecisionModule.java @@ -15,7 +15,6 @@ */ package org.onap.usecaseui.intentanalysis.intentBaseService.intentModule; - import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.onap.usecaseui.intentanalysis.bean.enums.IntentGenerateType; @@ -28,10 +27,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; + @Slf4j public abstract class DecisionModule { - public abstract void determineUltimateGoal(); - // find intentManageFunction public abstract IntentManagementFunction exploreIntentHandlers(IntentGoalBean intentGoalBean); @@ -54,10 +52,6 @@ public abstract class DecisionModule { return newIntent; } - public abstract void decideSuitableAction(); - - public abstract void interactWithTemplateDb(); - public abstract LinkedHashMap<IntentGoalBean, IntentManagementFunction> investigationCreateProcess(IntentGoalBean intentGoalBean); public abstract LinkedHashMap<IntentGoalBean, IntentManagementFunction> investigationUpdateProcess(IntentGoalBean intentGoalBean); @@ -175,6 +169,4 @@ public abstract class DecisionModule { } return context; } - - } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/KnowledgeModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/KnowledgeModule.java index f225d60..8b55a5a 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/KnowledgeModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/KnowledgeModule.java @@ -17,6 +17,7 @@ package org.onap.usecaseui.intentanalysis.intentBaseService.intentModule; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType; import org.onap.usecaseui.intentanalysis.bean.models.*; import org.onap.usecaseui.intentanalysis.service.IntentService; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +40,7 @@ public abstract class KnowledgeModule { public abstract boolean recieveDeleteIntent(); - public List<String> intentResolution(Intent intent) { + protected List<String> intentResolution(Intent intent) { //db contain original intent List<Intent> sameNameIntentList = intentService.getIntentByName(intent.getIntentName()); List<String> intentIdList = new ArrayList<>(); @@ -79,7 +80,19 @@ public abstract class KnowledgeModule { return intentIdList; } - public List<Intent> filterIntent(List<Intent> list) { + /** + * Determine add, delete, modify according to theobject,target and context of the expectation + */ + protected IntentGoalBean determineDetectionGoal(Intent intent, List<String> intentIdList) { + int size = intentIdList.size(); + if (size == 0) { + return new IntentGoalBean(intent, IntentGoalType.CREATE); + } else { + return new IntentGoalBean(intent, IntentGoalType.UPDATE); + } + } + + private List<Intent> filterIntent(List<Intent> list) { List<Intent> fiterList = new ArrayList<>(); for (Intent intent : list) { //filter the intent which save first time in controller @@ -107,7 +120,7 @@ public abstract class KnowledgeModule { break; } } - if (equals == true) { + if (equals) { break; } } |