diff options
Diffstat (limited to 'services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be')
3 files changed, 16 insertions, 8 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; diff --git a/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/datatypes/ActivitySpecData.java b/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/datatypes/ActivitySpecData.java index e884bfc784..ad70376aa2 100644 --- a/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/datatypes/ActivitySpecData.java +++ b/services/activity-spec/activity-spec-web/activity-spec-service/src/main/java/org/openecomp/activityspec/be/datatypes/ActivitySpecData.java @@ -21,7 +21,9 @@ import java.util.List; @lombok.Data public class ActivitySpecData { - private List<ActivitySpecParameter> inputParameters = Collections.emptyList(); - private List<ActivitySpecParameter> outputParameters = Collections.emptyList(); + private List<ActivitySpecParameter> inputs = Collections.emptyList(); + private List<ActivitySpecParameter> outputs = Collections.emptyList(); + private String type; + private String content; } |