update intent process code

Issue-ID: USECASEUI-785
Signed-off-by: kaixiliu <liukaixi@chinamobile.com>
Change-Id: Idb6eec6142a0d7e57ecaf04659ce9a42a33aaa94

8 files changed, 28 insertions, 55 deletions

diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/CLLBusinessIntentManagementFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/CLLBusinessIntentManagementFunction.java
index 1203508..5489070 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/CLLBusinessIntentManagementFunction.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/cllBusinessIntentMgt/CLLBusinessIntentManagementFunction.java
@@ -25,6 +25,7 @@ import org.onap.usecaseui.intentanalysis.bean.models.Context;
 import org.onap.usecaseui.intentanalysis.bean.models.Intent;
 import org.onap.usecaseui.intentanalysis.bean.models.IntentEventRecord;
 import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
+import org.onap.usecaseui.intentanalysis.exception.CommonException;
 import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
 import org.onap.usecaseui.intentanalysis.intentBaseService.contextService.IntentContextService;
 import org.onap.usecaseui.intentanalysis.intentBaseService.intentEventRecord.IntentEventRecordService;
@@ -88,12 +89,7 @@ public class CLLBusinessIntentManagementFunction extends IntentManagementFunctio
         LinkedHashMap<IntentGoalBean, IntentManagementFunction> linkedMap = investigation(originIntentGoalBean);
         implementIntent(intentGoalBean.getIntent(), linkedMap);
         if (intentGoalBean.getIntentGoalType() == IntentGoalType.DELETE) {
-            List<Context> parentInfo = intentGoalBean.getIntent().getIntentContexts().stream().filter(a ->
-                    StringUtils.equalsIgnoreCase(a.getContextName(), "parentIntent info")).collect(Collectors.toList());
-
-            String userInputId = parentInfo.get(0).getContextConditions().get(0).getConditionValue();
             intentService.deleteIntent(intentGoalBean.getIntent().getIntentId());
-            intentService.deleteIntent(userInputId);
         }
     }
 
