diff options
Diffstat (limited to 'intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt')
4 files changed, 5 insertions, 48 deletions
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/FormatIntentInputManagementFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/FormatIntentInputManagementFunction.java index 1090eba..de30c3d 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/FormatIntentInputManagementFunction.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/FormatIntentInputManagementFunction.java @@ -112,9 +112,7 @@ public class FormatIntentInputManagementFunction extends IntentManagementFunctio } public boolean implementIntent(Intent originIntent, LinkedHashMap<IntentGoalBean, IntentManagementFunction> linkedIntentMap) { - Iterator<Map.Entry<IntentGoalBean, IntentManagementFunction>> iterator = linkedIntentMap.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry<IntentGoalBean, IntentManagementFunction> next = iterator.next(); + for (Map.Entry<IntentGoalBean, IntentManagementFunction> next : linkedIntentMap.entrySet()) { IntentGoalBean newIntentGoalBean = next.getKey(); IntentGoalType intentGoalType = newIntentGoalBean.getIntentGoalType(); if (intentGoalType == IntentGoalType.CREATE) { @@ -127,7 +125,7 @@ public class FormatIntentInputManagementFunction extends IntentManagementFunctio new IntentGoalBean(newIdIntent, IntentGoalType.CREATE), next.getValue()); originIntent.setIntentGenerateType(IntentGenerateType.USERINPUT); //save user input intent - intentService.createIntent(originIntent); + actuationModule.saveIntentToDb(originIntent); return isAcceptCreate; } else if (intentGoalType == IntentGoalType.UPDATE) { log.info("formatIntentInputIMF UPDATE"); @@ -135,13 +133,13 @@ public class FormatIntentInputManagementFunction extends IntentManagementFunctio Intent subIntent = newIntentGoalBean.getIntent(); updateIntentInfo(originIntent, subIntent); //update userInput intent - intentService.updateIntent(originIntent); + actuationModule.updateIntentToDb(originIntent); // intent-Distribution and operate |update cllBusiness intent boolean isAcceptUpdate = intentInterfaceService.updateInterface(originIntent, new IntentGoalBean(subIntent, IntentGoalType.UPDATE), next.getValue()); } else { //deal with userInput intent - intentService.deleteIntent(originIntent.getIntentId()); + actuationModule.deleteIntentToDb(originIntent); // intent-Distribution-delete boolean isAcceptDelete = intentInterfaceService.deleteInterface(originIntent, next.getKey(), next.getValue()); } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputActuationModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputActuationModule.java index a9beafe..adff5f6 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputActuationModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputActuationModule.java @@ -31,27 +31,15 @@ public class FormatIntentInputActuationModule extends ActuationModule { IntentService intentService; @Override - public void toNextIntentHandler(IntentGoalBean intentGoalBean, IntentManagementFunction IntentHandler) { - log.info("do nothing"); - } - - @Override public void directOperation(IntentGoalBean intentGoalBean) { } @Override - public void interactWithIntentHandle() { - } - - @Override public void fulfillIntent(IntentGoalBean intentGoalBean, IntentManagementFunction intentHandler) { } - - public void updateIntentOperationInfo(Intent originIntent, IntentGoalBean intentGoalBean){ } - } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputDecisionModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputDecisionModule.java index 334a6d3..96c8623 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputDecisionModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputDecisionModule.java @@ -49,10 +49,6 @@ public class FormatIntentInputDecisionModule extends DecisionModule { public IntentService intentService; @Override - public void determineUltimateGoal() { - } - - @Override public IntentManagementFunction exploreIntentHandlers(IntentGoalBean intentGoalBean) { // if intentName contain cll return if (intentGoalBean.getIntent().getIntentName().toLowerCase(Locale.ROOT).contains("cll")) { @@ -64,15 +60,6 @@ public class FormatIntentInputDecisionModule extends DecisionModule { } } - - @Override - public void decideSuitableAction() { - } - - @Override - public void interactWithTemplateDb() { - } - @Override public LinkedHashMap<IntentGoalBean, IntentManagementFunction> investigationCreateProcess(IntentGoalBean intentGoalBean) { log.info("FormatIntentInputMgt investigation create process start"); @@ -97,9 +84,7 @@ public class FormatIntentInputDecisionModule extends DecisionModule { if (expectationNameList.size() > 1) { List<String> cllList = expectationNameList.stream().filter(x -> StringUtils.containsIgnoreCase(x, "cll")).collect(Collectors.toList()); List<String> slicingList = expectationNameList.stream().filter(x -> StringUtils.containsIgnoreCase(x, "slicing")).collect(Collectors.toList()); - if (cllList.size() > 0 && slicingList.size() > 0) { - return true; - } + return cllList.size() > 0 && slicingList.size() > 0; } return false; } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputKnowledgeModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputKnowledgeModule.java index bf1a887..f846fcb 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputKnowledgeModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputKnowledgeModule.java @@ -15,7 +15,6 @@ */ package org.onap.usecaseui.intentanalysis.formatintentinputMgt.formatintentinputModule; -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.intentModule.KnowledgeModule; @@ -33,7 +32,6 @@ public class FormatIntentInputKnowledgeModule extends KnowledgeModule { @Override public IntentGoalBean intentCognition(Intent intent) { List<String> intendIdList = intentResolution(intent); - getSystemStatus(); return determineDetectionGoal(intent, intendIdList); } @@ -51,16 +49,4 @@ public class FormatIntentInputKnowledgeModule extends KnowledgeModule { public boolean recieveDeleteIntent() { return false; } - - public void getSystemStatus() { - } - - public 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); - } - } } |