IntentGoalBean originIntentGoalBean = detection(intentGoalBean);
LinkedHashMap<IntentGoalBean, IntentManagementFunction> linkedMap = investigation(originIntentGoalBean);
implementIntent(intentGoalBean.getIntent(), linkedMap);
- if (intentGoalBean.getIntentGoalType() == IntentGoalType.DELETE) {
- intentService.deleteIntent(intentGoalBean.getIntent().getIntentId());
- }
}
@Override
public void receiveIntentAsHandler(Intent originalIntent, IntentGoalBean intentGoalBean, IntentManagementFunction handler) {
ActuationModule actuationModule = handler.getActuationModule();
IntentGoalType type = intentGoalBean.getIntentGoalType();
+ //before dataBase operate
+ handler.receiveIntentAsOwner(intentGoalBean);
+
if (type == IntentGoalType.CREATE) {
actuationModule.saveIntentToDb(intentGoalBean.getIntent());
} else if (type == IntentGoalType.UPDATE) {
actuationModule.updateIntentToDb(intentGoalBean.getIntent());
} else if (type == IntentGoalType.DELETE) {
+ //before delete cllBusinessIntent check subintent deleted
+ boolean deleteFinished = false;
+ Intent cllIntent = intentGoalBean.getIntent();
+ //subIntent size and delete Intent size
+ List<Context> list = cllIntent.getIntentContexts().stream().filter(x ->
+ StringUtils.equals(x.getContextName(), "subIntent info")).collect(Collectors.toList());
+ int subIntentSize = list.get(0).getContextConditions().size();
+ while (!deleteFinished) {
+ List<IntentEventRecord> deleteList = intentEventRecordService.getRecordByPid(cllIntent.getIntentId(),
+ IntentGoalType.DELETE.name());
+ if (subIntentSize <= deleteList.size()) {
+ deleteFinished = true;
+ }
+ }
actuationModule.deleteIntentToDb(intentGoalBean.getIntent());
}
- //update origin intent if need
- actuationModule.updateIntentOperationInfo(originalIntent, intentGoalBean);
- handler.receiveIntentAsOwner(intentGoalBean);
-
}
public IntentGoalBean detection(IntentGoalBean intentGoalBean) {
intentContextService.updateIntentOwnerHandlerContext(newIdIntent, this, next.getValue());
intentContextService.updateParentIntentContext(originIntent, newIdIntent);
intentContextService.updateChindIntentContext(originIntent, newIdIntent);
- contextService.updateContextList(originIntent.getIntentContexts(), originIntent.getIntentId());
+ // contextService.updateContextList(originIntent.getIntentContexts(), originIntent.getIntentId());
//intent-Distribution-create
boolean isAcceptCreate = intentInterfaceService.createInterface(originIntent,
new IntentGoalBean(newIdIntent, IntentGoalType.CREATE), next.getValue());
int count = 1;
while (!isPublish) {
Thread.sleep(1000);
- IntentEventRecord record = intentEventRecordService.getIntentEventRecordByntentId(newIdIntent.getIntentId(), "create");
+ IntentEventRecord record = intentEventRecordService.getIntentEventRecordByIntentId(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 (count == 3600) {
+ throw new CommonException("Operation took too long, failed", 500);
}
if (null != record) {
isPublish = true;
package org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.cllBusinessModule;
-import org.apache.commons.collections.CollectionUtils;
-import org.onap.usecaseui.intentanalysis.bean.enums.OperatorType;
-import org.onap.usecaseui.intentanalysis.bean.models.Condition;
-import org.onap.usecaseui.intentanalysis.bean.models.Context;
-import org.onap.usecaseui.intentanalysis.bean.models.Expectation;
-import org.onap.usecaseui.intentanalysis.bean.models.ExpectationObject;
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;
import org.onap.usecaseui.intentanalysis.intentBaseService.intentinterfaceservice.IntentInterfaceService;
import org.onap.usecaseui.intentanalysis.service.IntentService;
-import org.onap.usecaseui.intentanalysis.util.CommonUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.List;
-
@Component
public class CLLBusinessActuationModule extends ActuationModule {
- @Autowired
- IntentProcessService processService;
@Autowired
IntentService intentService;
@Autowired
@Override
public void toNextIntentHandler(IntentGoalBean intentGoalBean, IntentManagementFunction IntentHandler) {
- processService.setIntentRole(IntentHandler, null);
- processService.intentProcess(intentGoalBean);
}
@Override
intentHandler.receiveIntentAsOwner(intentGoalBean);
}
- @Override
- public void saveIntentToDb(Intent intent){ //ownerid parent intent id
- List<Context> intentContexts = intent.getIntentContexts();
- if (CollectionUtils.isEmpty(intentContexts)) {
- intentContexts = new ArrayList<>();
- }
- //ownerId intentId="" show relatioship beteween intent
- Context ownerIdContext = new Context();
- ownerIdContext.setContextId(CommonUtil.getUUid());
- ownerIdContext.setContextName("ownerId");
- List<Condition> idConditionList = new ArrayList<>();
- Condition idCondition = new Condition();
- idCondition.setConditionValue(intent.getIntentId());
- idCondition.setOperator(OperatorType.EQUALTO);
- idCondition.setConditionName("intentId");
- idCondition.setConditionId(CommonUtil.getUUid());
-
- idConditionList.add(idCondition);
- ownerIdContext.setContextConditions(idConditionList);
-
- intentContexts.add(ownerIdContext);
- intent.setIntentContexts(intentContexts);
- intentService.createIntent(intent);
- }
@Override
public void updateIntentOperationInfo(Intent originIntent, IntentGoalBean intentGoalBean){
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.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService.IntentDetectionService;
import org.onap.usecaseui.intentanalysis.service.IntentService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Autowired
IntentService intentService;
- @Autowired
- IntentDetectionService intentDetectionService;
@Override
public IntentGoalBean intentCognition(Intent intent) {
try {
log.debug("cllAssurance Intent {} begin time:{}", intentGoalBean.getIntentGoalType(), LocalDateTime.now());
log.debug(Thread.currentThread().getName());
- CreateCallable createCallable = new CreateCallable(originalIntent, intentGoalBean, handler, applicationContext);
- FutureTask<String> futureTask = new FutureTask<>(createCallable);
+ CreateCallable assuranceCallable = new CreateCallable(originalIntent, intentGoalBean, handler, applicationContext);
+ FutureTask<String> futureTask = new FutureTask<>(assuranceCallable);
executor.submit(futureTask);
} catch (Exception ex) {
ex.printStackTrace();
@Override
public void updateIntentOperationInfo(Intent originIntent, IntentGoalBean intentGoalBean){
- log.info("cllDeliveryActuationModule begin to update originIntent subIntentInfo");
- contextService.updateContextList(originIntent.getIntentContexts(), originIntent.getIntentId());
}
private String getBandwidth(String cllId) {
//ask knowledgeModole of handler imf for permision and operate
try {
log.debug("cllDelivery Intent create begin time:" + LocalDateTime.now());
- CreateCallable createCallable = new CreateCallable(originalIntent, intentGoalBean, handler, applicationContext);
- FutureTask<String> futureTask = new FutureTask<>(createCallable);
+ CreateCallable deliveryCallable = new CreateCallable(originalIntent, intentGoalBean, handler, applicationContext);
+ FutureTask<String> futureTask = new FutureTask<>(deliveryCallable);
executor.submit(futureTask);
} catch (Exception ex) {
ex.printStackTrace();
for (Expectation originExpectation : originIntentExpectationList) {
ExpectationObject originExpectationObject = originExpectation.getExpectationObject();
originExpectationObject.setObjectInstance(objectInstance);
- expectationObjectService.updateExpectationObject(originExpectationObject,originExpectation.getExpectationId());
}
}
log.info("cllDeliveryActuationModule begin to update originIntent subIntentInfo");
- contextService.updateContextList(originIntent.getIntentContexts(), originIntent.getIntentId());
}
}
import lombok.extern.log4j.Log4j2;
-import org.onap.usecaseui.intentanalysis.bean.enums.IntentGenerateType;
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.bean.models.ServiceResult;
import org.onap.usecaseui.intentanalysis.exception.CommonException;
import org.onap.usecaseui.intentanalysis.formatintentinputMgt.FormatIntentInputManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService.IntentProcessService;
import org.onap.usecaseui.intentanalysis.service.IntentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
return new ServiceResult(new ResultHeader(exception.getRetCode(), exception.getMessage()));
}
}
-
-
-
}
\ No newline at end of file
private IntentEventRecordService intentEventRecordService;
@EventListener
- public void listenIntentCreateEvent(IntentCreateEvent intentCreateEvent){
- String intentStatus = intentCreateEvent.getIntentStatus();//create status
- IntentGoalBean intentGoalBean = intentCreateEvent.getIntentGoalBean();//current operate intent
- Intent currentIntent = intentGoalBean.getIntent();
- List<Context> owner_info = currentIntent.getIntentContexts().stream().filter(x ->
- StringUtils.equals(x.getContextName(), "owner info")).collect(Collectors.toList());
- List<Context> handler_info = currentIntent.getIntentContexts().stream().filter(x ->
- StringUtils.equals(x.getContextName(), "handler info")).collect(Collectors.toList());
- String owner = owner_info.get(0).getContextConditions().get(0).getConditionValue();
- String handler = handler_info.get(0).getContextConditions().get(0).getConditionValue();
+ public void listenIntentCreateEvent(IntentCreateEvent intentCreateEvent) throws Exception{
+ String intentStatus = intentCreateEvent.getIntentStatus();//create status
+ IntentGoalBean intentGoalBean = intentCreateEvent.getIntentGoalBean();//current operate intent
+ Intent currentIntent = intentGoalBean.getIntent();
+ List<Context> owner_info = currentIntent.getIntentContexts().stream().filter(x ->
+ StringUtils.equals(x.getContextName(), "owner info")).collect(Collectors.toList());
+ List<Context> handler_info = currentIntent.getIntentContexts().stream().filter(x ->
+ StringUtils.equals(x.getContextName(), "handler info")).collect(Collectors.toList());
+ String owner = owner_info.get(0).getContextConditions().get(0).getConditionValue();
+ String handler = handler_info.get(0).getContextConditions().get(0).getConditionValue();
+
+ IntentEventRecord intentEventRecord = new IntentEventRecord();
+ intentEventRecord.setIntentId(currentIntent.getIntentId());
+ intentEventRecord.setIntentName(currentIntent.getIntentName());
+ intentEventRecord.setIntentStatus(intentStatus);
+ intentEventRecord.setOperateType(intentGoalBean.getIntentGoalType().name());
+ intentEventRecordService.createIntentEventRecord(intentEventRecord,
+ intentCreateEvent.getOriginalIntent().getIntentId());
- IntentEventRecord intentEventRecord = new IntentEventRecord();
- intentEventRecord.setIntentId(currentIntent.getIntentId());
- intentEventRecord.setIntentName(currentIntent.getIntentName());
- intentEventRecord.setIntentStatus(intentStatus);
- intentEventRecord.setOperateType(intentGoalBean.getIntentGoalType().name());
- intentEventRecordService.createIntentEventRecord(intentEventRecord);
}
}
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@Autowired
IntentService intentService;
+ @Transactional(rollbackFor = Exception.class)
@Override
public void receiveIntentAsOwner(IntentGoalBean intentGoalBean) {
//update cllBusinessIntent's expectation
Intent subIntent = newIntentGoalBean.getIntent();
updateIntentInfo(originIntent, subIntent);
+ //update userInput intent
+ intentService.updateIntent(originIntent);
// intent-Distribution and operate |update cllBusiness intent
boolean isAcceptUpdate = intentInterfaceService.updateInterface(originIntent,
new IntentGoalBean(subIntent, IntentGoalType.UPDATE), next.getValue());
- //update userInput intent
- intentService.updateIntent(originIntent);
} else {
//deal with userInput intent
intentService.deleteIntent(originIntent.getIntentId());
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;
import org.onap.usecaseui.intentanalysis.service.IntentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Slf4j
@Component
public class FormatIntentInputActuationModule extends ActuationModule {
- @Autowired
- IntentProcessService processService;
@Autowired
IntentService intentService;
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.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService.IntentDetectionService;
import org.onap.usecaseui.intentanalysis.service.IntentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class FormatIntentInputKnowledgeModule extends KnowledgeModule {
- @Autowired
- IntentDetectionService intentDetectionService;
@Autowired
IntentService intentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service
public class IntentEventRecordService {
@Autowired
IntentEventRecordMapper intentEventRecordMapper;
// insert into record table
- public void createIntentEventRecord(IntentEventRecord intentEventRecord){
- intentEventRecordMapper.insertIntentRecord(intentEventRecord);
+ public void createIntentEventRecord(IntentEventRecord intentEventRecord,String parentId){
+ intentEventRecordMapper.insertIntentRecord(intentEventRecord,parentId);
}
// get record by intent nameid， status
- public IntentEventRecord getIntentEventRecordByntentId(String intentId,String operateType){
- return intentEventRecordMapper.getIntentEventRecordByntentId(intentId,operateType);
+ public IntentEventRecord getIntentEventRecordByIntentId(String intentId,String operateType){
+ return intentEventRecordMapper.getIntentEventRecordByIntentId(intentId,operateType);
+ }
+
+ /**
+ * get intentEventRecord by parentId and operateType
+ * @param parentId parentId
+ * @param operateType operateTypr
+ * @return List<IntentEventRecord>
+ */
+ public List<IntentEventRecord> getRecordByPid(String parentId,String operateType){
+ return intentEventRecordMapper.getIntentEventRecordByPid(parentId,operateType);
}
}
*/
package org.onap.usecaseui.intentanalysis.intentBaseService.intentModule;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
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.service.IntentService;
import org.springframework.beans.factory.annotation.Autowired;
-import java.util.List;
import java.util.Map;
public abstract class ActuationModule {
//Save intent information to the intent instance database
public void saveIntentToDb(Intent intent) {
- intentService.createIntent(intent);
+ intentService.createIntent(intent);
}
//Update intent information to the intent instance database
//Delete intent information to the intent instance database
public void deleteIntentToDb(Intent intent) {
- //judge if exist subIntent,exist->don't delete
- List<String> subIntentList = intentService.getSubIntentList(intent);
- if (CollectionUtils.isNotEmpty(subIntentList)) {
- return;
- }
intentService.deleteIntent(intent.getIntentId());
}
+++ /dev/null
-/*
- * 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.intentBaseService.intentProcessService;
-
-
-import lombok.extern.slf4j.Slf4j;
-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.IntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.contextService.IntentContextService;
-import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
-import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
-import org.onap.usecaseui.intentanalysis.service.IntentService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-@Slf4j
-@Service
-public class IntentDefinitionService {
-
- private IntentManagementFunction intentHandler;
- private IntentManagementFunction intentOwner;
-
- @Autowired
- public IntentContextService intentContextService;
- @Autowired
- public IntentService intentService;
-
- public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler) {
- if (intentOwner != null) {
- this.intentOwner = intentOwner;
- }
- if (intentHandler != null) {
- this.intentHandler = intentHandler;
- }
- }
-
- public IntentGoalBean definitionPorcess(Intent originIntent, Map.Entry<IntentGoalBean, IntentManagementFunction> entry) {
- DecisionModule intentDecisionModule = intentOwner.getDecisionModule();
- ActuationModule intentActuationModule = intentOwner.getActuationModule();
-
- IntentGoalBean newIntentGoalBean = entry.getKey();
- if (newIntentGoalBean.getIntentGoalType() == IntentGoalType.CREATE){
- Intent newIdIntent = intentDecisionModule.intentObjectDefine(originIntent, entry.getKey().getIntent());
- intentContextService.updateIntentOwnerHandlerContext(newIdIntent, intentOwner, intentHandler);
- intentContextService.updateParentIntentContext(originIntent, newIdIntent);
- intentContextService.updateChindIntentContext(originIntent, newIdIntent);
- log.debug(newIdIntent.toString());
- intentActuationModule.saveIntentToDb(newIdIntent);
- return new IntentGoalBean(newIdIntent,IntentGoalType.CREATE);
- }
-
- if (newIntentGoalBean.getIntentGoalType() == IntentGoalType.UPDATE){
- intentActuationModule.updateIntentToDb(newIntentGoalBean.getIntent());
- }
- if (newIntentGoalBean.getIntentGoalType() == IntentGoalType.DELETE){
- intentActuationModule.deleteIntentToDb(entry.getKey().getIntent());
- }
- return newIntentGoalBean;
- }
-}
+++ /dev/null
-/*
- * 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.intentBaseService.intentProcessService;
-
-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.IntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule;
-import org.springframework.stereotype.Service;
-
-@Service
-public class IntentDetectionService {
-
- private IntentManagementFunction intentHandler;
- private IntentManagementFunction intentOwner;
-
- public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler) {
- if (intentOwner != null) {
- this.intentOwner = intentOwner;
- }
- if (intentHandler != null) {
- this.intentHandler = intentHandler;
- }
- }
-
- public IntentGoalBean detectionProcess(IntentGoalBean originIntentGoalBean) {
- KnowledgeModule ownerKnowledgeModule = intentOwner.getKnowledgeModule();
-
- if (originIntentGoalBean.getIntentGoalType() == IntentGoalType.UPDATE){
- return new IntentGoalBean(originIntentGoalBean.getIntent(), IntentGoalType.UPDATE);
- }
-
- if (originIntentGoalBean.getIntentGoalType() == IntentGoalType.DELETE){
- return new IntentGoalBean(originIntentGoalBean.getIntent(), IntentGoalType.DELETE);
- }
-
- return ownerKnowledgeModule.intentCognition(originIntentGoalBean.getIntent());
-
- }
-}
+++ /dev/null
-/*
- * 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.intentBaseService.intentProcessService;
-
-
-import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
-import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.intentinterfaceservice.IntentInterfaceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-@Service
-public class IntentDistributionService {
- private IntentManagementFunction intentHandler;
- private IntentManagementFunction intentOwner;
-
- @Autowired
- IntentInterfaceService intentInterfaceService;
-
- public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler) {
- if (intentOwner != null) {
- this.intentOwner = intentOwner;
- }
- if (intentHandler != null) {
- this.intentHandler = intentHandler;
- }
- }
-
- public boolean distributionProcess(Map.Entry<IntentGoalBean, IntentManagementFunction> entry) {
-
- return intentOwner.getActuationModule().distrubuteIntentToHandler(entry);
-
- }
-
-}
-
+++ /dev/null
-/*
- * 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.intentBaseService.intentProcessService;
-
-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.IntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.contextService.IntentContextService;
-import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-@Service
-public class IntentInvestigationService {
-
- @Autowired
- IntentContextService intentContextService;
-
- private IntentManagementFunction intentHandler;
- private IntentManagementFunction intentOwner;
-
- public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler){
- if (intentOwner != null){
- this.intentOwner = intentOwner;
- }
- if (intentHandler != null){
- this.intentHandler= intentHandler;
- }
- }
-
- public LinkedHashMap<IntentGoalBean,IntentManagementFunction> investigationProcess(IntentGoalBean intentGoalBean) {
- DecisionModule intentDecisionModule = intentOwner.getDecisionModule();
-
- if (intentGoalBean.getIntentGoalType() == IntentGoalType.UPDATE){
- return intentDecisionModule.investigationUpdateProcess(intentGoalBean);
- }
-
- if (intentGoalBean.getIntentGoalType() == IntentGoalType.DELETE){
- return intentDecisionModule.investigationDeleteProcess(intentGoalBean);
- }
- return intentDecisionModule.investigationCreateProcess(intentGoalBean);
- }
-}
+++ /dev/null
-/*
- * 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.intentBaseService.intentProcessService;
-
-
-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.intentModule.DecisionModule;
-import org.springframework.stereotype.Service;
-
-@Service
-public class IntentOperationService {
-
- private IntentManagementFunction intentHandler;
- private IntentManagementFunction intentOwner;
-
- public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler) {
- if (intentOwner != null) {
- this.intentOwner = intentOwner;
- }
- if (intentHandler != null) {
- this.intentHandler = intentHandler;
- }
- }
-
- public void operationProcess(Intent originIntent, IntentGoalBean intentGoalBean) {
- DecisionModule intentDecisionModule = intentOwner.getDecisionModule();
- ActuationModule intentActuationModule = intentHandler.getActuationModule();
-
- //intentDecisionModule.interactWithTemplateDb();
- intentActuationModule.interactWithIntentHandle();
- //determine whether to operate directly or send to next intent handler
- intentActuationModule.fulfillIntent(intentGoalBean, intentHandler);
-
- //update origin intent if need
- intentActuationModule.updateIntentOperationInfo(originIntent, intentGoalBean);
- }
-}
+++ /dev/null
-/*
- * 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.intentBaseService.intentProcessService;
-
-import org.apache.commons.lang.StringUtils;
-import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
-import org.onap.usecaseui.intentanalysis.bean.models.IntentGoalBean;
-import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.service.IntentService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-@Service
-public class IntentProcessService {
- @Autowired
- IntentDetectionService intentDetectionService;
- @Autowired
- IntentInvestigationService intentInvestigationService;
- @Autowired
- IntentDefinitionService intentDefinitionService;
- @Autowired
- IntentDistributionService intentDistributionService;
- @Autowired
- IntentOperationService intentOperationService;
- @Autowired
- IntentService intentService;
- private IntentManagementFunction intentOwner;
- private IntentManagementFunction intentHandler;
-
-
- public void setIntentRole(IntentManagementFunction intentOwner, IntentManagementFunction intentHandler) {
- if (intentOwner != null) {
- this.intentOwner = intentOwner;
- }
- if (intentHandler != null) {
- this.intentHandler = intentHandler;
- }
- }
-
- @Transactional(rollbackFor = Exception.class)
- public IntentGoalBean intentProcess(IntentGoalBean originIntentGoalBean) {
-
- intentDetectionService.setIntentRole(intentOwner, intentHandler);
- IntentGoalBean newIntentGoalBean = intentDetectionService.detectionProcess(originIntentGoalBean);
-
- //investigation process Decomposition
- intentInvestigationService.setIntentRole(intentOwner, intentHandler);
- LinkedHashMap<IntentGoalBean, IntentManagementFunction> intentMap =
- intentInvestigationService.investigationProcess(newIntentGoalBean);
-
- Iterator<Map.Entry<IntentGoalBean, IntentManagementFunction>> iterator = intentMap.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry<IntentGoalBean, IntentManagementFunction> next = iterator.next();
- //definition process save subintent
- intentDefinitionService.setIntentRole(intentOwner, next.getValue());
- //obtain newID IntentGoalBean
- IntentGoalBean newIdIntentGoalBean = intentDefinitionService.definitionPorcess(originIntentGoalBean.getIntent(), next);
-
- //distribution process
- intentDistributionService.setIntentRole(intentOwner, intentHandler);
- intentDistributionService.distributionProcess(next);
-
- intentOperationService.setIntentRole(intentOwner, next.getValue());
- intentOperationService.operationProcess(originIntentGoalBean.getIntent(), newIdIntentGoalBean);
- }
- //delete second intent
- if (StringUtils.equals(originIntentGoalBean.getIntentGoalType().name(),IntentGoalType.DELETE.name())){
- intentService.deleteIntent(originIntentGoalBean.getIntent().getIntentId());
- }
- return newIntentGoalBean;
- }
-}
import org.apache.ibatis.annotations.Param;
import org.onap.usecaseui.intentanalysis.bean.models.IntentEventRecord;
+import java.util.List;
+
public interface IntentEventRecordMapper {
- int insertIntentRecord(@Param(value = "intentEventRecord") IntentEventRecord intentEventRecord);
+ int insertIntentRecord(@Param(value = "intentEventRecord") IntentEventRecord intentEventRecord,
+ @Param(value="parentId")String parentId);
- IntentEventRecord getIntentEventRecordByntentId(@Param(value = "intentId") String intentId,
+ IntentEventRecord getIntentEventRecordByIntentId(@Param(value = "intentId") String intentId,
@Param(value = "operateType") String operateType);
+
+ List<IntentEventRecord> getIntentEventRecordByPid(@Param(value="parentId")String parentId,
+ @Param(value = "operateType")String operateType);
}
intentId varchar(255),
intentName varchar(255),
intentStatus varchar (225),
- operateType varchar (225)
+ operateType varchar (225),
+ parent_id varchar(255)
);
\ No newline at end of file
<mapper namespace="org.onap.usecaseui.intentanalysis.mapper.IntentEventRecordMapper">
<insert id="insertIntentRecord">
- insert into intent_Event_Record(intentId, intentName, intentStatus, operateType)
+ insert into intent_Event_Record(intentId, intentName, intentStatus, operateType,parent_id)
values(#{intentEventRecord.intentId}, #{intentEventRecord.intentName},
- #{intentEventRecord.intentStatus},#{intentEventRecord.operateType})
+ #{intentEventRecord.intentStatus},#{intentEventRecord.operateType},
+ #{parentId})
</insert>
- <select id="getIntentEventRecordByntentId" resultType="org.onap.usecaseui.intentanalysis.bean.models.IntentEventRecord">
- select * from intent_Event_Record where intentId = #{intentId};
+ <select id="getIntentEventRecordByIntentId" resultType="org.onap.usecaseui.intentanalysis.bean.models.IntentEventRecord">
+ select id,intentId,intentName,intentStatus,operateType,parent_id parentId
+ from intent_Event_Record where intentId = #{intentId};
+ </select>
+
+ <select id="getIntentEventRecordByPid" resultType="org.onap.usecaseui.intentanalysis.bean.models.IntentEventRecord">
+ select id,intentId,intentName,intentStatus,operateType,parent_id
+ from intent_Event_Record where parent_id = #{parentId} and operateType=#{operateType};
</select>
</mapper>
import org.onap.usecaseui.intentanalysis.adapters.policy.PolicyService;
import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType;
import org.onap.usecaseui.intentanalysis.bean.enums.IntentGoalType;
-import org.onap.usecaseui.intentanalysis.bean.enums.ObjectType;
import org.onap.usecaseui.intentanalysis.bean.enums.OperatorType;
import org.onap.usecaseui.intentanalysis.bean.models.*;
import org.onap.usecaseui.intentanalysis.service.ContextService;
import org.onap.usecaseui.intentanalysis.service.IntentService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.ArrayList;
import java.util.List;
-import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
originIntent.setIntentContexts(new ArrayList<>());
originIntent.setIntentId("12345");
cllAssuranceActuationModule.updateIntentOperationInfo(originIntent,new IntentGoalBean());
- verify(contextService, times(1)).updateContextList(originIntent.getIntentContexts(), originIntent.getIntentId());
+ Assert.assertTrue(true);
}
@Test
public void testDeleteIntentToDb(){
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests;
-import org.onap.usecaseui.intentanalysis.bean.enums.IntentGenerateType;
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.common.ResponseConsts;
import org.onap.usecaseui.intentanalysis.exception.CommonException;
import org.onap.usecaseui.intentanalysis.formatintentinputMgt.FormatIntentInputManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService.IntentProcessService;
import org.onap.usecaseui.intentanalysis.service.IntentService;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
-import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
@SpringBootTest(classes = IntentAnalysisApplicationTests.class)
@Mock
IntentService intentService;
@Mock
- IntentProcessService intentProcessService;
- @Mock
FormatIntentInputManagementFunction formatIntentInputManagementFunction;
intentController.createIntent(intent);
Assert.assertTrue(true);
}
+
@Test
- public void testUpdateIntentById(){
+ public void testUpdateIntentById() {
Intent intent = new Intent();
intent.setIntentId("test");
intent.setIntentName("cllBussinessIntent");
IntentGoalBean intentGoalBean = new IntentGoalBean(intent, IntentGoalType.CREATE);
- intentController.updateIntentById(intent.getIntentId(),intent);
+ intentController.updateIntentById(intent.getIntentId(), intent);
verify(formatIntentInputManagementFunction, times(1)).receiveIntentAsOwner(any());
}
+
@Test
public void testUpdateIntentByIdCommonException() {
Intent intent = new Intent();
intent.setIntentName("cllBussinessIntent");
- when(intentProcessService.intentProcess(any())).thenThrow(new CommonException("MSG", ResponseConsts.RET_UPDATE_DATA_FAIL));
- intentController.updateIntentById(any(),any());
+ intentController.updateIntentById(any(), any());
Assert.assertTrue(true);
}
@Test
- public void testRemoveIntentById(){
+ public void testRemoveIntentById() {
Intent intent = new Intent();
intent.setIntentName("cllBussinessIntent");
String id = "intentId";
Intent intent = new Intent();
intent.setIntentName("cllBussinessIntent");
IntentGoalBean intentGoalBean = new IntentGoalBean(intent, IntentGoalType.CREATE);
- when(intentProcessService.intentProcess(any())).thenThrow(new CommonException("MSG", ResponseConsts.RET_UPDATE_DATA_FAIL));
intentController.removeIntentById("intentId");
Assert.assertTrue(true);
}
@Test
- public void testGetIntentListByIntentGenerateType(){
+ public void testGetIntentListByIntentGenerateType() {
intentController.getIntentListByIntentGenerateType(anyString());
verify(intentService, times(1)).getIntentListByUserInput(anyString());
}
+
@Test
- public void testGetIntentListByIntentGenerateTypeCommoExcption(){
+ public void testGetIntentListByIntentGenerateTypeCommoExcption() {
when(intentService.getIntentListByUserInput(any())).thenThrow(new CommonException("MSG", ResponseConsts.RET_UPDATE_DATA_FAIL));
intentController.getIntentListByIntentGenerateType(anyString());
Assert.assertTrue(true);
intentId varchar(255),
intentName varchar(255),
intentStatus varchar (225),
- operateType varchar (225)
+ operateType varchar (225),
+ parent_id varchar(255)
);
Code Review / usecase-ui / intent-analysis.git / commitdiff