From 8969f7b2a92316e0e87ec1a56cb0801c9f871a5f Mon Sep 17 00:00:00 2001 From: hekeguang Date: Wed, 7 Sep 2022 09:50:29 +0800 Subject: Add intent base operation process code . Issue-ID: USECASEUI-696 Change-Id: I550048e9b408daa9e21509efae8ebf30c514f231 Signed-off-by: hekeguang --- .../CLLBusinessActuationModule.java | 15 ++++---- .../CLLBusinessDecisionModule.java | 16 +++----- .../CLLAssuranceIntentManagementFunction.java | 22 +++++++++++ .../CLLAssuranceActuationModule.java | 27 +++++++++++++- .../CLLAssuranceDecisionModule.java | 38 ++++++++++++++++++- .../CLLAssuranceKnowledgeModule.java | 27 +++++++++++++- .../CLLDeliveryIntentManagementFunction.java | 43 ++++++++++++++++++++++ .../CLLDeliveryManagementFunction.java | 21 ----------- .../CLLDeliveryActuationModule.java | 27 +++++++++++++- .../CLLDeliveryDecisionModule.java | 38 ++++++++++++++++++- .../CLLDeliveryKnowledgeModule.java | 27 +++++++++++++- .../FormatIntentInputActuationModule.java | 13 +++++-- .../FormatIntentInputDecisionModule.java | 10 ++--- .../impl/IMFRegInfoServiceImpl.java | 2 +- .../intentModule/ActuationModule.java | 38 +++++++++---------- .../intentModule/DecisionModule.java | 5 +-- .../IntentDefinitionService.java | 4 +- .../IntentDistributionService.java | 4 +- .../IntentInvestigationService.java | 7 +--- .../IntentOperationService.java | 16 ++++---- .../intentProcessService/IntentProcessService.java | 42 ++++++++++----------- 21 files changed, 321 insertions(+), 121 deletions(-) create mode 100644 intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/CLLDeliveryIntentManagementFunction.java delete mode 100644 intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/CLLDeliveryManagementFunction.java diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessActuationModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessActuationModule.java index dfb0efe..11bc504 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessActuationModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessActuationModule.java @@ -17,7 +17,6 @@ package org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.cllBusinessModule import org.onap.usecaseui.intentanalysis.bean.models.Intent; -import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean; import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule; import org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService.IntentProcessService; @@ -26,11 +25,6 @@ import org.onap.usecaseui.intentanalysis.service.IntentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - @Component public class CLLBusinessActuationModule extends ActuationModule { @Autowired @@ -42,13 +36,13 @@ public class CLLBusinessActuationModule extends ActuationModule { @Override - public void sendToIntentHandler(Intent intent,IntentManagementFunction IntentHandler) { + public void toNextIntentHandler(Intent intent, IntentManagementFunction IntentHandler) { processService.setIntentRole(IntentHandler, null); processService.intentProcess(intent); } @Override - public void sendToNonIntentHandler() { + public void directOperation() { } @@ -56,4 +50,9 @@ public class CLLBusinessActuationModule extends ActuationModule { public void interactWithIntentHandle() { } + + @Override + public void fulfillIntent(Intent intent, IntentManagementFunction intentHandler) { + toNextIntentHandler(intent,intentHandler); + } } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessDecisionModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessDecisionModule.java index 6428742..83a8931 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessDecisionModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/cllBusinessModule/CLLBusinessDecisionModule.java @@ -32,10 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Log4j2 @@ -131,9 +128,9 @@ public class CLLBusinessDecisionModule extends DecisionModule { } @Override - public List> findHandler(IntentGoalBean intentGoalBean) { + public LinkedHashMap findHandler(IntentGoalBean intentGoalBean) { boolean needDecompostion = needDecompostion(intentGoalBean); - List> intentMapList = new ArrayList<>(); + LinkedHashMap intentMap = new LinkedHashMap<>(); if (needDecompostion) { List subIntentGoalList = intentDecomposition(intentGoalBean); List sortList = intentOrchestration(subIntentGoalList); @@ -141,14 +138,11 @@ public class CLLBusinessDecisionModule extends DecisionModule { Map map = new HashMap<>(); IntentManagementFunction imf = exploreIntentHandlers(subIntentGoal); map.put(subIntentGoal, imf); - intentMapList.add(map); } } else { - Map map = new HashMap<>(); - map.put(intentGoalBean, exploreIntentHandlers(intentGoalBean)); - intentMapList.add(map); + intentMap.put(intentGoalBean, exploreIntentHandlers(intentGoalBean)); } - return intentMapList; + return intentMap; } } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/CLLAssuranceIntentManagementFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/CLLAssuranceIntentManagementFunction.java index 3e489ae..7947edb 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/CLLAssuranceIntentManagementFunction.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/CLLAssuranceIntentManagementFunction.java @@ -15,7 +15,29 @@ */ package org.onap.usecaseui.intentanalysis.cllassuranceIntentmgt; +import lombok.Data; import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +@Data +@Component("CLLAssuranceIntentManagementFunction") public class CLLAssuranceIntentManagementFunction extends IntentManagementFunction { + @Resource(name = "CLLAssuranceActuationModule") + public void setActuationModule(ActuationModule actuationModule) { + this.actuationModule = actuationModule; + } + + @Resource(name = "CLLAssuranceKnowledgeModule") + public void setKnowledgeModule(KnowledgeModule knowledgeModule) { + this.knowledgeModule = knowledgeModule; + } + + @Resource(name = "CLLAssuranceDecisionModule") + public void setDecisionModule(DecisionModule decisionModule) { + this.decisionModule = decisionModule; + } } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceActuationModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceActuationModule.java index c061d76..325e980 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceActuationModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceActuationModule.java @@ -15,5 +15,30 @@ */ package org.onap.usecaseui.intentanalysis.cllassuranceIntentmgt.cllassurancemodule; -public class CLLAssuranceActuationModule { +import org.onap.usecaseui.intentanalysis.bean.models.Intent; +import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule; +import org.springframework.stereotype.Component; + +@Component +public class CLLAssuranceActuationModule extends ActuationModule { + @Override + public void toNextIntentHandler(Intent intent, IntentManagementFunction IntentHandler) { + + } + + @Override + public void directOperation() { + + } + + @Override + public void interactWithIntentHandle() { + + } + + @Override + public void fulfillIntent(Intent intent, IntentManagementFunction intentHandler) { + directOperation(); + } } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceDecisionModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceDecisionModule.java index 8a65b55..2054484 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceDecisionModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceDecisionModule.java @@ -15,5 +15,41 @@ */ package org.onap.usecaseui.intentanalysis.cllassuranceIntentmgt.cllassurancemodule; -public class CLLAssuranceDecisionModule { +import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean; +import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule; +import org.springframework.stereotype.Component; + +import java.util.LinkedHashMap; +@Component +public class CLLAssuranceDecisionModule extends DecisionModule { + @Override + public void determineUltimateGoal() { + + } + + @Override + public IntentManagementFunction exploreIntentHandlers(IntentGoalBean intentGoalBean) { + return null; + } + + @Override + public void intentDefinition() { + + } + + @Override + public void decideSuitableAction() { + + } + + @Override + public void interactWithTemplateDb() { + + } + + @Override + public LinkedHashMap findHandler(IntentGoalBean intentGoalBean) { + return null; + } } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceKnowledgeModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceKnowledgeModule.java index 75bffbd..c1300f0 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceKnowledgeModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllassuranceIntentmgt/cllassurancemodule/CLLAssuranceKnowledgeModule.java @@ -15,5 +15,30 @@ */ package org.onap.usecaseui.intentanalysis.cllassuranceIntentmgt.cllassurancemodule; -public class CLLAssuranceKnowledgeModule { +import org.onap.usecaseui.intentanalysis.bean.models.Intent; +import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule; +import org.springframework.stereotype.Component; + +@Component +public class CLLAssuranceKnowledgeModule extends KnowledgeModule { + @Override + public IntentGoalBean intentCognition(Intent intent) { + return null; + } + + @Override + public boolean recieveCreateIntent() { + return false; + } + + @Override + public boolean recieveUpdateIntent() { + return false; + } + + @Override + public boolean recieveDeleteIntent() { + return false; + } } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/CLLDeliveryIntentManagementFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/CLLDeliveryIntentManagementFunction.java new file mode 100644 index 0000000..fe37f95 --- /dev/null +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/CLLDeliveryIntentManagementFunction.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2022 CMCC, Inc. and others. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onap.usecaseui.intentanalysis.clldeliveryIntentmgt; + +import lombok.Data; +import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +@Data +@Component("CLLDeliveryIntentManagementFunction") +public class CLLDeliveryIntentManagementFunction extends IntentManagementFunction { + @Resource(name = "CLLDeliveryActuationModule") + public void setActuationModule(ActuationModule actuationModule) { + this.actuationModule = actuationModule; + } + + @Resource(name = "CLLDeliveryKnowledgeModule") + public void setKnowledgeModule(KnowledgeModule knowledgeModule) { + this.knowledgeModule = knowledgeModule; + } + + @Resource(name = "CLLDeliveryDecisionModule") + public void setDecisionModule(DecisionModule decisionModule) { + this.decisionModule = decisionModule; + } +} diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/CLLDeliveryManagementFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/CLLDeliveryManagementFunction.java deleted file mode 100644 index 76b0cf5..0000000 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/CLLDeliveryManagementFunction.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2022 CMCC, Inc. and others. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.onap.usecaseui.intentanalysis.clldeliveryIntentmgt; - -import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; - -public class CLLDeliveryManagementFunction extends IntentManagementFunction { -} diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryActuationModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryActuationModule.java index 65a2ca8..b111a9f 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryActuationModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryActuationModule.java @@ -15,5 +15,30 @@ */ package org.onap.usecaseui.intentanalysis.clldeliveryIntentmgt.clldeliverymodule; -public class CLLDeliveryActuationModule { +import org.onap.usecaseui.intentanalysis.bean.models.Intent; +import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule; +import org.springframework.stereotype.Component; + +@Component +public class CLLDeliveryActuationModule extends ActuationModule { + @Override + public void toNextIntentHandler(Intent intent, IntentManagementFunction IntentHandler) { + + } + + @Override + public void directOperation() { + + } + + @Override + public void interactWithIntentHandle() { + + } + + @Override + public void fulfillIntent(Intent intent, IntentManagementFunction intentHandler) { + this.directOperation(); + } } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryDecisionModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryDecisionModule.java index 42dea4f..e73aab4 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryDecisionModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryDecisionModule.java @@ -15,5 +15,41 @@ */ package org.onap.usecaseui.intentanalysis.clldeliveryIntentmgt.clldeliverymodule; -public class CLLDeliveryDecisionModule { +import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean; +import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule; +import org.springframework.stereotype.Component; + +import java.util.LinkedHashMap; +@Component +public class CLLDeliveryDecisionModule extends DecisionModule { + @Override + public void determineUltimateGoal() { + + } + + @Override + public IntentManagementFunction exploreIntentHandlers(IntentGoalBean intentGoalBean) { + return null; + } + + @Override + public void intentDefinition() { + + } + + @Override + public void decideSuitableAction() { + + } + + @Override + public void interactWithTemplateDb() { + + } + + @Override + public LinkedHashMap findHandler(IntentGoalBean intentGoalBean) { + return null; + } } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryKnowledgeModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryKnowledgeModule.java index c2f5278..1222d4d 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryKnowledgeModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryKnowledgeModule.java @@ -15,5 +15,30 @@ */ package org.onap.usecaseui.intentanalysis.clldeliveryIntentmgt.clldeliverymodule; -public class CLLDeliveryKnowledgeModule { +import org.onap.usecaseui.intentanalysis.bean.models.Intent; +import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean; +import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule; +import org.springframework.stereotype.Component; + +@Component +public class CLLDeliveryKnowledgeModule extends KnowledgeModule { + @Override + public IntentGoalBean intentCognition(Intent intent) { + return null; + } + + @Override + public boolean recieveCreateIntent() { + return false; + } + + @Override + public boolean recieveUpdateIntent() { + return false; + } + + @Override + public boolean recieveDeleteIntent() { + return false; + } } 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 8042d7f..1d397fd 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 @@ -15,27 +15,32 @@ */ package org.onap.usecaseui.intentanalysis.formatintentinputMgt.formatintentinputModule; +import lombok.extern.log4j.Log4j2; import org.onap.usecaseui.intentanalysis.bean.models.Intent; import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule; import org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService.IntentProcessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +@Log4j2 @Component public class FormatIntentInputActuationModule extends ActuationModule { @Autowired IntentProcessService processService; @Override - public void sendToIntentHandler(Intent intent, IntentManagementFunction IntentHandler) { - processService.setIntentRole(IntentHandler, null); - processService.intentProcess(intent); + public void toNextIntentHandler(Intent intent, IntentManagementFunction IntentHandler) { + log.info("do nothing"); } @Override - public void sendToNonIntentHandler() { + public void directOperation() { } @Override public void interactWithIntentHandle() { } + + @Override + public void fulfillIntent(Intent intent, IntentManagementFunction intentHandler) { + } } 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 4faa719..edb3814 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 @@ -58,17 +58,15 @@ public class FormatIntentInputDecisionModule extends DecisionModule { } @Override - public List> findHandler(IntentGoalBean intentGoalBean) { - List> intentMapList = new ArrayList<>(); + public LinkedHashMap findHandler(IntentGoalBean intentGoalBean) { + LinkedHashMap intentMap = new LinkedHashMap<>(); boolean needDecompostion = needDecompostion(intentGoalBean); if (needDecompostion) { intentDecomposition(intentGoalBean); }else{ - Map map = new HashMap<>(); - map.put(intentGoalBean, exploreIntentHandlers(intentGoalBean)); - intentMapList.add(map); + intentMap.put(intentGoalBean, exploreIntentHandlers(intentGoalBean)); } - return intentMapList; + return intentMap; } public boolean needDecompostion(IntentGoalBean intentGoalBean) { diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentFunctionManageService/impl/IMFRegInfoServiceImpl.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentFunctionManageService/impl/IMFRegInfoServiceImpl.java index cb21982..6d40996 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentFunctionManageService/impl/IMFRegInfoServiceImpl.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentFunctionManageService/impl/IMFRegInfoServiceImpl.java @@ -61,7 +61,7 @@ public class IMFRegInfoServiceImpl implements IMFRegInfoService { (IntentManagementFunction)applicationContext.getBean(managetFunctionRegName); ActuationModule actuationModule = function.getActuationModule(); - actuationModule.sendToNonIntentHandler(); + actuationModule.directOperation(); IntentManagementFunction intentManagementFunction = (IntentManagementFunction) Class.forName(managetFunctionRegName) .getDeclaredConstructor().newInstance(); 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 6c7b4f7..ec60df2 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 @@ -24,9 +24,7 @@ import org.onap.usecaseui.intentanalysis.intentBaseService.intentinterfaceservic import org.onap.usecaseui.intentanalysis.service.IntentService; import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; import java.util.Map; -import java.util.stream.Collectors; public abstract class ActuationModule { @Autowired @@ -34,33 +32,31 @@ public abstract class ActuationModule { @Autowired IntentService intentService; - //actuationModel & knownledgeModel interact - public abstract void sendToIntentHandler(Intent intent, IntentManagementFunction IntentHandler); + //send to the next level intent handler + public abstract void toNextIntentHandler(Intent intent, IntentManagementFunction IntentHandler); - public abstract void sendToNonIntentHandler();//直接操作 + //Direct operation + public abstract void directOperation(); public abstract void interactWithIntentHandle(); //Save intent information to the intent instance database - public void saveIntentToDb(Map intentMap) { - List subIntentList = intentMap.keySet().stream().map(IntentGoalBean::getIntent) - .collect(Collectors.toList()); - for (Intent subIntent : subIntentList) { - intentService.createIntent(subIntent); - } + public void saveIntentToDb(Intent intent) { + intentService.createIntent(intent); } - public boolean distrubuteIntentToHandler(Map intentMap) { - for (Map.Entry entry : intentMap.entrySet()) { - IntentGoalType intentGoalType = entry.getKey().getIntentGoalType(); - if (StringUtils.equalsIgnoreCase("create", intentGoalType.name())) { - return intentInterfaceService.createInterface(entry.getKey().getIntent(), entry.getValue()); - } else if (StringUtils.equalsIgnoreCase("update", intentGoalType.name())) { - return intentInterfaceService.updateInterface(entry.getKey().getIntent(), entry.getValue()); - } else if (StringUtils.equalsIgnoreCase("delete", intentGoalType.name())) { - return intentInterfaceService.deleteInterface(entry.getKey().getIntent(), entry.getValue()); - } + public boolean distrubuteIntentToHandler(Map.Entry entry) { + IntentGoalType intentGoalType = entry.getKey().getIntentGoalType(); + if (StringUtils.equalsIgnoreCase("create", intentGoalType.name())) { + return intentInterfaceService.createInterface(entry.getKey().getIntent(), entry.getValue()); + } else if (StringUtils.equalsIgnoreCase("update", intentGoalType.name())) { + return intentInterfaceService.updateInterface(entry.getKey().getIntent(), entry.getValue()); + } else if (StringUtils.equalsIgnoreCase("delete", intentGoalType.name())) { + return intentInterfaceService.deleteInterface(entry.getKey().getIntent(), entry.getValue()); } return false; } + + //determine if the intent is to be processed directly or sent to the next-level processor + public abstract void fulfillIntent(Intent intent, 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 a89656b..52dab8e 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 @@ -19,8 +19,7 @@ package org.onap.usecaseui.intentanalysis.intentBaseService.intentModule; import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean; import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction; -import java.util.List; -import java.util.Map; +import java.util.LinkedHashMap; public abstract class DecisionModule { public abstract void determineUltimateGoal(); @@ -34,6 +33,6 @@ public abstract class DecisionModule { public abstract void interactWithTemplateDb(); - public abstract List> findHandler(IntentGoalBean intentGoalBean); + public abstract LinkedHashMap findHandler(IntentGoalBean intentGoalBean); } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionService.java index 01581c4..31119e1 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionService.java @@ -41,10 +41,10 @@ public class IntentDefinitionService { } } - public void definitionPorcess(Map intentMap) { + public void definitionPorcess(Map.Entry entry) { DecisionModule intentDecisionModule = intentOwner.getDecisionModule(); ActuationModule intentActuationModule = intentOwner.getActuationModule(); intentDecisionModule.intentDefinition(); - intentActuationModule.saveIntentToDb(intentMap);//id type + intentActuationModule.saveIntentToDb(entry.getKey().getIntent());//id type } } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionService.java index 3a4e48e..83f9b00 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionService.java @@ -41,9 +41,9 @@ public class IntentDistributionService { } } - public boolean distributionProcess(Map intentMap) { + public boolean distributionProcess(Map.Entry entry) { - return intentOwner.getActuationModule().distrubuteIntentToHandler(intentMap); + return intentOwner.getActuationModule().distrubuteIntentToHandler(entry); } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentInvestigationService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentInvestigationService.java index 36476b1..ac4612f 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentInvestigationService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentInvestigationService.java @@ -21,10 +21,7 @@ import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunct import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Service public class IntentInvestigationService { @@ -40,7 +37,7 @@ public class IntentInvestigationService { } } - public List> investigationProcess(IntentGoalBean intentGoalBean) { + public LinkedHashMap investigationProcess(IntentGoalBean intentGoalBean) { DecisionModule intentDecisionModule = intentOwner.getDecisionModule(); return intentDecisionModule.findHandler(intentGoalBean); } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationService.java index f26be6c..d2eb313 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationService.java @@ -28,24 +28,22 @@ public class IntentOperationService { private IntentManagementFunction intentHandler; private IntentManagementFunction intentOwner; - public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler){ - if (intentOwner!= null){ + public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler) { + if (intentOwner != null) { this.intentOwner = intentOwner; } - if (intentHandler!= null){ - this.intentHandler= intentHandler; + if (intentHandler != null) { + this.intentHandler = intentHandler; } } public void operationProcess(Intent intent) { DecisionModule intentDecisionModule = intentOwner.getDecisionModule(); - ActuationModule intentActuationModule = intentOwner.getActuationModule(); + ActuationModule intentActuationModule = intentHandler.getActuationModule(); //intentDecisionModule.interactWithTemplateDb(); intentActuationModule.interactWithIntentHandle(); - - intentActuationModule.sendToIntentHandler(intent,intentHandler); - - intentActuationModule.sendToNonIntentHandler(); + //determine whether to operate directly or send to next intent handler + intentActuationModule.fulfillIntent(intent, intentHandler); } } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessService.java index df1c437..fc18bf7 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessService.java @@ -22,7 +22,8 @@ import org.onap.usecaseui.intentanalysis.service.IntentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; +import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; @Service @@ -37,47 +38,44 @@ public class IntentProcessService { IntentDistributionService intentDistributionService; @Autowired IntentOperationService intentOperationService; -@Autowired + @Autowired IntentService intentService; private IntentManagementFunction intentOwner; private IntentManagementFunction intentHandler; - public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler){ - if (intentOwner!= null){ + public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler) { + if (intentOwner != null) { this.intentOwner = intentOwner; } - if (intentHandler!= null){ - this.intentHandler= intentHandler; + if (intentHandler != null) { + this.intentHandler = intentHandler; } } + public void intentProcess(Intent intent) { - intentDetectionService.setIntentRole(intentOwner,intentHandler); + intentDetectionService.setIntentRole(intentOwner, intentHandler); IntentGoalBean intentGoalBean = intentDetectionService.detectionProcess(intent); //investigation process - intentInvestigationService.setIntentRole(intentOwner,intentHandler); - List> intentListMap = + intentInvestigationService.setIntentRole(intentOwner, intentHandler); + LinkedHashMap intentMap = intentInvestigationService.investigationProcess(intentGoalBean); - - for (Map map : intentListMap) { + Iterator> iterator = intentMap.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry next = iterator.next(); //definition process save subintent - intentDefinitionService.setIntentRole(intentOwner,intentHandler); - intentDefinitionService.definitionPorcess(map); + intentDefinitionService.setIntentRole(intentOwner, intentHandler); + intentDefinitionService.definitionPorcess(next); //distribution process - intentDistributionService.setIntentRole(intentOwner,intentHandler); - intentDistributionService.distributionProcess(map); - - //operation process enery entry only have one key-value - for (Map.Entry entry : map.entrySet()) { - intentOperationService.setIntentRole(intentOwner,entry.getValue()); - intentOperationService.operationProcess(entry.getKey().getIntent()); - } + intentDistributionService.setIntentRole(intentOwner, intentHandler); + intentDistributionService.distributionProcess(next); + intentOperationService.setIntentRole(intentOwner, next.getValue()); + intentOperationService.operationProcess(next.getKey().getIntent()); } } - } -- cgit 1.2.3-korg