1 files changed, 13 insertions, 9 deletions

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 9975ef3..7ed852c 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
@@ -15,7 +15,6 @@
  */
 package org.onap.usecaseui.intentanalysis.cllBusinessIntentMgt.cllBusinessModule;
 
-
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang.StringUtils;
 import org.onap.usecaseui.intentanalysis.bean.enums.ExpectationType;
@@ -78,24 +77,28 @@ public class CLLBusinessDecisionModule extends DecisionModule {
         if (intentGoalBean.getIntentGoalType().equals(IntentGoalType.CREATE)) {
             List<Expectation> intentExpectations = intentGoalBean.getIntent().getIntentExpectations();
             List<ExpectationType> expectationTypeList = intentExpectations.stream()
-                    .map(Expectation::getExpectationType).distinct().collect(Collectors.toList());
+                    .map(Expectation::getExpectationType)
+                    .filter(expectationType -> !ExpectationType.REPORT.equals(expectationType)).distinct().collect(Collectors.toList());
             if (expectationTypeList.size() > 1) {
                 return true;
             } else {
                 List<ObjectType> objectTypeList = intentExpectations.stream().map(x ->
                         x.getExpectationObject().getObjectType()).distinct().collect(Collectors.toList());
-                if (objectTypeList.size() > 1) {
-                    return true;
-                }
+                return objectTypeList.size() > 1;
             }
         }
         return false;
     }
 
     public List<IntentGoalBean> intentDecomposition(IntentGoalBean intentGoalBean) {
+        List<Expectation> intentExpectations = intentGoalBean.getIntent().getIntentExpectations();
+        List<Expectation> report = intentExpectations.stream()
+                .filter(expectation -> ExpectationType.REPORT.equals(expectation.getExpectationType()))
+                .collect(Collectors.toList());
         //ExpectationType   expectation.ExpectationObject.objtype
-        Map<ExpectationType, List<Expectation>> expectationTypeListMap = intentGoalBean.getIntent().getIntentExpectations()
-                .stream().collect(Collectors.groupingBy(x -> x.getExpectationType()));
+        Map<ExpectationType, List<Expectation>> expectationTypeListMap = intentExpectations.stream()
+                .filter(expectation -> !ExpectationType.REPORT.equals(expectation.getExpectationType()))
+                .collect(Collectors.groupingBy(Expectation::getExpectationType));
         List<IntentGoalBean> subIntentGoalList = new ArrayList<>();
         IntentGoalType intentGoalType = intentGoalBean.getIntentGoalType();
         for (Map.Entry<ExpectationType, List<Expectation>> entry : expectationTypeListMap.entrySet()) {
@@ -106,7 +109,9 @@ public class CLLBusinessDecisionModule extends DecisionModule {
                 IntentGoalBean subIntentGoalBean = new IntentGoalBean();
                 Intent subIntent = new Intent();
                 subIntent.setIntentName(objEntry.getValue().get(0).getExpectationName().replace("Expectation", "Intent"));
-                subIntent.setIntentExpectations(objEntry.getValue());
+                List<Expectation> value = objEntry.getValue();
+                value.addAll(report);
+                subIntent.setIntentExpectations(value);
                 subIntent.setIntentGenerateType(IntentGenerateType.SYSTEMGENARATE);
                 //TODO      intentFulfillmentInfo intentContexts
                 subIntentGoalBean.setIntentGoalType(intentGoalType);
@@ -208,5 +213,4 @@ public class CLLBusinessDecisionModule extends DecisionModule {
         }
         return intentMap;
     }
-
 }