@@ -118,8 +114,7 @@ public class CLLBusinessIntentManagementFunction extends IntentManagementFunctio
         Intent originIntent = intentGoalBean.getIntent();
         IntentGoalType intentGoalType = intentGoalBean.getIntentGoalType();
         if (intentGoalType == IntentGoalType.CREATE) {
-            //return knowledgeModule.intentCognition(originIntent);
-            return intentGoalBean;
+            return knowledgeModule.intentCognition(originIntent);
         } else if (intentGoalType == IntentGoalType.UPDATE) {
             return new IntentGoalBean(intentGoalBean.getIntent(), IntentGoalType.UPDATE);
         } else {
@@ -160,9 +155,15 @@ public class CLLBusinessIntentManagementFunction extends IntentManagementFunctio
                 if (!isParallel) {
                     //Block and regularly query whether the event is published
                     boolean isPublish = false;
-                    while (isPublish) {
+                    int count = 1;
+                    while (!isPublish) {
                         Thread.sleep(1000);
                         IntentEventRecord record = intentEventRecordService.getIntentEventRecordByntentId(newIdIntent.getIntentId(), "create");
+                        count++;
+                        // it will take one hour to wait operation end
+                        if (count==3600){
+                            throw new CommonException("Operation took too long, failed",500);
+                        }
                         if (null != record) {
                             isPublish = true;
                         }
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/controller/IntentController.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/controller/IntentController.java
index 0272e3f..ba28e71 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/controller/IntentController.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/controller/IntentController.java
@@ -49,8 +49,6 @@ public class IntentController {
     private IntentService intentService;
 
     @Autowired
-    private IntentProcessService processService;
-    @Autowired
     FormatIntentInputManagementFunction formatIntentInputManagementFunction;
 
     @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
@@ -60,9 +58,9 @@ public class IntentController {
 
     @GetMapping(value = "/{intentId}", produces = MediaType.APPLICATION_JSON_VALUE)
     public ServiceResult getIntentById(
-    @PathVariable(INTENT_ID) String intentId) {
+            @PathVariable(INTENT_ID) String intentId) {
         return new ServiceResult(new ResultHeader(RSEPONSE_SUCCESS, "get Intent success"),
-        intentService.getIntent(intentId));
+                intentService.getIntent(intentId));
 
     }
 
@@ -72,14 +70,10 @@ public class IntentController {
         Intent returnIntent = new Intent();
         log.info("Execute create intent %s start",intent.getIntentName());
         try {
-            processService.setIntentRole(formatIntentInputManagementFunction, null);
-            IntentGoalBean intentGoalBean = new IntentGoalBean(intent, IntentGoalType.CREATE);
-            IntentGoalBean newIntentGoalBean = processService.intentProcess(intentGoalBean);
-
-            newIntentGoalBean.getIntent().setIntentGenerateType(IntentGenerateType.USERINPUT);
-            returnIntent = intentService.createIntent(newIntentGoalBean.getIntent());
+            formatIntentInputManagementFunction.receiveIntentAsOwner(new IntentGoalBean(intent,IntentGoalType.CREATE));
+            returnIntent = intentService.getIntent(intent.getIntentId());
             resultHeader.setResult_code(RSEPONSE_SUCCESS);
-            resultHeader.setResult_message("create intent success");
+            resultHeader.setResult_message("create intent finish,please waiting");
             log.info("Execute create intent finished");
         } catch (CommonException exception) {
             log.error("Execute create intent Exception:", exception);
@@ -98,10 +92,8 @@ public class IntentController {
                                           @RequestBody Intent intent) {
         log.info("Execute update intent start");
         try {
-            processService.setIntentRole(formatIntentInputManagementFunction, null);
-            IntentGoalBean intentGoalBean = new IntentGoalBean(intent, IntentGoalType.UPDATE);
-            IntentGoalBean newIntentGoalBean = processService.intentProcess(intentGoalBean);
-            Intent reIntent = intentService.updateIntent(newIntentGoalBean.getIntent());
+            formatIntentInputManagementFunction.receiveIntentAsOwner(new IntentGoalBean(intent,IntentGoalType.UPDATE));
+            Intent reIntent = intentService.getIntent(intentId);
             log.info("Execute update intent finished");
             return new ServiceResult(new ResultHeader(RSEPONSE_SUCCESS, "update intent success"), reIntent);
         } catch (CommonException exception) {
@@ -117,10 +109,8 @@ public class IntentController {
     public ServiceResult removeIntentById(@PathVariable(INTENT_ID) String intentId) {
         log.info("Execute delete intent start");
         try {
-            processService.setIntentRole(formatIntentInputManagementFunction, null);
             Intent intent = intentService.getIntent(intentId);
-            IntentGoalBean intentGoalBean = new IntentGoalBean(intent, IntentGoalType.DELETE);
-            processService.intentProcess(intentGoalBean);
+            formatIntentInputManagementFunction.receiveIntentAsOwner(new IntentGoalBean(intent,IntentGoalType.DELETE));
             log.info("Execute delete intent finished");
             return new ServiceResult(new ResultHeader(RSEPONSE_SUCCESS, "delete intent success"));
         } catch (CommonException exception) {
@@ -140,4 +130,6 @@ public class IntentController {
         }
     }
 
-}
+
+
+}
\ No newline at end of file
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 4d16d92..79578ec 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
@@ -131,6 +131,8 @@ public class FormatIntentInputManagementFunction extends IntentManagementFunctio
                 //update userInput intent
                 intentService.updateIntent(originIntent);
             } else {
+                //deal with userInput intent
+                intentService.deleteIntent(originIntent.getIntentId());
                 // 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/FormatIntentInputDecisionModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/formatintentinputMgt/formatintentinputModule/FormatIntentInputDecisionModule.java
index efd09a2..f9d0c74 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
@@ -121,7 +121,6 @@ public class FormatIntentInputDecisionModule extends DecisionModule {
         List<Intent> subIntentList = intentContextService.getSubIntentInfoFromContext(intentGoalBean.getIntent());
         for (Intent intent : subIntentList) {
             IntentManagementFunction intentHandlerInfo = intentContextService.getHandlerInfo(intent);
-           // UpdateIntentInfo(intentGoalBean.getIntent(), intent);//new process move  to defineProcess
             IntentGoalBean subIntentGoalBean = new IntentGoalBean(intent, IntentGoalType.UPDATE);
             intentMap.put(subIntentGoalBean, intentHandlerInfo);
         }
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 f41c5ee..796bb19 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
@@ -64,13 +64,6 @@ public abstract class ActuationModule {
 
     public boolean distrubuteIntentToHandler(Map.Entry<IntentGoalBean, IntentManagementFunction> entry) {
         IntentGoalType intentGoalType = entry.getKey().getIntentGoalType();
-        if (StringUtils.equalsIgnoreCase("create", intentGoalType.name())) {
-            return intentInterfaceService.createInterface(entry.getKey(), entry.getValue());
-        } else if (StringUtils.equalsIgnoreCase("update", intentGoalType.name())) {
-            return intentInterfaceService.updateInterface(entry.getKey(), entry.getValue());
-        } else if (StringUtils.equalsIgnoreCase("delete", intentGoalType.name())) {
-            return intentInterfaceService.deleteInterface(entry.getKey(), entry.getValue());
-        }
         return false;
     }
 
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 57483fe..f225d60 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
@@ -91,15 +91,17 @@ public abstract class KnowledgeModule {
             }
             // condition   ownerName = foramtIntentInput
             List<Context> ownerInfo = intent.getIntentContexts().stream().filter(x ->
-                    StringUtils.equalsIgnoreCase(x.getContextName(), "ownerInfo")).collect(Collectors.toList());
+                    StringUtils.equalsIgnoreCase(x.getContextName(), "owner Info")).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(ownerInfo)) {
                 for (Context context : ownerInfo) {
                     List<Condition> contextConditions = context.getContextConditions();
                     boolean equals = false;
                     for (Condition condition : contextConditions) {
-                        String conditionstr = "ownerName equal to formatIntentInputManagementFunction";
-                        String concatStr = condition.getConditionName() + condition.getOperator().name() + condition.getConditionValue();
-                        if (StringUtils.equalsIgnoreCase(concatStr.trim(), conditionstr.replaceAll(" ", ""))) {
+                        String conditionstr = "owner class name equal to formatIntentInputManagementFunction";
+                        String conValue = condition.getConditionValue();
+                        String conditionValue = conValue.substring(conValue.lastIndexOf(".")+1);
+                        String concatStr = condition.getConditionName() + condition.getOperator().name() + conditionValue;
+                        if (StringUtils.equalsIgnoreCase(concatStr.replaceAll(" ",""), conditionstr.replaceAll(" ", ""))) {
                             fiterList.add(intent);
                             equals = true;
                             break;
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentinterfaceservice/IntentInterfaceService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentinterfaceservice/IntentInterfaceService.java
index bbb09f4..bbeb12e 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentinterfaceservice/IntentInterfaceService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentinterfaceservice/IntentInterfaceService.java
@@ -20,13 +20,10 @@ import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
 import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
 
 public interface IntentInterfaceService {
-    public boolean createInterface(IntentGoalBean intentGoalBean, IntentManagementFunction imf);
     public boolean createInterface(Intent originalIntent,IntentGoalBean intentGoalBean, IntentManagementFunction imf);
 
-    public boolean updateInterface(IntentGoalBean intentGoalBean, IntentManagementFunction imf);
     public boolean updateInterface(Intent originalIntent,IntentGoalBean intentGoalBean, IntentManagementFunction imf);
 
-    public boolean deleteInterface(IntentGoalBean intentGoalBean, IntentManagementFunction imf);
     public boolean deleteInterface(Intent originalIntent, IntentGoalBean intentGoalBean, IntentManagementFunction imf);
 
 }
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentinterfaceservice/impl/IntentInterfaceServiceImpl.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentinterfaceservice/impl/IntentInterfaceServiceImpl.java
index a9410c6..b142b5a 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentinterfaceservice/impl/IntentInterfaceServiceImpl.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentinterfaceservice/impl/IntentInterfaceServiceImpl.java
@@ -25,10 +25,6 @@ import java.time.LocalDateTime;
 
 @Service
 public class IntentInterfaceServiceImpl implements IntentInterfaceService {
-    @Override
-    public boolean createInterface(IntentGoalBean intentGoalBean, IntentManagementFunction imf) {
-        return false;
-    }
 
     @Override
     public boolean createInterface(Intent originalIntent, IntentGoalBean intentGoalBean, IntentManagementFunction handler) {
@@ -42,10 +38,6 @@ public class IntentInterfaceServiceImpl implements IntentInterfaceService {
 
     }
 
-    @Override
-    public boolean updateInterface(IntentGoalBean intentGoalBean, IntentManagementFunction imf) {
-        return false;
-    }
 
     @Override
     public boolean updateInterface(Intent originalIntent, IntentGoalBean intentGoalBean, IntentManagementFunction handler) {
@@ -56,11 +48,6 @@ public class IntentInterfaceServiceImpl implements IntentInterfaceService {
         return true;
     }
 
-    @Override
-    public boolean deleteInterface(IntentGoalBean intentGoalBean, IntentManagementFunction handler) {
-        handler.getKnowledgeModule().recieveDeleteIntent();
-        return true;
-    }
 
     @Override
     public boolean deleteInterface(Intent originalIntent, IntentGoalBean intentGoalBean, IntentManagementFunction handler) {