change class name

Issue-ID: USECASEUI-696
Signed-off-by: cmrizhangzhen <781953240@qq.com>
Change-Id: I0bcffddf0b1e2757d96d84420840c4ca78110d36

diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/IntentAnalysisManagementFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/CLLBusinessIntentManagementFunction.java
similarity index 67%
rename from intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/IntentAnalysisManagementFunction.java
rename to intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/CLLBusinessIntentManagementFunction.java
index 55049f1..d15d63f 100644 (file)
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/IntentAnalysisManagementFunction.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/CLLBusinessIntentManagementFunction.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentAnalysisService;
+package org.onap.usecaseui.intentanalysis.CLLBusinessService;
 
 
 import lombok.Data;
-import org.onap.usecaseui.intentanalysis.intentAnalysisService.intentModuleImpl.ActuationModuleImpl;
-import org.onap.usecaseui.intentanalysis.intentAnalysisService.intentModuleImpl.DecisoinModuleImpl;
-import org.onap.usecaseui.intentanalysis.intentAnalysisService.intentModuleImpl.KnownledgeModuleImpl;
+import org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl.ActuationModuleImpl;
+import org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl.DecisoinModuleImpl;
+import org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl.KnownledgeModuleImpl;
 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.Function;
+import org.onap.usecaseui.intentanalysis.intentProcessService.IntentAnalysisFunction;
 
 @Data
-public class IntentAnalysisManagementFunction extends Function {
+public class CLLBusinessIntentManagementFunction extends IntentAnalysisFunction {
     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/intentAnalysisService/intentModuleImpl/ActuationModuleImpl.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/ActuationModuleImpl.java
similarity index 84%
rename from intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/intentModuleImpl/ActuationModuleImpl.java
rename to intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/ActuationModuleImpl.java
index 8a0d1ad..a644423 100644 (file)
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/intentModuleImpl/ActuationModuleImpl.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/ActuationModuleImpl.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentAnalysisService.intentModuleImpl;
+package org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl;
 
 
 import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule;
-import org.onap.usecaseui.intentanalysis.intentProcessService.Function;
+import org.onap.usecaseui.intentanalysis.intentProcessService.IntentAnalysisFunction;
 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(Function intentHandler) {
+    public void sendToIntentHandler(IntentAnalysisFunction intentHandler) {
         processService.setIntentRole(intentHandler, null);
         processService.intentProcess();
     }

diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/intentModuleImpl/DecisoinModuleImpl.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/DecisoinModuleImpl.java
similarity index 85%
rename from intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/intentModuleImpl/DecisoinModuleImpl.java
rename to intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/DecisoinModuleImpl.java
index 53374e9..108731a 100644 (file)
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/intentModuleImpl/DecisoinModuleImpl.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/DecisoinModuleImpl.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentAnalysisService.intentModuleImpl;
+package org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl;
 
 
 import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule;
-import org.onap.usecaseui.intentanalysis.intentProcessService.Function;
+import org.onap.usecaseui.intentanalysis.intentProcessService.IntentAnalysisFunction;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -26,7 +26,7 @@ public class DecisoinModuleImpl implements DecisionModule {
     public void determineUltimateGoal() {}
 
     @Override
-    public Function exploreIntentHandlers() {
+    public IntentAnalysisFunction exploreIntentHandlers() {
 
         return null;
 

diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/intentModuleImpl/KnownledgeModuleImpl.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/KnownledgeModuleImpl.java
similarity index 92%
rename from intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/intentModuleImpl/KnownledgeModuleImpl.java
rename to intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/KnownledgeModuleImpl.java
index 664e182..be45637 100644 (file)
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentAnalysisService/intentModuleImpl/KnownledgeModuleImpl.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/KnownledgeModuleImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentAnalysisService.intentModuleImpl;
+package org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl;
 
 import org.onap.usecaseui.intentanalysis.intentModule.KnowledgeModule;
 import org.springframework.stereotype.Service;

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 c3b1dd8..c747738 100644 (file)
--- 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.Function;
+import org.onap.usecaseui.intentanalysis.intentProcessService.IntentAnalysisFunction;
 
 public interface ActuationModule {
     //actuationModel & knownledgeModel interact
-    void sendToIntentHandler(Function IntentHandler);
+    void sendToIntentHandler(IntentAnalysisFunction 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 372144d..9413499 100644 (file)
--- 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.Function;
+import org.onap.usecaseui.intentanalysis.intentProcessService.IntentAnalysisFunction;
 
 public interface DecisionModule {
     void determineUltimateGoal();//
-    Function exploreIntentHandlers();
+    IntentAnalysisFunction exploreIntentHandlers();
     void intentDefinition();
     void decideSuitableAction();
 

diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/Function.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentAnalysisFunction.java
similarity index 96%
rename from intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/Function.java
rename to intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentAnalysisFunction.java
index 5da548e..91da955 100644 (file)
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/Function.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentAnalysisFunction.java
@@ -22,7 +22,7 @@ import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule;
 import org.onap.usecaseui.intentanalysis.intentModule.KnowledgeModule;
 
 @Data
-public class Function {
+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 e976195..aa79dc3 100644 (file)
--- 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 Function intentHandler;
-    private Function intentOwner;
+    private IntentAnalysisFunction intentHandler;
+    private IntentAnalysisFunction intentOwner;
 
-    public void setIntentRole(Function intentOwner, Function intentHandler) {
+    public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction 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 fb92d71..cb536ed 100644 (file)
--- 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 Function intentHandler;
-    private Function intentOwner;
+    private IntentAnalysisFunction intentHandler;
+    private IntentAnalysisFunction intentOwner;
 
-    public void setIntentRole(Function intentOwner,Function intentHandler){
+    public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction 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 3ab37f4..befd8a4 100644 (file)
--- 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 Function intentHandler;
-    private Function intentOwner;
+    private IntentAnalysisFunction intentHandler;
+    private IntentAnalysisFunction intentOwner;
 
-    public void setIntentRole(Function intentOwner,Function intentHandler){
+    public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction 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 18ecff4..8de3e9c 100644 (file)
--- 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 Function intentHandler;
-    private Function intentOwner;
+    private IntentAnalysisFunction intentHandler;
+    private IntentAnalysisFunction intentOwner;
 
-    public void setIntentRole(Function intentOwner,Function intentHandler){
+    public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction intentHandler){
         if (intentOwner!= null){
             this.intentOwner = intentOwner;
         }

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 0b6ec9c..274f474 100644 (file)
--- 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 Function intentHandler;
-    private Function intentOwner;
+    private IntentAnalysisFunction intentHandler;
+    private IntentAnalysisFunction intentOwner;
 
-    public void setIntentRole(Function intentOwner,Function intentHandler){
+    public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction 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 f125f72..7f0e0a8 100644 (file)
--- 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 Function intentOwner;
-    private Function intentHandler;
+    private IntentAnalysisFunction intentOwner;
+    private IntentAnalysisFunction intentHandler;
 
 
-    public void setIntentRole(Function intentOwner,Function intentHandler){
+    public void setIntentRole(IntentAnalysisFunction intentOwner, IntentAnalysisFunction intentHandler){
         if (intentOwner!= null){
             this.intentOwner = intentOwner;
         }