From 1ceedad9622ea069c5274fde30d8d4d84a46e0a7 Mon Sep 17 00:00:00 2001 From: cmrizhangzhen <781953240@qq.com> Date: Fri, 15 Jul 2022 15:32:26 +0800 Subject: change calss name Issue-ID: USECASEUI-696 Signed-off-by: cmrizhangzhen <781953240@qq.com> Change-Id: I6030b5a66468956011279d75a8ec32078beaaa63 --- .../CLLBusinessIntentManagementFunction.java | 4 +-- .../intentModuleImpl/ActuationModuleImpl.java | 4 +-- .../intentModuleImpl/DecisoinModuleImpl.java | 4 +-- .../intentModule/ActuationModule.java | 4 +-- .../intentModule/DecisionModule.java | 4 +-- .../IntentAnalysisFunction.java | 29 ---------------------- .../IntentDefinitionService.java | 6 ++--- .../IntentDetectionService.java | 6 ++--- .../IntentDistributionService.java | 6 ++--- .../IntentInvestigationService.java | 6 ++--- .../IntentManagementFunction.java | 29 ++++++++++++++++++++++ .../IntentOperationService.java | 6 ++--- .../intentProcessService/IntentProcessService.java | 6 ++--- 13 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentAnalysisFunction.java create mode 100644 intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentManagementFunction.java (limited to 'intentanalysis') diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/CLLBusinessIntentManagementFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/CLLBusinessIntentManagementFunction.java index d15d63f..2cf0de1 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/CLLBusinessIntentManagementFunction.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/CLLBusinessIntentManagementFunction.java @@ -23,10 +23,10 @@ import org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl.Kno import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule; import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule; import org.onap.usecaseui.intentanalysis.intentModule.KnowledgeModule; -import org.onap.usecaseui.intentanalysis.intentProcessService.IntentAnalysisFunction; +import org.onap.usecaseui.intentanalysis.intentProcessService.IntentManagementFunction; @Data -public class CLLBusinessIntentManagementFunction extends IntentAnalysisFunction { +public class CLLBusinessIntentManagementFunction extends IntentManagementFunction { private ActuationModule actuationModule = new ActuationModuleImpl(); private DecisionModule decisoinModule = new DecisoinModuleImpl(); private KnowledgeModule knowledgeModule = new KnownledgeModuleImpl(); diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/ActuationModuleImpl.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/ActuationModuleImpl.java index a644423..1cbdd77 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/ActuationModuleImpl.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/ActuationModuleImpl.java @@ -17,7 +17,7 @@ package org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl; import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule; -import org.onap.usecaseui.intentanalysis.intentProcessService.IntentAnalysisFunction; +import org.onap.usecaseui.intentanalysis.intentProcessService.IntentManagementFunction; import org.onap.usecaseui.intentanalysis.intentProcessService.IntentProcessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,7 +28,7 @@ public class ActuationModuleImpl implements ActuationModule { IntentProcessService processService; @Override - public void sendToIntentHandler(IntentAnalysisFunction intentHandler) { + public void sendToIntentHandler(IntentManagementFunction intentHandler) { processService.setIntentRole(intentHandler, null); processService.intentProcess(); } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/DecisoinModuleImpl.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/DecisoinModuleImpl.java index 108731a..495bf70 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/DecisoinModuleImpl.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/DecisoinModuleImpl.java @@ -17,7 +17,7 @@ package org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl; import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule; -import org.onap.usecaseui.intentanalysis.intentProcessService.IntentAnalysisFunction; +import org.onap.usecaseui.intentanalysis.intentProcessService.IntentManagementFunction; import org.springframework.stereotype.Service; @Service @@ -26,7 +26,7 @@ public class DecisoinModuleImpl implements DecisionModule { public void determineUltimateGoal() {} @Override - public IntentAnalysisFunction exploreIntentHandlers() { + public IntentManagementFunction exploreIntentHandlers() { return null; diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/ActuationModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/ActuationModule.java index c747738..5a3c1f6 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/ActuationModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/ActuationModule.java @@ -15,11 +15,11 @@ */ package org.onap.usecaseui.intentanalysis.intentModule; -import org.onap.usecaseui.intentanalysis.intentProcessService.IntentAnalysisFunction; +import org.onap.usecaseui.intentanalysis.intentProcessService.IntentManagementFunction; public interface ActuationModule { //actuationModel & knownledgeModel interact - void sendToIntentHandler(IntentAnalysisFunction IntentHandler); + void sendToIntentHandler(IntentManagementFunction IntentHandler); void sendToNonIntentHandler();//直接操作 void interactWithIntentHandle(); //Save intent information to the intent instance database diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/DecisionModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/DecisionModule.java index 9413499..edbae69 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/DecisionModule.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/DecisionModule.java @@ -16,11 +16,11 @@ package org.onap.usecaseui.intentanalysis.intentModule; -import org.onap.usecaseui.intentanalysis.intentProcessService.IntentAnalysisFunction; +import org.onap.usecaseui.intentanalysis.intentProcessService.IntentManagementFunction; public interface DecisionModule { void determineUltimateGoal();// - IntentAnalysisFunction exploreIntentHandlers(); + IntentManagementFunction exploreIntentHandlers(); void intentDefinition(); void decideSuitableAction(); diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentAnalysisFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentAnalysisFunction.java deleted file mode 100644 index 91da955..0000000 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentAnalysisFunction.java +++ /dev/null @@ -1,29 +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.intentProcessService; - - -import lombok.Data; -import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule; -import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule; -import org.onap.usecaseui.intentanalysis.intentModule.KnowledgeModule; - -@Data -public class IntentAnalysisFunction { - private ActuationModule actuationModule; - private DecisionModule decisionModule; - private KnowledgeModule knowledgeModule; -} diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDefinitionService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDefinitionService.java index aa79dc3..cd6af28 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDefinitionService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDefinitionService.java @@ -23,10 +23,10 @@ import org.springframework.stereotype.Service; @Service public class IntentDefinitionService { - private IntentAnalysisFunction intentHandler; - private IntentAnalysisFunction intentOwner; + private IntentManagementFunction intentHandler; + private IntentManagementFunction intentOwner; - public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction intentHandler) { + public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler) { if (intentOwner != null) { this.intentOwner = intentOwner; } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDetectionService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDetectionService.java index cb536ed..ada67ce 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDetectionService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDetectionService.java @@ -21,10 +21,10 @@ import org.springframework.stereotype.Service; @Service public class IntentDetectionService { - private IntentAnalysisFunction intentHandler; - private IntentAnalysisFunction intentOwner; + private IntentManagementFunction intentHandler; + private IntentManagementFunction intentOwner; - public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction intentHandler){ + public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler){ if (intentOwner!= null){ this.intentOwner = intentOwner; } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDistributionService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDistributionService.java index befd8a4..535214f 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDistributionService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDistributionService.java @@ -23,10 +23,10 @@ import org.springframework.stereotype.Service; @Service public class IntentDistributionService { @Autowired - private IntentAnalysisFunction intentHandler; - private IntentAnalysisFunction intentOwner; + private IntentManagementFunction intentHandler; + private IntentManagementFunction intentOwner; - public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction intentHandler){ + public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler){ if (intentOwner!= null){ this.intentOwner = intentOwner; } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentInvestigationService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentInvestigationService.java index 8de3e9c..9229804 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentInvestigationService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentInvestigationService.java @@ -20,10 +20,10 @@ import org.springframework.stereotype.Service; @Service public class IntentInvestigationService { - private IntentAnalysisFunction intentHandler; - private IntentAnalysisFunction intentOwner; + private IntentManagementFunction intentHandler; + private IntentManagementFunction intentOwner; - public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction intentHandler){ + public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler){ if (intentOwner!= null){ this.intentOwner = intentOwner; } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentManagementFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentManagementFunction.java new file mode 100644 index 0000000..18770a3 --- /dev/null +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentManagementFunction.java @@ -0,0 +1,29 @@ +/* + * 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.intentProcessService; + + +import lombok.Data; +import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule; +import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule; +import org.onap.usecaseui.intentanalysis.intentModule.KnowledgeModule; + +@Data +public class IntentManagementFunction { + private ActuationModule actuationModule; + private DecisionModule decisionModule; + private KnowledgeModule knowledgeModule; +} diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentOperationService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentOperationService.java index 274f474..61fbc86 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentOperationService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentOperationService.java @@ -23,10 +23,10 @@ import org.springframework.stereotype.Service; @Service public class IntentOperationService { - private IntentAnalysisFunction intentHandler; - private IntentAnalysisFunction intentOwner; + private IntentManagementFunction intentHandler; + private IntentManagementFunction intentOwner; - public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction intentHandler){ + public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler){ if (intentOwner!= null){ this.intentOwner = intentOwner; } diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentProcessService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentProcessService.java index 7f0e0a8..4a1a090 100644 --- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentProcessService.java +++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentProcessService.java @@ -31,11 +31,11 @@ public class IntentProcessService { @Autowired IntentOperationService intentOperationService; - private IntentAnalysisFunction intentOwner; - private IntentAnalysisFunction intentHandler; + private IntentManagementFunction intentOwner; + private IntentManagementFunction intentHandler; - public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction intentHandler){ + public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler){ if (intentOwner!= null){ this.intentOwner = intentOwner; } -- cgit 1.2.3-korg