Enhance Activity Spec

Enhance Activity Spec to include additional fields type and content.

Change-Id: Ic39aa21ef265bf07a5522a2f46f84d378316c7aa
Issue-ID: SDC-1048
Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>

2 files changed, 12 insertions, 6 deletions

diff --git a/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/dao/impl/ActivitySpecDaoZusammenImpl.java b/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/dao/impl/ActivitySpecDaoZusammenImpl.java
index d9d495a01a..0dabcca984 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/dao/impl/ActivitySpecDaoZusammenImpl.java
+++ b/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/dao/impl/ActivitySpecDaoZusammenImpl.java
@@ -112,8 +112,10 @@ public class ActivitySpecDaoZusammenImpl implements ActivitySpecDao {
   private void enrichEntityFromElementData(ActivitySpecEntity entity, InputStream data) {
     ActivitySpecData activitySpecData = JsonUtil.json2Object(data, ActivitySpecData.class);
     if (Objects.nonNull(activitySpecData)) {
-      entity.setInputParameters(activitySpecData.getInputParameters());
-      entity.setOutputParameters(activitySpecData.getOutputParameters());
+      entity.setInputs(activitySpecData.getInputs());
+      entity.setOutputs(activitySpecData.getOutputs());
+      entity.setType(activitySpecData.getType());
+      entity.setContent(activitySpecData.getContent());
     }
   }
 
@@ -127,8 +129,10 @@ public class ActivitySpecDaoZusammenImpl implements ActivitySpecDao {
 
   private void enrichElementDataFromEntity(ZusammenElement element, ActivitySpecEntity entity) {
     ActivitySpecData activitySpecData = new ActivitySpecData();
-    activitySpecData.setInputParameters(entity.getInputParameters());
-    activitySpecData.setOutputParameters(entity.getOutputParameters());
+    activitySpecData.setInputs(entity.getInputs());
+    activitySpecData.setOutputs(entity.getOutputs());
+    activitySpecData.setType(entity.getType());
+    activitySpecData.setContent(entity.getContent());
     element.setData(new ByteArrayInputStream(JsonUtil.object2Json(activitySpecData).getBytes()));
   }
 
diff --git a/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/dao/types/ActivitySpecEntity.java b/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/dao/types/ActivitySpecEntity.java
index b21e424a2f..2f261f8fa9 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/dao/types/ActivitySpecEntity.java
+++ b/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/dao/types/ActivitySpecEntity.java
@@ -29,8 +29,10 @@ public class ActivitySpecEntity {
   private String description;
 
   private List<String> categoryList;
-  private List<ActivitySpecParameter> inputParameters;
-  private List<ActivitySpecParameter> outputParameters;
+  private List<ActivitySpecParameter> inputs;
+  private List<ActivitySpecParameter> outputs;
+  private String type;
+  private String content;
 
   //Not to be maintained in activityspec element
   private String status;