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>
target.setDescription(source.getDescription());
target.setCategoryList(source.getCategoryList() == null ? new ArrayList<String>()
: source.getCategoryList());
- if (Objects.nonNull(source.getInputParameters())) {
- target.setInputParameters(source.getInputParameters().stream()
+ if (Objects.nonNull(source.getInputs())) {
+ target.setInputs(source.getInputs().stream()
.map(activitySpecParameterDto -> new MapDtoToActivityParameter()
.applyMapping(activitySpecParameterDto, ActivitySpecParameter.class))
.collect(Collectors.toList()));
}
- if (Objects.nonNull(source.getOutputParameters())) {
- target.setOutputParameters(source.getOutputParameters().stream()
+ if (Objects.nonNull(source.getOutputs())) {
+ target.setOutputs(source.getOutputs().stream()
.map(activitySpecParameterDto -> new MapDtoToActivityParameter()
.applyMapping(activitySpecParameterDto, ActivitySpecParameter.class))
.collect(Collectors.toList()));
}
+ target.setType(source.getType());
+ target.setContent(source.getContent());
}
}
target.setName(source.getName());
target.setDescription(source.getDescription());
target.setCategoryList(source.getCategoryList());
- if (Objects.nonNull(source.getInputParameters())) {
- target.setInputParameters(source.getInputParameters().stream().map(
+ if (Objects.nonNull(source.getInputs())) {
+ target.setInputs(source.getInputs().stream().map(
activitySpecParameter -> new MapActivityParameterToDto()
.applyMapping(activitySpecParameter, ActivitySpecParameterDto
.class)).collect(Collectors.toList()));
}
- if (Objects.nonNull(source.getOutputParameters())) {
- target.setOutputParameters(source.getOutputParameters().stream().map(
+ if (Objects.nonNull(source.getOutputs())) {
+ target.setOutputs(source.getOutputs().stream().map(
activitySpecParameter -> new MapActivityParameterToDto()
.applyMapping(activitySpecParameter, ActivitySpecParameterDto
.class)).collect(Collectors.toList()));
}
target.setStatus(source.getStatus());
+ target.setType(source.getType());
+ target.setContent(source.getContent());
}
}
private String name;
private String description;
private List<String> categoryList;
- private List<ActivitySpecParameterDto> inputParameters;
- private List<ActivitySpecParameterDto> outputParameters;
+ private List<ActivitySpecParameterDto> inputs;
+ private List<ActivitySpecParameterDto> outputs;
private String status;
+ private String type;
+ private String content;
}
private String description;
private List<String> categoryList;
- private List<ActivitySpecParameterDto> inputParameters;
- private List<ActivitySpecParameterDto> outputParameters;
+ private List<ActivitySpecParameterDto> inputs;
+ private List<ActivitySpecParameterDto> outputs;
+ private String type;
+ private String content;
}
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());
}
}
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()));
}
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;
@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;
}
inputParams.setValue("localhost");
List<ActivitySpecParameter> inputs = new ArrayList<>();
inputs.add(inputParams);
- entity.setInputParameters(inputs);
+ entity.setInputs(inputs);
}
@AfterMethod
.getElement(context, elementContext, zusammenAdaptor.elementId);
final InputStream data = testElement.get().getData();
final ActivitySpecData activitySpecData = JsonUtil.json2Object(data, ActivitySpecData.class);
- Assert.assertEquals(activitySpecData.getInputParameters().get(0).getName(),
- entity.getInputParameters().get(0).getName());
+ Assert.assertEquals(activitySpecData.getInputs().get(0).getName(),
+ entity.getInputs().get(0).getName());
}
@Test
public class ActivitySpecManagerImplTest {
private static final String STRING_TYPE = "String";
- ActivitySpecEntity activitySpec;
+ private ActivitySpecEntity activitySpec;
private ActivitySpecEntity retrieved;
private ActivitySpecEntity input;
private ActivitySpecEntity activitySpecToCreate;
List<ActivitySpecParameter> inputs = new ArrayList<>();
inputs.add(inputParams);
inputs.add(inputParams1);
- activitySpecToCreate.setInputParameters(inputs);
+ activitySpecToCreate.setInputs(inputs);
ActivitySpecParameter outputParams = new ActivitySpecParameter("status", STRING_TYPE);
outputParams.setValue("started");
List<ActivitySpecParameter> outputs = new ArrayList<>();
outputs.add(outputParams);
- activitySpecToCreate.setOutputParameters(outputs);
+ activitySpecToCreate.setOutputs(outputs);
activitySpec = activitySpecManager.createActivitySpec
(activitySpecToCreate);
Assert.assertEquals(actual.getName(), expected.getName());
Assert.assertEquals(actual.getDescription(), expected.getDescription());
Assert.assertEquals(actual.getCategoryList(), expected.getCategoryList());
- Assert.assertEquals(actual.getInputParameters(), expected.getInputParameters());
- Assert.assertEquals(actual.getOutputParameters(), expected.getOutputParameters());
+ Assert.assertEquals(actual.getInputs(), expected.getInputs());
+ Assert.assertEquals(actual.getOutputs(), expected.getOutputs());
}
}
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.stream.Collectors;
import org.openecomp.sdc.versioning.dao.types.VersionStatus;
import org.openecomp.sdc.versioning.types.Item;
import org.openecomp.sdc.versioning.ItemManager;
public class ItemManagerMock implements ItemManager {
- public String id;
- public Item item;
+ private String id;
+ private Item item;
@Override
public Collection<Item> list(Predicate<Item> predicate) {
List<Item> items = new ArrayList<>();
items.add(item);
- Collection<Item> collection = items;
return items;
}
}
+ @Override
+ public void archive(Item item) {
+
+ }
+
+ @Override
+ public void restore(Item item) {
+
+ }
@Override
+++ /dev/null
-<!DOCTYPE html>
-<html>
-<title>API Document</title>
-
-<!--xmp theme="united" style="display:none;"-->
-<xmp theme="united" style="display:none;">
-#Rest API
-
-
-## HTTP:///activityspec-api
-
-
-Rest API Documentation
-
-
-
-**Version** v1.0, build #${buildNumber}
-
-
-
-
-
-
-
-
-
-
-
-
-# APIs
-
-
-## /v1.0/activity-spec
-
-
-### GET
-
-<a id="list">Get list of activity specs </a>
-
-
-
-
-
-
-
-
-
-#### Request
-
-
-**Content-Type: ** application/json
-
-##### Parameters
-
-<table border="1">
- <tr>
- <th>Name</th>
- <th>Located in</th>
- <th>Required</th>
- <th>Description</th>
- <th>Default</th>
- <th>Schema</th>
- </tr>
-
-
-
-<tr>
- <th>status</th>
- <td>query</td>
- <td>no</td>
- <td>Currently supported values: 'Certified' - only activity specs with Certified status</td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-<tr>
- <th>USER_ID</th>
- <td>header</td>
- <td>no</td>
- <td></td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-
-</table>
-
-
-
-#### Response
-
-**Content-Type: ** application/json
-
-
-| Status Code | Reason | Response Model |
-|-------------|-------------|----------------|
-| default | successful operation | - |
-
-
-
-
-
-
-### POST
-
-
-<a id="createActivitySpec">Create Activity Spec</a>
-
-
-
-
-
-
-
-
-
-#### Request
-
-
-**Content-Type: ** application/json
-
-##### Parameters
-
-<table border="1">
- <tr>
- <th>Name</th>
- <th>Located in</th>
- <th>Required</th>
- <th>Description</th>
- <th>Default</th>
- <th>Schema</th>
- </tr>
-
-
-
-<tr>
- <th>body</th>
- <td>body</td>
- <td>no</td>
- <td></td>
- <td> - </td>
-
- <td>
-
- <a href="#/definitions/ActivitySpecRequest">ActivitySpecRequest</a>
- </td>
-
-</tr>
-
-<tr>
- <th>USER_ID</th>
- <td>header</td>
- <td>no</td>
- <td></td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-
-</table>
-
-
-
-#### Response
-
-**Content-Type: ** application/json
-
-
-| Status Code | Reason | Response Model |
-|-------------|-------------|----------------|
-| default | successful operation | - |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-## /v1.0/activity-spec/{id}/versions/{versionId}
-
-
-### GET
-
-<a id="getActivitySpec">Get Activity Spec</a>
-
-
-
-
-
-
-
-
-
-#### Request
-
-
-**Content-Type: ** application/json
-
-##### Parameters
-
-<table border="1">
- <tr>
- <th>Name</th>
- <th>Located in</th>
- <th>Required</th>
- <th>Description</th>
- <th>Default</th>
- <th>Schema</th>
- </tr>
-
-
-
-<tr>
- <th>id</th>
- <td>path</td>
- <td>yes</td>
- <td>Activity Spec Id</td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-<tr>
- <th>versionId</th>
- <td>path</td>
- <td>yes</td>
- <td>Version Id</td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-<tr>
- <th>USER_ID</th>
- <td>header</td>
- <td>no</td>
- <td></td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-
-</table>
-
-
-
-#### Response
-
-**Content-Type: ** application/json
-
-
-| Status Code | Reason | Response Model |
-|-------------|-------------|----------------|
-| default | successful operation | - |
-
-
-
-
-### PUT
-
-<a id="updateActivitySpec">Update Activity Spec</a>
-
-
-
-
-
-
-
-
-
-#### Request
-
-
-**Content-Type: ** application/json
-
-##### Parameters
-
-<table border="1">
- <tr>
- <th>Name</th>
- <th>Located in</th>
- <th>Required</th>
- <th>Description</th>
- <th>Default</th>
- <th>Schema</th>
- </tr>
-
-
-
-<tr>
- <th>body</th>
- <td>body</td>
- <td>no</td>
- <td></td>
- <td> - </td>
-
- <td>
-
- <a href="#/definitions/ActivitySpecRequest">ActivitySpecRequest</a>
- </td>
-
-</tr>
-
-<tr>
- <th>id</th>
- <td>path</td>
- <td>yes</td>
- <td>Activity Spec Id</td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-<tr>
- <th>versionId</th>
- <td>path</td>
- <td>yes</td>
- <td>Version Id</td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-<tr>
- <th>USER_ID</th>
- <td>header</td>
- <td>no</td>
- <td></td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-
-</table>
-
-
-
-#### Response
-
-**Content-Type: ** application/json
-
-
-| Status Code | Reason | Response Model |
-|-------------|-------------|----------------|
-| default | successful operation | - |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-## /v1.0/activity-spec/{id}/versions/{versionId}/actions
-
-
-
-
-### PUT
-
-<a id="actOnActivitySpec">Actions on a activity spec</a>
-
-Performs one of the following actions on a activity spec: |Submit: Finalize its active version.|Deprecate: Deprecate activity spec.|
-
-
-
-
-
-
-
-#### Request
-
-
-**Content-Type: ** application/json
-
-##### Parameters
-
-<table border="1">
- <tr>
- <th>Name</th>
- <th>Located in</th>
- <th>Required</th>
- <th>Description</th>
- <th>Default</th>
- <th>Schema</th>
- </tr>
-
-
-
-<tr>
- <th>body</th>
- <td>body</td>
- <td>no</td>
- <td></td>
- <td> - </td>
-
- <td>
-
- <a href="#/definitions/ActivitySpecActionRequestDto">ActivitySpecActionRequestDto</a>
- </td>
-
-</tr>
-
-<tr>
- <th>id</th>
- <td>path</td>
- <td>yes</td>
- <td>Activity Spec Id</td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-<tr>
- <th>versionId</th>
- <td>path</td>
- <td>yes</td>
- <td>Version Id</td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-<tr>
- <th>USER_ID</th>
- <td>header</td>
- <td>no</td>
- <td></td>
- <td> - </td>
-
-
- <td>string </td>
-
-
-</tr>
-
-
-</table>
-
-
-
-#### Response
-
-**Content-Type: ** application/json
-
-
-| Status Code | Reason | Response Model |
-|-------------|-------------|----------------|
-| default | successful operation | - |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Definitions
-
-## <a name="/definitions/ActivitySpecActionRequestDto">ActivitySpecActionRequestDto</a>
-
-<table border="1">
- <tr>
- <th>name</th>
- <th>type</th>
- <th>required</th>
- <th>description</th>
- <th>example</th>
- </tr>
-
- <tr>
- <td>action</td>
- <td>
-
-
- string
-
- </td>
- <td>optional</td>
- <td>-</td>
- <td></td>
- </tr>
-
-</table>
-
-## <a name="/definitions/ActivitySpecParameterDto">ActivitySpecParameterDto</a>
-
-<table border="1">
- <tr>
- <th>name</th>
- <th>type</th>
- <th>required</th>
- <th>description</th>
- <th>example</th>
- </tr>
-
- <tr>
- <td>name</td>
- <td>
-
-
- string
-
- </td>
- <td>optional</td>
- <td>-</td>
- <td></td>
- </tr>
-
- <tr>
- <td>type</td>
- <td>
-
-
- string
-
- </td>
- <td>optional</td>
- <td>-</td>
- <td></td>
- </tr>
-
- <tr>
- <td>value</td>
- <td>
-
-
- string
-
- </td>
- <td>optional</td>
- <td>-</td>
- <td></td>
- </tr>
-
-</table>
-
-## <a name="/definitions/ActivitySpecRequest">ActivitySpecRequest</a>
-
-<table border="1">
- <tr>
- <th>name</th>
- <th>type</th>
- <th>required</th>
- <th>description</th>
- <th>example</th>
- </tr>
-
- <tr>
- <td>name</td>
- <td>
-
-
- string
-
- </td>
- <td>optional</td>
- <td>-</td>
- <td></td>
- </tr>
-
- <tr>
- <td>description</td>
- <td>
-
-
- string
-
- </td>
- <td>optional</td>
- <td>-</td>
- <td></td>
- </tr>
-
- <tr>
- <td>categoryList</td>
- <td>
-
-
- array[string]
-
- </td>
- <td>optional</td>
- <td>-</td>
- <td></td>
- </tr>
-
- <tr>
- <td>inputParameters</td>
- <td>
-
-
- array[<a href="#/definitions/ActivitySpecParameterDto">ActivitySpecParameterDto</a>]
-
-
-
- </td>
- <td>optional</td>
- <td>-</td>
- <td></td>
- </tr>
-
- <tr>
- <td>outputParameters</td>
- <td>
-
-
- array[<a href="#/definitions/ActivitySpecParameterDto">ActivitySpecParameterDto</a>]
-
-
-
- </td>
- <td>optional</td>
- <td>-</td>
- <td></td>
- </tr>
-
-</table>
-
-</xmp>
-
-<script src="http://strapdownjs.com/v/0.2/strapdown.js"></script>
-</html>
\ No newline at end of file
+++ /dev/null
-{
- "swagger" : "2.0",
- "info" : {
- "description" : "Rest API Documentation",
- "version" : "v1.0, build #${buildNumber}",
- "title" : "Rest API",
- "termsOfService" : "http://www.github.com/kongchen/swagger-maven-plugin"
- },
- "basePath" : "/activityspec-api",
- "tags" : [ {
- "name" : "Activity Specs"
- } ],
- "schemes" : [ "http" ],
- "paths" : {
- "/v1.0/activity-spec" : {
- "get" : {
- "tags" : [ "Activity Specs" ],
- "summary" : "Get list of activity specs ",
- "description" : "",
- "operationId" : "list",
- "consumes" : [ "application/json" ],
- "produces" : [ "application/json" ],
- "parameters" : [ {
- "name" : "status",
- "in" : "query",
- "description" : "Currently supported values: 'Certified' - only activity specs with Certified status",
- "required" : false,
- "type" : "string"
- }, {
- "name" : "USER_ID",
- "in" : "header",
- "required" : false,
- "type" : "string",
- "default" : ""
- } ],
- "responses" : {
- "default" : {
- "description" : "successful operation"
- }
- }
- },
- "post" : {
- "tags" : [ "Activity Specs" ],
- "summary" : "Create Activity Spec",
- "description" : "",
- "operationId" : "createActivitySpec",
- "consumes" : [ "application/json" ],
- "produces" : [ "application/json" ],
- "parameters" : [ {
- "in" : "body",
- "name" : "body",
- "required" : false,
- "schema" : {
- "$ref" : "#/definitions/ActivitySpecRequest"
- }
- }, {
- "name" : "USER_ID",
- "in" : "header",
- "required" : false,
- "type" : "string",
- "default" : ""
- } ],
- "responses" : {
- "default" : {
- "description" : "successful operation"
- }
- }
- }
- },
- "/v1.0/activity-spec/{id}/versions/{versionId}" : {
- "get" : {
- "tags" : [ "Activity Specs" ],
- "summary" : "Get Activity Spec",
- "description" : "",
- "operationId" : "getActivitySpec",
- "consumes" : [ "application/json" ],
- "produces" : [ "application/json" ],
- "parameters" : [ {
- "name" : "id",
- "in" : "path",
- "description" : "Activity Spec Id",
- "required" : true,
- "type" : "string"
- }, {
- "name" : "versionId",
- "in" : "path",
- "description" : "Version Id",
- "required" : true,
- "type" : "string"
- }, {
- "name" : "USER_ID",
- "in" : "header",
- "required" : false,
- "type" : "string",
- "default" : ""
- } ],
- "responses" : {
- "default" : {
- "description" : "successful operation"
- }
- }
- },
- "put" : {
- "tags" : [ "Activity Specs" ],
- "summary" : "Update Activity Spec",
- "description" : "",
- "operationId" : "updateActivitySpec",
- "consumes" : [ "application/json" ],
- "produces" : [ "application/json" ],
- "parameters" : [ {
- "in" : "body",
- "name" : "body",
- "required" : false,
- "schema" : {
- "$ref" : "#/definitions/ActivitySpecRequest"
- }
- }, {
- "name" : "id",
- "in" : "path",
- "description" : "Activity Spec Id",
- "required" : true,
- "type" : "string"
- }, {
- "name" : "versionId",
- "in" : "path",
- "description" : "Version Id",
- "required" : true,
- "type" : "string"
- }, {
- "name" : "USER_ID",
- "in" : "header",
- "required" : false,
- "type" : "string",
- "default" : ""
- } ],
- "responses" : {
- "default" : {
- "description" : "successful operation"
- }
- }
- }
- },
- "/v1.0/activity-spec/{id}/versions/{versionId}/actions" : {
- "put" : {
- "tags" : [ "Activity Specs" ],
- "summary" : "Actions on a activity spec",
- "description" : "Performs one of the following actions on a activity spec: |Submit: Finalize its active version.|Deprecate: Deprecate activity spec.|",
- "operationId" : "actOnActivitySpec",
- "consumes" : [ "application/json" ],
- "produces" : [ "application/json" ],
- "parameters" : [ {
- "in" : "body",
- "name" : "body",
- "required" : false,
- "schema" : {
- "$ref" : "#/definitions/ActivitySpecActionRequestDto"
- }
- }, {
- "name" : "id",
- "in" : "path",
- "description" : "Activity Spec Id",
- "required" : true,
- "type" : "string"
- }, {
- "name" : "versionId",
- "in" : "path",
- "description" : "Version Id",
- "required" : true,
- "type" : "string"
- }, {
- "name" : "USER_ID",
- "in" : "header",
- "required" : false,
- "type" : "string",
- "default" : ""
- } ],
- "responses" : {
- "default" : {
- "description" : "successful operation"
- }
- }
- }
- }
- },
- "definitions" : {
- "ActivitySpecActionRequestDto" : {
- "type" : "object",
- "properties" : {
- "action" : {
- "type" : "string",
- "enum" : [ "Certify", "Deprecate", "Delete" ]
- }
- }
- },
- "ActivitySpecParameterDto" : {
- "type" : "object",
- "properties" : {
- "name" : {
- "type" : "string"
- },
- "type" : {
- "type" : "string"
- },
- "value" : {
- "type" : "string"
- }
- }
- },
- "ActivitySpecRequest" : {
- "type" : "object",
- "properties" : {
- "name" : {
- "type" : "string"
- },
- "description" : {
- "type" : "string"
- },
- "categoryList" : {
- "type" : "array",
- "items" : {
- "type" : "string"
- }
- },
- "inputParameters" : {
- "type" : "array",
- "items" : {
- "$ref" : "#/definitions/ActivitySpecParameterDto"
- }
- },
- "outputParameters" : {
- "type" : "array",
- "items" : {
- "$ref" : "#/definitions/ActivitySpecParameterDto"
- }
- }
- }
- }
- }
-}
\ No newline at end of file
Code Review / sdc.git / commitdiff