*/
package org.onap.sdc.workflowdesigner.common;
-public class WorkflowDesignerException extends Exception {
+public class SDCProxyException extends Exception {
private static final long serialVersionUID = 1L;
- public WorkflowDesignerException() {
+ public SDCProxyException() {
super();
}
- public WorkflowDesignerException(String msg, Exception e) {
+ public SDCProxyException(String msg, Exception e) {
super(msg, e);
}
- public WorkflowDesignerException(String msg) {
+ public SDCProxyException(String msg) {
super(msg);
}
}
package org.onap.sdc.workflowdesigner.externalservice.sdc;
import org.glassfish.jersey.client.ClientConfig;
-import org.onap.sdc.workflowdesigner.common.WorkflowDesignerException;
+import org.onap.sdc.workflowdesigner.common.SDCProxyException;
import org.onap.sdc.workflowdesigner.config.AppConfig;
import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.ActivitySpec;
import org.slf4j.Logger;
private static final String X_ECOMP_INSTANCE_ID =
AppConfig.getSdcServiceProxy().getxEcompInstanceId();
/** */
- private static final String Activity_ROOT_PATH = "/activityspec-api/v1.0";
+ private static final String ACTIVITY_ROOT_PATH = "/activityspec-api/v1.0";
private static String getActivityRootPath() {
- return AppConfig.getSdcServiceProxy().getServiceAddr() + Activity_ROOT_PATH;
+ return AppConfig.getSdcServiceProxy().getServiceAddr() + ACTIVITY_ROOT_PATH;
}
/**
/**
*
* @return
- * @throws WorkflowDesignerException
+ * @throws SDCProxyException
*/
- public ActivitySpec[] getActivitySpecs() throws WorkflowDesignerException {
+ public ActivitySpec[] getActivitySpecs() throws SDCProxyException {
ActivitySpecService serviceProxy = getActivityServiceProxy();
try {
return serviceProxy.getActivitySpecs(X_ECOMP_INSTANCE_ID, AUTHORIZATION);
} catch (Exception e) {
LOGGER.error("Get Activity Specifications Failed.", e);
- throw new WorkflowDesignerException("Get Activity Specifications Failed.", e);
+ throw new SDCProxyException("Get Activity Specifications Failed.", e);
}
}
package org.onap.sdc.workflowdesigner.externalservice.sdc;
import org.glassfish.jersey.client.ClientConfig;
-import org.onap.sdc.workflowdesigner.common.WorkflowDesignerException;
+import org.onap.sdc.workflowdesigner.common.SDCProxyException;
import org.onap.sdc.workflowdesigner.config.AppConfig;
import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.WorkflowArtifactInfo;
import org.slf4j.Logger;
* @param operationId
* @param workflowId
* @param workflowArtifactInfo
- * @throws WorkflowDesignerException
+ * @throws SDCProxyException
*/
public void saveWorkflowArtifact(String uuid, String operationId, String workflowId,
- WorkflowArtifactInfo workflowArtifactInfo) throws WorkflowDesignerException {
+ WorkflowArtifactInfo workflowArtifactInfo) throws SDCProxyException {
SDCService serviceProxy = getSDCServiceProxy();
try {
serviceProxy.saveWorkflowArtifact(uuid, operationId, workflowId, X_ECOMP_INSTANCE_ID,
AUTHORIZATION, workflowArtifactInfo);
} catch (Exception e) {
LOGGER.error("Save WorkflowArtifact Failed.", e);
- throw new WorkflowDesignerException("Save WorkflowArtifact Failed.", e);
+ throw new SDCProxyException("Save WorkflowArtifact Failed.", e);
}
}
* @param operationId
* @param workflowId
* @return
- * @throws WorkflowDesignerException
+ * @throws SDCProxyException
*/
public WorkflowArtifactInfo getWorkflowArtifact(String uuid, String operationId,
- String workflowId) throws WorkflowDesignerException {
+ String workflowId) throws SDCProxyException {
SDCService serviceProxy = getSDCServiceProxy();
try {
return serviceProxy.getWorkflowArtifact(uuid, operationId, workflowId, X_ECOMP_INSTANCE_ID,
AUTHORIZATION);
} catch (Exception e) {
LOGGER.error("Get WorkflowArtifact Failed.", e);
- throw new WorkflowDesignerException("Get WorkflowArtifact Failed.", e);
+ throw new SDCProxyException("Get WorkflowArtifact Failed.", e);
}
}
package org.onap.sdc.workflowdesigner.resources;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.core.Response;
import org.eclipse.jetty.http.HttpStatus;
+import org.onap.sdc.workflowdesigner.common.SDCProxyException;
+import org.onap.sdc.workflowdesigner.config.AppConfig;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.ActivitySpecServiceProxy;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.ActivitySpec;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.Parameter;
import org.onap.sdc.workflowdesigner.resources.entity.ExtActivityDisplayInfo;
-import org.onap.sdc.workflowdesigner.resources.entity.ExtendActivity;
+import org.onap.sdc.workflowdesigner.resources.entity.I18nString;
+import org.onap.sdc.workflowdesigner.resources.entity.InputOutput;
+import org.onap.sdc.workflowdesigner.resources.entity.NodeCategory;
+import org.onap.sdc.workflowdesigner.resources.entity.CategoryData;
+import org.onap.sdc.workflowdesigner.resources.entity.Content;
+import org.onap.sdc.workflowdesigner.resources.entity.ExtActivity;
import org.onap.sdc.workflowdesigner.utils.FileCommonUtils;
import org.onap.sdc.workflowdesigner.utils.JsonUtils;
import org.onap.sdc.workflowdesigner.utils.RestUtils;
private static final String EXT_ACTIVITIES_FILE_NAME = "ext-activities.json";
+ private static final CategoryData EXTENSION_TASK_CATEGORY =
+ new CategoryData(new I18nString("Extension Task", "Extension Task"));
+
+ private static final String EXTENSION_TASK_CATEGORY_CATEGORY_ID = "extension_task_category_id";
+
/**
* test function.
*
@GET
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Get Extend Activities.", response = ExtendActivity.class,
+ @ApiOperation(value = "Get Extend Activities.", response = ExtActivity.class,
responseContainer = "List")
@ApiResponses(value = {
@ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
response = String.class)})
@Timed
public Response getExtActivities(@ApiParam(value = "sence") @QueryParam("sence") String sence) {
+ if (AppConfig.isSDCAdapter()) {
+ return getExtActivitiesfromSDC();
+ } else {
+ return getExtActivitiesfromLocal();
+ }
+ }
+ /**
+ * @return
+ */
+ private Response getExtActivitiesfromLocal() {
try {
- ExtendActivity[] extActivities = retriveExtActivites(sence);
+ String json = FileCommonUtils.readString(EXT_ACTIVITIES_FILE_NAME);
+ ExtActivity[] extActivities = JsonUtils.fromJson(json, ExtActivity[].class);
return Response.status(Response.Status.OK).entity(extActivities).build();
} catch (IOException e) {
- LOGGER.error("Get ExtActivities failed.", e);
+ LOGGER.error("Get ExtActivities from local failed.", e);
throw RestUtils.newInternalServerErrorException(e);
}
+ }
+ /**
+ * @return
+ */
+ private Response getExtActivitiesfromSDC() {
+ try {
+ ActivitySpecServiceProxy proxy = new ActivitySpecServiceProxy();
+ ActivitySpec[] activitySpecs = proxy.getActivitySpecs();
+ ExtActivity[] extActivities = convert2ExtActivities(activitySpecs);
+ return Response.status(Response.Status.OK).entity(extActivities).build();
+ } catch (SDCProxyException e) {
+ LOGGER.error("Get ExtActivities from sdc failed.", e);
+ throw RestUtils.newInternalServerErrorException(e);
+ }
}
/**
- * @param sence
+ * @param activitySpecs
+ * @return
+ */
+ private ExtActivity[] convert2ExtActivities(ActivitySpec[] activitySpecs) {
+ ExtActivity[] extendActivities = new ExtActivity[activitySpecs.length];
+ for (int i = 0; i < activitySpecs.length; i++) {
+ extendActivities[i] = convert2ExtActivity(activitySpecs[i]);
+ }
+ return extendActivities;
+ }
+
+ /**
+ * @param activitySpec
+ * @return
+ */
+ private ExtActivity convert2ExtActivity(ActivitySpec activitySpec) {
+ ExtActivity extActivity = new ExtActivity();
+ extActivity.setId(activitySpec.getId());
+ extActivity.setDisplayName(new I18nString(activitySpec.getName(), activitySpec.getName()));
+ extActivity.setDescription(
+ new I18nString(activitySpec.getDescription(), activitySpec.getDescription()));
+ extActivity.setType(activitySpec.getType());
+ extActivity.setContent(buildContent(activitySpec));
+ return extActivity;
+ }
+
+ /**
+ * @param activitySpec
+ * @return
+ */
+ private Content buildContent(ActivitySpec activitySpec) {
+ Content content = new Content();
+ content.setClass(activitySpec.getContent().getClazz());
+ content.setScript(activitySpec.getContent().getScript());
+ content.setScriptFormat(activitySpec.getContent().getScriptFormat());
+ content.setInputs(convert2InputOutputs(activitySpec.getInputs()));
+ content.setOutputs(convert2InputOutputs(activitySpec.getOutputs()));
+ return content;
+ }
+
+ /**
+ * @param parameters
+ * @return
+ */
+ private Map<String, InputOutput> convert2InputOutputs(Parameter[] parameters) {
+ Map<String, InputOutput> inputOutputs = new HashMap<>();
+ for (Parameter parameter : parameters) {
+ inputOutputs.put(parameter.getName(), convert2InputOutput(parameter));
+ }
+ return inputOutputs;
+ }
+
+ /**
+ * @param parameter
* @return
- * @throws IOException
*/
- protected ExtendActivity[] retriveExtActivites(String sence) throws IOException {
- String json = FileCommonUtils.readString(EXT_ACTIVITIES_FILE_NAME);
- return JsonUtils.fromJson(json, ExtendActivity[].class);
+ private InputOutput convert2InputOutput(Parameter parameter) {
+ InputOutput inputOutput = new InputOutput();
+ inputOutput.setDisplayName(new I18nString(parameter.getName(), parameter.getName()));
+ inputOutput.setType(parameter.getType());
+ inputOutput.setDefault(parameter.getDefault());
+ inputOutput.setValue(parameter.getValue());
+ return inputOutput;
}
response = String.class)})
@Timed
public Response getDisplayInfo(@ApiParam(value = "sence") @QueryParam("sence") String sence) {
+ if (AppConfig.isSDCAdapter()) {
+ return getDisplayInfofromSDC();
+ } else {
+ return getDisplayInfofromLocal(sence);
+ }
+ }
+
+ /**
+ * @param sence
+ * @return
+ */
+ private Response getDisplayInfofromLocal(String sence) {
try {
ExtActivityDisplayInfo displayInfo = retriveDisplayInfo(sence);
return Response.status(Response.Status.OK).entity(displayInfo).build();
} catch (IOException e) {
- LOGGER.error("Get Extend Activities DisplayInfo failed.", e);
+ LOGGER.error("Get Extend Activities DisplayInfo from failed.", e);
throw RestUtils.newInternalServerErrorException(e);
}
}
+ /**
+ * @return
+ */
+ private Response getDisplayInfofromSDC() {
+ try {
+ ActivitySpecServiceProxy proxy = new ActivitySpecServiceProxy();
+ ActivitySpec[] activitySpecs = proxy.getActivitySpecs();
+ ExtActivityDisplayInfo displayInfo = convert2ExtActivityDisplayInfo(activitySpecs);
+ return Response.status(Response.Status.OK).entity(displayInfo).build();
+ } catch (SDCProxyException e) {
+ LOGGER.error("Get Extend Activities DisplayInfo from sdc failed.", e);
+ throw RestUtils.newInternalServerErrorException(e);
+ }
+ }
+
+ /**
+ * @param activitySpecs
+ * @return
+ */
+ private ExtActivityDisplayInfo convert2ExtActivityDisplayInfo(ActivitySpec[] activitySpecs) {
+ ExtActivityDisplayInfo displayInfo = new ExtActivityDisplayInfo();
+
+ for (ActivitySpec activitySpec : activitySpecs) {
+ displayInfo.getNodes().put(activitySpec.getId(), buildNodeCategory(activitySpec));
+ }
+
+ displayInfo.getCategoryData().put(EXTENSION_TASK_CATEGORY_CATEGORY_ID, EXTENSION_TASK_CATEGORY);
+
+ return displayInfo;
+ }
+
+ /**
+ * @param activitySpec
+ * @return
+ */
+ private NodeCategory buildNodeCategory(ActivitySpec activitySpec) {
+ NodeCategory nodeCategory = new NodeCategory();
+ nodeCategory.setCategory(EXTENSION_TASK_CATEGORY_CATEGORY_ID);
+
+ return nodeCategory;
+ }
+
/**
* @param sence
* @return
import java.io.IOException;
import java.net.URI;
-//import java.nio.file.Paths;
+import java.nio.file.Paths;
import java.util.List;
-//import java.util.UUID;
+import java.util.UUID;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.eclipse.jetty.http.HttpStatus;
-//import org.onap.sdc.workflowdesigner.common.WorkflowDesignerException;
-//import org.onap.sdc.workflowdesigner.externalservice.sdc.SDCServiceProxy;
-//import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.WorkflowArtifactInfo;
+import org.onap.sdc.workflowdesigner.common.SDCProxyException;
+import org.onap.sdc.workflowdesigner.config.AppConfig;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.SDCServiceProxy;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.WorkflowArtifactInfo;
import org.onap.sdc.workflowdesigner.model.Process;
import org.onap.sdc.workflowdesigner.parser.Bpmn4ToscaJsonParser;
-//import org.onap.sdc.workflowdesigner.resources.entity.WorkflowInfo;
+import org.onap.sdc.workflowdesigner.resources.entity.WorkflowInfo;
import org.onap.sdc.workflowdesigner.utils.FileCommonUtils;
-//import org.onap.sdc.workflowdesigner.utils.JsonUtils;
+import org.onap.sdc.workflowdesigner.utils.JsonUtils;
import org.onap.sdc.workflowdesigner.utils.RestUtils;
+import org.onap.sdc.workflowdesigner.utils.ToolUtils;
import org.onap.sdc.workflowdesigner.writer.BpmnPlanArtefactWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static final Logger logger = LoggerFactory.getLogger(WorkflowModelerResource.class);
private static final String WORKFLOW_JSON_TEMP_FILE_NAME = "temp_workflow.json";
-// private static final String WORKFLOW_XML_TEMP_FILE_NAME = "temp_workflow.xml";
+ private static final String WORKFLOW_XML_TEMP_FILE_NAME = "temp_workflow.xml";
/**
@GET
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Get Model", response = String.class)
+ @ApiOperation(value = "Get Model", response = WorkflowInfo.class)
@ApiResponses(value = {
@ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
response = String.class),
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
response = String.class)})
@Timed
- public Response getModel(@ApiParam(value = "id") @PathParam("id") String id) {
+ public Response getModel(@ApiParam(value = "id") @PathParam("id") String id,
+ @ApiParam(value = "name") @QueryParam("name") String name,
+ @ApiParam(value = "uuid") @QueryParam("uuid") String uuid,
+ @ApiParam(value = "operationId") @QueryParam("operationId") String operationId) {
+ if (AppConfig.isSDCAdapter()) {
+ return getModelfromSDC(uuid, operationId, id, name);
+ } else {
+ return getModelfromLocal();
+ }
+
+ }
+
+ /**
+ * @return
+ */
+ private Response getModelfromLocal() {
try {
String json = FileCommonUtils.readString(WORKFLOW_JSON_TEMP_FILE_NAME);
return Response.status(Response.Status.OK).entity(json).build();
} catch (IOException e) {
- logger.error("get workflow failed.", e);
+ logger.error("get workflow from local failed.", e);
throw RestUtils.newInternalServerErrorException(e);
}
}
+ /**
+ * @param uuid
+ * @param operationId
+ * @param id
+ * @param name
+ * @return
+ */
+ private Response getModelfromSDC(String uuid, String operationId, String id, String name) {
+ try {
+ SDCServiceProxy sdcProxy = new SDCServiceProxy();
+ WorkflowArtifactInfo wai = sdcProxy.getWorkflowArtifact(uuid, operationId, id);
+ String bpmn = wai.getPayloadData();
+ String json = readJsonfromBPMN(bpmn);
+ if (ToolUtils.isEmpty(json)) {
+ WorkflowInfo wfi = newEmptyWorkflowInfo(uuid, operationId, id, name);
+ return Response.status(Response.Status.OK).entity(wfi).build();
+ }
+ return Response.status(Response.Status.OK).entity(json).build();
+ } catch (SDCProxyException e) {
+ logger.error("get workflow from sdc failed.", e);
+ throw RestUtils.newInternalServerErrorException(e);
+ } catch (DocumentException e) {
+ logger.error("get workflow from sdc failed.", e);
+ throw RestUtils.newInternalServerErrorException(e);
+ }
+ }
+
+ /**
+ * @param id
+ * @param operationId
+ * @param uuid
+ * @param name
+ * @return
+ */
+ private WorkflowInfo newEmptyWorkflowInfo(String uuid, String operationId, String id,
+ String name) {
+ WorkflowInfo wfi = new WorkflowInfo();
+ wfi.setId(id);
+ wfi.setName(name);
+ wfi.setUuid(uuid);
+ wfi.setOperationId(operationId);
+
+ return wfi;
+ }
+
+
@Path("/{id}")
@PUT
@ApiParam(value = "Model Content", required = true) String json) {
try {
FileCommonUtils.write(WORKFLOW_JSON_TEMP_FILE_NAME, json);
-
- // TODO for Nexus-IQ
-// URI srcUri = Paths.get(".", WORKFLOW_JSON_TEMP_FILE_NAME).toUri();
-// String processName = "plan_" + UUID.randomUUID().toString();
-// String bpmn = buildBPMN(srcUri, processName);
-// String jsonBpmn = insertJson2Bpmn(json, bpmn);
-// save2SDC(json, jsonBpmn);
-// FileCommonUtils.write(WORKFLOW_XML_TEMP_FILE_NAME, jsonBpmn);
+ URI srcUri = Paths.get(".", WORKFLOW_JSON_TEMP_FILE_NAME).toUri();
+ String processName = "plan_" + UUID.randomUUID().toString();
+ String bpmn = buildBPMN(srcUri, processName);
+ String jsonBpmn = insertJson2Bpmn(json, bpmn);
+
+ if (AppConfig.isSDCAdapter()) {
+ save2SDC(json, jsonBpmn);
+ }
+ FileCommonUtils.write(WORKFLOW_XML_TEMP_FILE_NAME, jsonBpmn);
return Response.status(Response.Status.OK).entity(json).build();
} catch (IOException e) {
* @return
* @throws DocumentException
*/
- protected String readJsonfromBPMNFile(String bpmn) throws DocumentException {
+ protected String readJsonfromBPMN(String bpmn) throws DocumentException {
+ if (ToolUtils.isEmpty(bpmn)) {
+ return null;
+ }
+
Document doc = DocumentHelper.parseText(bpmn);
List<?> elementList = doc.content();
for (Object object : elementList) {
}
-// /**
-// * @param json
-// * @param bpmn
-// * @throws WorkflowDesignerException
-// */
-// private void save2SDC(String json, String bpmn) throws WorkflowDesignerException {
-// WorkflowInfo workflowInfo = JsonUtils.fromJson(json, WorkflowInfo.class);
-// WorkflowArtifactInfo workflowArtifactInfo =
-// new WorkflowArtifactInfo(workflowInfo.getName(), workflowInfo.getDescription(), bpmn);
-//
-// SDCServiceProxy sdcProxy = new SDCServiceProxy();
-// sdcProxy.saveWorkflowArtifact(workflowInfo.getUuid(), workflowInfo.getOperationId(),
-// workflowInfo.getId(), workflowArtifactInfo);
-// }
+ /**
+ * @param json
+ * @param bpmn
+ * @throws SDCProxyException
+ */
+ private void save2SDC(String json, String bpmn) throws SDCProxyException {
+ WorkflowInfo workflowInfo = JsonUtils.fromJson(json, WorkflowInfo.class);
+ WorkflowArtifactInfo workflowArtifactInfo =
+ new WorkflowArtifactInfo(workflowInfo.getName(), workflowInfo.getDescription(), bpmn);
+
+ SDCServiceProxy sdcProxy = new SDCServiceProxy();
+ sdcProxy.saveWorkflowArtifact(workflowInfo.getUuid(), workflowInfo.getOperationId(),
+ workflowInfo.getId(), workflowArtifactInfo);
+ }
/**
*
/**\r
*\r
*/\r
-public class ExtendActivity {\r
+public class ExtActivity {\r
private String id;\r
\r
private I18nString displayName;\r
import org.junit.After;\r
import org.junit.Before;\r
import org.junit.Test;\r
-import org.onap.sdc.workflowdesigner.resources.entity.ExtendActivity;\r
+import org.onap.sdc.workflowdesigner.resources.entity.ExtActivity;\r
import org.onap.sdc.workflowdesigner.utils.FileCommonUtils;\r
import org.onap.sdc.workflowdesigner.utils.JsonUtils;\r
\r
public void tearDown() throws Exception {}\r
\r
/**\r
- * Test method for {@link org.onap.sdc.workflowdesigner.resources.ExtendActivityResource#retriveExtActivites(java.lang.String)}.\r
+ * \r
*/\r
@Test\r
public void testRetriveExtActivites() {\r
try {\r
String json = FileCommonUtils.readString(EXT_ACTIVITIES_FILE_NAME);\r
- ExtendActivity[] extActivities = JsonUtils.fromJson(json, ExtendActivity[].class);\r
+ ExtActivity[] extActivities = JsonUtils.fromJson(json, ExtActivity[].class);\r
\r
FileCommonUtils.write("test.json", JsonUtils.toJson(extActivities));\r
assertEquals(extActivities.length == 0, false);\r
public void tearDown() throws Exception {}\r
\r
/**\r
- * Test method for {@link org.onap.sdc.workflowdesigner.resources.WorkflowModelerResource#buildBPMN(java.net.URI, java.lang.String)}.\r
+ * Test method for\r
+ * {@link org.onap.sdc.workflowdesigner.resources.WorkflowModelerResource#buildBPMN(java.net.URI, java.lang.String)}.\r
*/\r
@Test\r
public void testBuildBPMN() {\r
} catch (IOException e) {\r
} catch (Exception e) {\r
}\r
-// return null;\r
- // TODO for Nexus-IQ\r
- return " ";\r
+\r
+ return null;\r
}\r
- \r
+\r
/**\r
- * Test method for {@link org.onap.sdc.workflowdesigner.resources.WorkflowModelerResource#insertJson2Bpmn(java.lang.String, java.lang.String)}.\r
+ * Test method for\r
+ * {@link org.onap.sdc.workflowdesigner.resources.WorkflowModelerResource#insertJson2Bpmn(java.lang.String, java.lang.String)}.\r
*/\r
@Test\r
public void testInsertJson2Bpmn() {\r
String bpmn = parseBpmnfromJsonFile();\r
- \r
+\r
try {\r
String json = FileCommonUtils.readString("src/main/assembly/" + WORKFLOW_JSON_TEMP_FILE_NAME);\r
WorkflowModelerResource resource = new WorkflowModelerResource();\r
String combineBpmn = resource.insertJson2Bpmn(json, bpmn);\r
\r
- String json1 = resource.readJsonfromBPMNFile(combineBpmn);\r
- \r
+ String json1 = resource.readJsonfromBPMN(combineBpmn);\r
+\r
assertEqualsJson(json, json1);\r
} catch (IOException e) {\r
} catch (DocumentException e) {\r
private void assertEqualsJson(String json, String json1) {\r
WorkflowInfo wi = JsonUtils.fromJson(json, WorkflowInfo.class);\r
WorkflowInfo wi1 = JsonUtils.fromJson(json1, WorkflowInfo.class);\r
- \r
+\r
String newJson = JsonUtils.toJson(wi);\r
String newJson1 = JsonUtils.toJson(wi1);\r
\r
assertEquals(newJson1, newJson);\r
- \r
+\r
}\r
\r
}\r
IconData icon = new IconData();\r
Content content = new Content();\r
\r
- ExtendActivity ea = new ExtendActivity();\r
+ ExtActivity ea = new ExtActivity();\r
ea.setContent(content);\r
ea.setDescription(description);\r
ea.setDisplayName(displayName);\r
Code Review / sdc / sdc-workflow-designer.git / commitdiff