diff options
Diffstat (limited to 'bpmn/so-bpmn-building-blocks/src/main')
2 files changed, 96 insertions, 101 deletions
diff --git a/bpmn/so-bpmn-building-blocks/src/main/java/org/onap/so/bpmn/infrastructure/bpmn/activity/DeployActivitySpecs.java b/bpmn/so-bpmn-building-blocks/src/main/java/org/onap/so/bpmn/infrastructure/bpmn/activity/DeployActivitySpecs.java index db1f7cb6f9..e4f1998c40 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/java/org/onap/so/bpmn/infrastructure/bpmn/activity/DeployActivitySpecs.java +++ b/bpmn/so-bpmn-building-blocks/src/main/java/org/onap/so/bpmn/infrastructure/bpmn/activity/DeployActivitySpecs.java @@ -23,9 +23,7 @@ package org.onap.so.bpmn.infrastructure.bpmn.activity; import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; - import javax.ws.rs.core.UriBuilder; - import org.apache.http.HttpResponse; import org.apache.http.StatusLine; import org.apache.http.client.HttpClient; @@ -36,68 +34,65 @@ import org.springframework.stereotype.Component; @Component public class DeployActivitySpecs { - private static final String ACTIVITY_FILE_LOCATION = "src/main/resources/ActivitySpec/"; - private static final String ACTIVITY_SPEC_URI = "/activityspec-api/v1.0/activity-spec"; - private static final String CONTENT_TYPE_JSON = "application/json"; - - public static void main(String[] args) throws Exception { - - if (args == null || args.length == 0) { - System.out.println("Please specify hostname argument"); - return; - } - - String hostname = args[0]; - - File dir = new File(ACTIVITY_FILE_LOCATION); - if (!dir.isDirectory()) { - System.out.println("ActivitySpec store is not a directory"); - return; - } - - for (File f : dir.listFiles()) { - String activitySpecName = f.getName(); - String errorMessage = deployActivitySpec(hostname, activitySpecName); - if (errorMessage == null) { - System.out.println("Deployed Activity Spec: " + activitySpecName); - } - else { - System.out.println("Error deploying Activity Spec: " + activitySpecName + " : " + errorMessage); - } - } - return; - } - - protected static String deployActivitySpec(String hostname, String activitySpecName) throws Exception { - String payload = new String(Files.readAllBytes(Paths.get(ACTIVITY_FILE_LOCATION + activitySpecName))); - try { - HttpClient client = HttpClientBuilder.create().build(); - - String url = UriBuilder.fromUri(hostname).path(ACTIVITY_SPEC_URI).build().toString(); - HttpPost post = new HttpPost(url); - - StringEntity input = new StringEntity(payload); - input.setContentType(CONTENT_TYPE_JSON); - post.setEntity(input); - - HttpResponse response = client.execute(post); - StatusLine statusLine = response.getStatusLine(); - - if (statusLine != null) { - if (statusLine.getStatusCode() != 200) { - return (statusLine.toString()); - } - else { - return null; - } - } - else { - return("Empty response from the remote endpoint"); - } - - } catch (Exception e) { - return e.getMessage(); - } - - } + private static final String ACTIVITY_FILE_LOCATION = "src/main/resources/ActivitySpec/"; + private static final String ACTIVITY_SPEC_URI = "/activityspec-api/v1.0/activity-spec"; + private static final String CONTENT_TYPE_JSON = "application/json"; + + public static void main(String[] args) throws Exception { + + if (args == null || args.length == 0) { + System.out.println("Please specify hostname argument"); + return; + } + + String hostname = args[0]; + + File dir = new File(ACTIVITY_FILE_LOCATION); + if (!dir.isDirectory()) { + System.out.println("ActivitySpec store is not a directory"); + return; + } + + for (File f : dir.listFiles()) { + String activitySpecName = f.getName(); + String errorMessage = deployActivitySpec(hostname, activitySpecName); + if (errorMessage == null) { + System.out.println("Deployed Activity Spec: " + activitySpecName); + } else { + System.out.println("Error deploying Activity Spec: " + activitySpecName + " : " + errorMessage); + } + } + return; + } + + protected static String deployActivitySpec(String hostname, String activitySpecName) throws Exception { + String payload = new String(Files.readAllBytes(Paths.get(ACTIVITY_FILE_LOCATION + activitySpecName))); + try { + HttpClient client = HttpClientBuilder.create().build(); + + String url = UriBuilder.fromUri(hostname).path(ACTIVITY_SPEC_URI).build().toString(); + HttpPost post = new HttpPost(url); + + StringEntity input = new StringEntity(payload); + input.setContentType(CONTENT_TYPE_JSON); + post.setEntity(input); + + HttpResponse response = client.execute(post); + StatusLine statusLine = response.getStatusLine(); + + if (statusLine != null) { + if (statusLine.getStatusCode() != 200) { + return (statusLine.toString()); + } else { + return null; + } + } else { + return ("Empty response from the remote endpoint"); + } + + } catch (Exception e) { + return e.getMessage(); + } + + } } diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/SDNCHandler.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/SDNCHandler.bpmn index 0be7c55596..7339b23802 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/SDNCHandler.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/SDNCHandler.bpmn @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.8.2"> +<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="2.0.3"> <bpmn:process id="SDNCHandler" name="SDNC" isExecutable="true"> <bpmn:startEvent id="SDNC_Start"> <bpmn:outgoing>SequenceFlow_1n0j3hz</bpmn:outgoing> @@ -38,7 +38,7 @@ <bpmn:boundaryEvent id="BoundaryEvent_1quvxva" name="Timeout" attachedToRef="SubProcess_0y8yozw"> <bpmn:outgoing>SequenceFlow_1yifu46</bpmn:outgoing> <bpmn:timerEventDefinition> - <bpmn:timeDuration xsi:type="bpmn:tFormalExpression"><![CDATA[${execution.getVariable("sdncTimeout")}]]></bpmn:timeDuration> + <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">${execution.getVariable("sdncTimeout")}</bpmn:timeDuration> </bpmn:timerEventDefinition> </bpmn:boundaryEvent> <bpmn:sequenceFlow id="SequenceFlow_1ecej8g" sourceRef="SubProcess_0y8yozw" targetRef="ExclusiveGateway_09ehhaf" /> @@ -48,7 +48,7 @@ <bpmn:outgoing>SequenceFlow_0i4u8g4</bpmn:outgoing> </bpmn:exclusiveGateway> <bpmn:sequenceFlow id="SequenceFlow_0rh24pq" name="Final Ack = N" sourceRef="ExclusiveGateway_09ehhaf" targetRef="SubProcess_0y8yozw"> - <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[${execution.getVariable("isCallbackCompleted")}]]></bpmn:conditionExpression> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${execution.getVariable("isCallbackCompleted") == false}</bpmn:conditionExpression> </bpmn:sequenceFlow> <bpmn:sequenceFlow id="SequenceFlow_1yifu46" sourceRef="BoundaryEvent_1quvxva" targetRef="Task_1un0flc" /> <bpmn:sequenceFlow id="SequenceFlow_1n0j3hz" sourceRef="SDNC_Start" targetRef="SNDC_SetupCallback" /> @@ -62,7 +62,7 @@ <bpmn:sequenceFlow id="SequenceFlow_0flbj8a" sourceRef="SNDC_SetupCallback" targetRef="Call_SDNC" /> <bpmn:sequenceFlow id="SequenceFlow_0i4u8g4" name="Final Ack = Y" sourceRef="ExclusiveGateway_09ehhaf" targetRef="SDNC_End" /> <bpmn:sequenceFlow id="SequenceFlow_0puiqga" name="Final Ack = Y" sourceRef="isAsync_Gateway" targetRef="SDNC_End"> - <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[${execution.getVariable("isSDNCCompleted")}]]></bpmn:conditionExpression> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${execution.getVariable("isSDNCCompleted")}</bpmn:conditionExpression> </bpmn:sequenceFlow> <bpmn:serviceTask id="SNDC_SetupCallback" name="Setup Callback Variables" camunda:expression="${SDNCRequestTasks.createCorrelationVariables(execution)}"> <bpmn:incoming>SequenceFlow_1n0j3hz</bpmn:incoming> @@ -72,7 +72,7 @@ <bpmn:incoming>SequenceFlow_1yifu46</bpmn:incoming> </bpmn:serviceTask> </bpmn:process> - <bpmn:message id="Message_06oc4iz" name="SDNCCallbackMessage" /> + <bpmn:message id="Message_06oc4iz" name="WorkflowMessage" /> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="SDNCHandler"> <bpmndi:BPMNShape id="StartEvent_0kxwniy_di" bpmnElement="SDNC_Start"> @@ -118,23 +118,23 @@ </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1qxm8ot_di" bpmnElement="SequenceFlow_1qxm8ot"> - <di:waypoint xsi:type="dc:Point" x="347" y="-72" /> - <di:waypoint xsi:type="dc:Point" x="376" y="-72" /> + <di:waypoint x="347" y="-72" /> + <di:waypoint x="376" y="-72" /> <bpmndi:BPMNLabel> <dc:Bounds x="316.5" y="-93.5" width="90" height="13" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_05eggbt_di" bpmnElement="SequenceFlow_05eggbt"> - <di:waypoint xsi:type="dc:Point" x="412" y="-72" /> - <di:waypoint xsi:type="dc:Point" x="438" y="-72" /> + <di:waypoint x="412" y="-72" /> + <di:waypoint x="438" y="-72" /> <bpmndi:BPMNLabel> <dc:Bounds x="380" y="-93.5" width="90" height="13" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1ecej8g_di" bpmnElement="SequenceFlow_1ecej8g"> - <di:waypoint xsi:type="dc:Point" x="618" y="-67" /> - <di:waypoint xsi:type="dc:Point" x="798" y="-67" /> - <di:waypoint xsi:type="dc:Point" x="798" y="28" /> + <di:waypoint x="618" y="-67" /> + <di:waypoint x="798" y="-67" /> + <di:waypoint x="798" y="28" /> <bpmndi:BPMNLabel> <dc:Bounds x="663" y="-88.5" width="90" height="13" /> </bpmndi:BPMNLabel> @@ -146,23 +146,23 @@ </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0rh24pq_di" bpmnElement="SequenceFlow_0rh24pq"> - <di:waypoint xsi:type="dc:Point" x="773" y="53" /> - <di:waypoint xsi:type="dc:Point" x="449" y="53" /> - <di:waypoint xsi:type="dc:Point" x="449" y="9" /> + <di:waypoint x="773" y="53" /> + <di:waypoint x="449" y="53" /> + <di:waypoint x="449" y="9" /> <bpmndi:BPMNLabel> <dc:Bounds x="579.9877300613497" y="32" width="66" height="13" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1yifu46_di" bpmnElement="SequenceFlow_1yifu46"> - <di:waypoint xsi:type="dc:Point" x="636" y="-144" /> - <di:waypoint xsi:type="dc:Point" x="748" y="-145" /> + <di:waypoint x="636" y="-144" /> + <di:waypoint x="748" y="-145" /> <bpmndi:BPMNLabel> <dc:Bounds x="647" y="-166" width="90" height="13" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1n0j3hz_di" bpmnElement="SequenceFlow_1n0j3hz"> - <di:waypoint xsi:type="dc:Point" x="-231" y="152" /> - <di:waypoint xsi:type="dc:Point" x="-171" y="152" /> + <di:waypoint x="-231" y="152" /> + <di:waypoint x="-171" y="152" /> <bpmndi:BPMNLabel> <dc:Bounds x="-201" y="130.5" width="0" height="13" /> </bpmndi:BPMNLabel> @@ -174,47 +174,47 @@ </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0yve6l6_di" bpmnElement="SequenceFlow_0yve6l6"> - <di:waypoint xsi:type="dc:Point" x="253" y="127" /> - <di:waypoint xsi:type="dc:Point" x="253" y="92" /> - <di:waypoint xsi:type="dc:Point" x="253" y="92" /> - <di:waypoint xsi:type="dc:Point" x="253" y="-67" /> - <di:waypoint xsi:type="dc:Point" x="278" y="-67" /> + <di:waypoint x="253" y="127" /> + <di:waypoint x="253" y="92" /> + <di:waypoint x="253" y="92" /> + <di:waypoint x="253" y="-67" /> + <di:waypoint x="278" y="-67" /> <bpmndi:BPMNLabel> <dc:Bounds x="263" y="57" width="65" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_07vnhri_di" bpmnElement="SequenceFlow_07vnhri"> - <di:waypoint xsi:type="dc:Point" x="115" y="152" /> - <di:waypoint xsi:type="dc:Point" x="228" y="152" /> + <di:waypoint x="115" y="152" /> + <di:waypoint x="228" y="152" /> <bpmndi:BPMNLabel> <dc:Bounds x="171.5" y="130" width="0" height="13" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0flbj8a_di" bpmnElement="SequenceFlow_0flbj8a"> - <di:waypoint xsi:type="dc:Point" x="-71" y="152" /> - <di:waypoint xsi:type="dc:Point" x="15" y="152" /> + <di:waypoint x="-71" y="152" /> + <di:waypoint x="15" y="152" /> <bpmndi:BPMNLabel> <dc:Bounds x="-28" y="130.5" width="0" height="13" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0i4u8g4_di" bpmnElement="SequenceFlow_0i4u8g4"> - <di:waypoint xsi:type="dc:Point" x="798" y="78" /> - <di:waypoint xsi:type="dc:Point" x="798" y="174" /> + <di:waypoint x="798" y="78" /> + <di:waypoint x="798" y="174" /> <bpmndi:BPMNLabel> <dc:Bounds x="809" y="119" width="66" height="13" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0puiqga_di" bpmnElement="SequenceFlow_0puiqga"> - <di:waypoint xsi:type="dc:Point" x="253" y="177" /> - <di:waypoint xsi:type="dc:Point" x="253" y="192" /> - <di:waypoint xsi:type="dc:Point" x="780" y="192" /> + <di:waypoint x="253" y="177" /> + <di:waypoint x="253" y="192" /> + <di:waypoint x="780" y="192" /> <bpmndi:BPMNLabel> <dc:Bounds x="310" y="161" width="66" height="13" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0oh3ye4_di" bpmnElement="SequenceFlow_0oh3ye4"> - <di:waypoint xsi:type="dc:Point" x="538" y="-72" /> - <di:waypoint xsi:type="dc:Point" x="562" y="-72" /> + <di:waypoint x="538" y="-72" /> + <di:waypoint x="562" y="-72" /> <bpmndi:BPMNLabel> <dc:Bounds x="550" y="-93.5" width="0" height="13" /> </bpmndi:BPMNLabel> |