diff options
8 files changed, 444 insertions, 145 deletions
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnParamTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnParamTest.java new file mode 100644 index 0000000000..166e3d78c1 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnParamTest.java @@ -0,0 +1,41 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ + +package org.openecomp.mso.bpmn.common.recipe; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class BpmnParamTest { + + BpmnParam bp=new BpmnParam(); + + @Test + public void test() { + bp.setValue("testdata"); + assertEquals(bp.getValue(),"testdata"); + } + @Test + public void testToString(){ + assert(bp.toString()!=null); + } + +} diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClientTest.java new file mode 100644 index 0000000000..89f538b085 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClientTest.java @@ -0,0 +1,33 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.openecomp.mso.bpmn.common.recipe; + +import static org.junit.Assert.*; +import org.junit.Test; + +public class BpmnRestClientTest { + + @Test + public void test() { + BpmnRestClient.getEncryptedPropValue("prop", "123", "456"); + BpmnRestClient.loadMsoProperties(); + assertEquals(true,BpmnRestClient.getNoPropertiesState()); + } +} diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java new file mode 100644 index 0000000000..fe1975faf9 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceInputTest.java @@ -0,0 +1,60 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.openecomp.mso.bpmn.common.recipe; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class ResourceInputTest { + + ResourceInput ri=new ResourceInput(); + @Test + public void test() { + ri.setResourceInstanceName("resourceInstanceName"); + ri.setResourceInstanceDes("resourceInstanceDes"); + ri.setGlobalSubscriberId("globalSubscriberId"); + ri.setServiceType("serviceType"); + ri.setServiceInstanceId("serviceId"); + ri.setOperationId("operationId"); + ri.setResourceInvariantUuid("resourceInvariantUuid"); + ri.setResourceUuid("resourceUuid"); + ri.setResourceCustomizationUuid("resourceCustomizationUuid"); + ri.setResourceInstancenUuid("resourceInstancenUuid"); + ri.setResourceParameters("resourceParameters"); + ri.setOperationType("operationType"); + assertEquals(ri.getResourceInstanceName(), "resourceInstanceName"); + assertEquals(ri.getResourceInstanceDes(), "resourceInstanceDes"); + assertEquals(ri.getGlobalSubscriberId(), "globalSubscriberId"); + assertEquals(ri.getServiceType(), "serviceType"); + assertEquals(ri.getServiceInstanceId(), "serviceId"); + assertEquals(ri.getOperationId(), "operationId"); + assertEquals(ri.getResourceInvariantUuid(), "resourceInvariantUuid"); + assertEquals(ri.getResourceUuid(), "resourceUuid"); + assertEquals(ri.getResourceCustomizationUuid(), "resourceCustomizationUuid"); + assertEquals(ri.getResourceInstancenUuid(), "resourceInstancenUuid"); + assertEquals(ri.getResourceParameters(), "resourceParameters"); + assertEquals(ri.getOperationType(), "operationType"); + } + @Test + public void testToString(){ + assert(ri.toString()!=null); + } +} diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequestTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequestTest.java new file mode 100644 index 0000000000..3b185bae22 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequestTest.java @@ -0,0 +1,51 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.openecomp.mso.bpmn.common.recipe; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class ResourceRecipeRequestTest { + + ResourceRecipeRequest rr=new ResourceRecipeRequest(); + BpmnParam bp=new BpmnParam(); + @Test + public void test() { + rr.setResourceInput(bp); + rr.setHost(bp); + rr.setRequestId(bp); + rr.setRequestAction(bp); + rr.setServiceInstanceId(bp); + rr.setServiceType(bp); + rr.setRecipeParams(bp); + assertEquals(rr.getResourceInput(),bp); + assertEquals(rr.getHost(),bp); + assertEquals(rr.getRequestId(),bp); + assertEquals(rr.getRequestAction(),bp); + assertEquals(rr.getServiceInstanceId(),bp); + assertEquals(rr.getServiceType(),bp); + assertEquals(rr.getRecipeParams(),bp); + } + @Test + public void testToString(){ + assert(rr.toString()!=null); + } +} diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/beans/SDNCRequestTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/beans/SDNCRequestTest.java new file mode 100644 index 0000000000..3fd433d017 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/sdnc/beans/SDNCRequestTest.java @@ -0,0 +1,53 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.openecomp.mso.client.sdnc.beans; + +import static org.junit.Assert.*; + + + +import org.junit.Test; +public class SDNCRequestTest { + private SDNCRequest sdncrequest = new SDNCRequest(); + SDNCSvcAction svcaction = SDNCSvcAction.ACTIVATE; + SDNCSvcOperation svcoperation = SDNCSvcOperation.VNF_TOPOLOGY_OPERATION; + @Test + public void testSDNCRequestTest() { + sdncrequest.setRequestId("requestId"); + sdncrequest.setSvcInstanceId("svcInstanceId"); + sdncrequest.setSvcAction(svcaction); + sdncrequest.setSvcOperation(svcoperation); + sdncrequest.setCallbackUrl("callbackUrl"); + sdncrequest.setMsoAction("msoAction"); + sdncrequest.setRequestData("requestData"); + assertEquals(sdncrequest.getRequestId(), "requestId"); + assertEquals(sdncrequest.getSvcInstanceId(), "svcInstanceId"); + assertEquals(sdncrequest.getSvcAction(), svcaction); + assertEquals(sdncrequest.getSvcOperation(), svcoperation); + assertEquals(sdncrequest.getCallbackUrl(), "callbackUrl"); + assertEquals(sdncrequest.getMsoAction(), "msoAction"); + assertEquals(sdncrequest.getRequestData(), "requestData"); + } + @Test + public void testToString(){ + assert(sdncrequest.toString()!=null); + } + +} diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy index 2891855e8f..1e70f95bd3 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy @@ -77,8 +77,9 @@ public class DoUpdateE2EServiceInstanceRollback extends AbstractServiceTaskProce List addResourceList = execution.getVariable("addResourceList") List delResourceList = execution.getVariable("delResourceList") execution.setVariable("addResourceList_o", addResourceList) - execution.setVariable("addResourceList", delResourceList) execution.setVariable("delResourceList_o", delResourceList) + //exchange add and delete resource list + execution.setVariable("addResourceList", delResourceList) execution.setVariable("delResourceList", addResourceList) try { @@ -204,7 +205,7 @@ public class DoUpdateE2EServiceInstanceRollback extends AbstractServiceTaskProce } - public void preProcessAAIGET2(DelegateExecution execution) { + public void preProcessAAIGET(DelegateExecution execution) { def isDebugEnabled=execution.getVariable("isDebugLogEnabled") } @@ -264,7 +265,7 @@ public class DoUpdateE2EServiceInstanceRollback extends AbstractServiceTaskProce String serviceInstanceData = """<service-instance xmlns=\"${namespace}\"> - <resource-version">${serviceInstanceVersion}</resource-version> + <resource-version">${modelUuid}</resource-version> </service-instance>""".trim() execution.setVariable("serviceInstanceData", serviceInstanceData) @@ -310,7 +311,7 @@ public class DoUpdateE2EServiceInstanceRollback extends AbstractServiceTaskProce def isDebugEnabled=execution.getVariable("isDebugLogEnabled") utils.log("DEBUG"," ***** processRollbackException ***** ", isDebugEnabled) try{ - utils.log("DEBUG", "Caught an Exception in DoCreateServiceInstanceRollback", isDebugEnabled) + utils.log("DEBUG", "Caught an Exception in DoUpdateE2EServiceInstanceRollback", isDebugEnabled) execution.setVariable("rollbackData", null) execution.setVariable("rollbackError", "Caught exception in ServiceInstance Update Rollback") execution.setVariable("WorkflowException", null) diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn index 2b9e79615e..c1974c2b8f 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn @@ -337,9 +337,9 @@ dcsi.postProcessAAIGET(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3"> - <dc:Bounds x="626" y="326" width="36" height="36" /> + <dc:Bounds x="636" y="-160" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="599" y="367" width="90" height="0" /> + <dc:Bounds x="609" y="-119" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="UnexpectedError_SubProcess_1" isExpanded="true"> @@ -382,13 +382,15 @@ dcsi.postProcessAAIGET(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1wk55es_di" bpmnElement="PostProcess_ScriptTask"> - <dc:Bounds x="594" y="202" width="100" height="80" /> + <dc:Bounds x="604" y="-62" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_01l4ssl_di" bpmnElement="SequenceFlow_01l4ssl"> - <di:waypoint xsi:type="dc:Point" x="644" y="282" /> - <di:waypoint xsi:type="dc:Point" x="644" y="326" /> + <di:waypoint xsi:type="dc:Point" x="654" y="-62" /> + <di:waypoint xsi:type="dc:Point" x="654" y="-89" /> + <di:waypoint xsi:type="dc:Point" x="654" y="-89" /> + <di:waypoint xsi:type="dc:Point" x="654" y="-124" /> <bpmndi:BPMNLabel> - <dc:Bounds x="614" y="304" width="90" height="0" /> + <dc:Bounds x="624" y="-89" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="SubProcess_11bi8mc_di" bpmnElement="SubProcess_11bi8mc" isExpanded="true"> @@ -430,23 +432,23 @@ dcsi.postProcessAAIGET(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1rzlaoy_di" bpmnElement="SequenceFlow_1rzlaoy"> - <di:waypoint xsi:type="dc:Point" x="416" y="122" /> - <di:waypoint xsi:type="dc:Point" x="416" y="242" /> - <di:waypoint xsi:type="dc:Point" x="594" y="242" /> + <di:waypoint xsi:type="dc:Point" x="416" y="72" /> + <di:waypoint xsi:type="dc:Point" x="416" y="-22" /> + <di:waypoint xsi:type="dc:Point" x="604" y="-22" /> <bpmndi:BPMNLabel> - <dc:Bounds x="460.4906587831245" y="224.5" width="19" height="12" /> + <dc:Bounds x="463.0056179775281" y="-39" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_0ii31dq_di" bpmnElement="ExclusiveGateway_0ii31dq" isMarkerVisible="true"> <dc:Bounds x="687" y="72" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="670" y="131" width="83" height="24" /> + <dc:Bounds x="670" y="39" width="83" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_09wkav2_di" bpmnElement="ExclusiveGateway_09wkav2" isMarkerVisible="true"> <dc:Bounds x="520" y="72" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="507" y="127" width="76" height="24" /> + <dc:Bounds x="507" y="38" width="76" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1uw2p9a_di" bpmnElement="SequenceFlow_1uw2p9a"> @@ -457,10 +459,10 @@ dcsi.postProcessAAIGET(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_11fnnkb_di" bpmnElement="SequenceFlow_11fnnkb"> - <di:waypoint xsi:type="dc:Point" x="545" y="72" /> - <di:waypoint xsi:type="dc:Point" x="545" y="-33" /> + <di:waypoint xsi:type="dc:Point" x="545" y="122" /> + <di:waypoint xsi:type="dc:Point" x="545" y="218" /> <bpmndi:BPMNLabel> - <dc:Bounds x="560.5" y="44.98780487804885" width="19" height="12" /> + <dc:Bounds x="510" y="135.20000000000002" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_06aasqh_di" bpmnElement="SequenceFlow_06aasqh"> @@ -471,286 +473,284 @@ dcsi.postProcessAAIGET(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_05jnyuq_di" bpmnElement="CallActivity_05jnyuq"> - <dc:Bounds x="417" y="454" width="100" height="80" /> + <dc:Bounds x="417" y="345" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0pwixhh_di" bpmnElement="SequenceFlow_0pwixhh"> - <di:waypoint xsi:type="dc:Point" x="517" y="494" /> - <di:waypoint xsi:type="dc:Point" x="594" y="494" /> + <di:waypoint xsi:type="dc:Point" x="517" y="385" /> + <di:waypoint xsi:type="dc:Point" x="594" y="385" /> <bpmndi:BPMNLabel> - <dc:Bounds x="555.5" y="473" width="0" height="12" /> + <dc:Bounds x="511" y="364" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1i1ova8_di" bpmnElement="ScriptTask_1i1ova8"> - <dc:Bounds x="230" y="632" width="100" height="80" /> + <dc:Bounds x="230" y="533" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0ngehrz_di" bpmnElement="ScriptTask_0ngehrz"> - <dc:Bounds x="594" y="454" width="100" height="80" /> + <dc:Bounds x="594" y="345" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_01beerv_di" bpmnElement="ScriptTask_01beerv"> - <dc:Bounds x="230" y="454" width="100" height="80" /> + <dc:Bounds x="230" y="345" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_0l7jjb1_di" bpmnElement="CallActivity_0l7jjb1"> - <dc:Bounds x="417" y="632" width="100" height="80" /> + <dc:Bounds x="417" y="533" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1afo620_di" bpmnElement="ScriptTask_1afo620"> - <dc:Bounds x="594" y="632" width="100" height="80" /> + <dc:Bounds x="594" y="533" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_0ybxh3b_di" bpmnElement="ExclusiveGateway_0ybxh3b" isMarkerVisible="true"> <dc:Bounds x="864" y="72" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="856" y="130" width="66" height="12" /> + <dc:Bounds x="896" y="44" width="66" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0drjj7b_di" bpmnElement="SequenceFlow_0drjj7b"> - <di:waypoint xsi:type="dc:Point" x="712" y="72" /> - <di:waypoint xsi:type="dc:Point" x="712" y="-33" /> + <di:waypoint xsi:type="dc:Point" x="712" y="122" /> + <di:waypoint xsi:type="dc:Point" x="712" y="218" /> <bpmndi:BPMNLabel> - <dc:Bounds x="717.5" y="38.190140845070424" width="19" height="12" /> + <dc:Bounds x="687" y="141.6" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateCatchEvent_05uesi2_di" bpmnElement="IntermediateCatchEvent_05uesi2"> - <dc:Bounds x="159" y="654" width="36" height="36" /> + <dc:Bounds x="159" y="555" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="135" y="699" width="84" height="24" /> + <dc:Bounds x="135" y="600" width="84" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateCatchEvent_1qn9srt_di" bpmnElement="IntermediateCatchEvent_1qn9srt"> - <dc:Bounds x="159" y="476" width="36" height="36" /> + <dc:Bounds x="159" y="367" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="135" y="516" width="86" height="24" /> + <dc:Bounds x="135" y="407" width="86" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateThrowEvent_11l0okn_di" bpmnElement="IntermediateThrowEvent_11l0okn"> - <dc:Bounds x="527" y="-69" width="36" height="36" /> + <dc:Bounds x="527" y="218" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="502" y="-112" width="86" height="36" /> + <dc:Bounds x="502" y="257" width="86" height="36" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateThrowEvent_14ed07u_di" bpmnElement="IntermediateThrowEvent_14ed07u"> - <dc:Bounds x="694" y="-69" width="36" height="36" /> + <dc:Bounds x="694" y="218" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="670" y="-108" width="84" height="36" /> + <dc:Bounds x="670" y="262" width="84" height="36" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0a83f6m_di" bpmnElement="SequenceFlow_0a83f6m"> - <di:waypoint xsi:type="dc:Point" x="889" y="122" /> - <di:waypoint xsi:type="dc:Point" x="889" y="242" /> - <di:waypoint xsi:type="dc:Point" x="694" y="242" /> + <di:waypoint xsi:type="dc:Point" x="889" y="72" /> + <di:waypoint xsi:type="dc:Point" x="889" y="-22" /> + <di:waypoint xsi:type="dc:Point" x="704" y="-22" /> <bpmndi:BPMNLabel> - <dc:Bounds x="928" y="176" width="12" height="12" /> + <dc:Bounds x="838" y="19.000000000000007" width="12" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1fih4h0_di" bpmnElement="SequenceFlow_1fih4h0"> - <di:waypoint xsi:type="dc:Point" x="330" y="494" /> - <di:waypoint xsi:type="dc:Point" x="417" y="494" /> + <di:waypoint xsi:type="dc:Point" x="330" y="385" /> + <di:waypoint xsi:type="dc:Point" x="417" y="385" /> <bpmndi:BPMNLabel> - <dc:Bounds x="373.5" y="473" width="0" height="12" /> + <dc:Bounds x="329" y="364" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1g4qm2l_di" bpmnElement="SequenceFlow_1g4qm2l"> - <di:waypoint xsi:type="dc:Point" x="195" y="494" /> - <di:waypoint xsi:type="dc:Point" x="230" y="494" /> + <di:waypoint xsi:type="dc:Point" x="195" y="385" /> + <di:waypoint xsi:type="dc:Point" x="230" y="385" /> <bpmndi:BPMNLabel> - <dc:Bounds x="212.5" y="473" width="0" height="12" /> + <dc:Bounds x="168" y="364" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_06xv7b2_di" bpmnElement="SequenceFlow_06xv7b2"> - <di:waypoint xsi:type="dc:Point" x="195" y="672" /> - <di:waypoint xsi:type="dc:Point" x="230" y="672" /> + <di:waypoint xsi:type="dc:Point" x="195" y="573" /> + <di:waypoint xsi:type="dc:Point" x="230" y="573" /> <bpmndi:BPMNLabel> - <dc:Bounds x="212.5" y="651" width="0" height="12" /> + <dc:Bounds x="168" y="552" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0b73i9r_di" bpmnElement="SequenceFlow_0b73i9r"> - <di:waypoint xsi:type="dc:Point" x="330" y="672" /> - <di:waypoint xsi:type="dc:Point" x="363" y="672" /> - <di:waypoint xsi:type="dc:Point" x="363" y="672" /> - <di:waypoint xsi:type="dc:Point" x="417" y="672" /> + <di:waypoint xsi:type="dc:Point" x="330" y="573" /> + <di:waypoint xsi:type="dc:Point" x="363" y="573" /> + <di:waypoint xsi:type="dc:Point" x="363" y="573" /> + <di:waypoint xsi:type="dc:Point" x="417" y="573" /> <bpmndi:BPMNLabel> - <dc:Bounds x="378" y="666" width="0" height="12" /> + <dc:Bounds x="333" y="567" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0q9ws1s_di" bpmnElement="SequenceFlow_0q9ws1s"> - <di:waypoint xsi:type="dc:Point" x="517" y="672" /> - <di:waypoint xsi:type="dc:Point" x="545" y="672" /> - <di:waypoint xsi:type="dc:Point" x="545" y="672" /> - <di:waypoint xsi:type="dc:Point" x="594" y="672" /> + <di:waypoint xsi:type="dc:Point" x="517" y="573" /> + <di:waypoint xsi:type="dc:Point" x="545" y="573" /> + <di:waypoint xsi:type="dc:Point" x="545" y="573" /> + <di:waypoint xsi:type="dc:Point" x="594" y="573" /> <bpmndi:BPMNLabel> - <dc:Bounds x="560" y="666" width="0" height="12" /> + <dc:Bounds x="515" y="567" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateCatchEvent_0546q5i_di" bpmnElement="IntermediateCatchEvent_0546q5i"> - <dc:Bounds x="156" y="820" width="36" height="36" /> + <dc:Bounds x="156" y="765" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="151" y="856" width="52" height="12" /> + <dc:Bounds x="151" y="801" width="52" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0gj4dj5_di" bpmnElement="ScriptTask_0gj4dj5"> - <dc:Bounds x="687" y="798" width="100" height="80" /> + <dc:Bounds x="687" y="743" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_0zs5y0x_di" bpmnElement="CallActivity_0zs5y0x"> - <dc:Bounds x="841" y="798" width="100" height="80" /> + <dc:Bounds x="841" y="743" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1p96syr_di" bpmnElement="ScriptTask_1p96syr"> - <dc:Bounds x="1014" y="798" width="100" height="80" /> + <dc:Bounds x="1014" y="743" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1a65s3k_di" bpmnElement="SequenceFlow_1a65s3k"> - <di:waypoint xsi:type="dc:Point" x="192" y="838" /> - <di:waypoint xsi:type="dc:Point" x="234" y="838" /> + <di:waypoint xsi:type="dc:Point" x="192" y="783" /> + <di:waypoint xsi:type="dc:Point" x="234" y="783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="168" y="817" width="90" height="12" /> + <dc:Bounds x="168" y="762" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1lppnhy_di" bpmnElement="SequenceFlow_1lppnhy"> - <di:waypoint xsi:type="dc:Point" x="787" y="838" /> - <di:waypoint xsi:type="dc:Point" x="841" y="838" /> + <di:waypoint xsi:type="dc:Point" x="787" y="783" /> + <di:waypoint xsi:type="dc:Point" x="841" y="783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="769" y="817" width="90" height="12" /> + <dc:Bounds x="769" y="762" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0kbisn8_di" bpmnElement="SequenceFlow_0kbisn8"> - <di:waypoint xsi:type="dc:Point" x="941" y="838" /> - <di:waypoint xsi:type="dc:Point" x="978" y="838" /> - <di:waypoint xsi:type="dc:Point" x="978" y="838" /> - <di:waypoint xsi:type="dc:Point" x="1014" y="838" /> + <di:waypoint xsi:type="dc:Point" x="941" y="783" /> + <di:waypoint xsi:type="dc:Point" x="978" y="783" /> + <di:waypoint xsi:type="dc:Point" x="978" y="783" /> + <di:waypoint xsi:type="dc:Point" x="1014" y="783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="948" y="832" width="90" height="12" /> + <dc:Bounds x="948" y="777" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_1k16vgh_di" bpmnElement="ExclusiveGateway_1k16vgh" isMarkerVisible="true"> - <dc:Bounds x="778" y="469" width="50" height="50" /> + <dc:Bounds x="778" y="360" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="721" y="467" width="66" height="12" /> + <dc:Bounds x="721" y="358" width="66" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_08p4pkv_di" bpmnElement="SequenceFlow_08p4pkv"> - <di:waypoint xsi:type="dc:Point" x="694" y="494" /> - <di:waypoint xsi:type="dc:Point" x="778" y="494" /> + <di:waypoint xsi:type="dc:Point" x="694" y="385" /> + <di:waypoint xsi:type="dc:Point" x="778" y="385" /> <bpmndi:BPMNLabel> - <dc:Bounds x="736" y="473" width="0" height="12" /> + <dc:Bounds x="691" y="364" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateThrowEvent_0x32fw8_di" bpmnElement="IntermediateThrowEvent_0x32fw8"> - <dc:Bounds x="785" y="383" width="36" height="36" /> + <dc:Bounds x="785" y="454" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="762" y="363" width="82" height="12" /> + <dc:Bounds x="762" y="495" width="82" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0cbnwwi_di" bpmnElement="SequenceFlow_0cbnwwi"> - <di:waypoint xsi:type="dc:Point" x="803" y="469" /> - <di:waypoint xsi:type="dc:Point" x="803" y="419" /> + <di:waypoint xsi:type="dc:Point" x="803" y="410" /> + <di:waypoint xsi:type="dc:Point" x="803" y="454" /> <bpmndi:BPMNLabel> - <dc:Bounds x="818" y="438" width="0" height="12" /> + <dc:Bounds x="773" y="426" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1c3q8hc_di" bpmnElement="ScriptTask_1c3q8hc"> - <dc:Bounds x="879" y="454" width="100" height="80" /> + <dc:Bounds x="879" y="345" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_161uzhj_di" bpmnElement="SequenceFlow_161uzhj"> - <di:waypoint xsi:type="dc:Point" x="828" y="494" /> - <di:waypoint xsi:type="dc:Point" x="879" y="494" /> + <di:waypoint xsi:type="dc:Point" x="828" y="385" /> + <di:waypoint xsi:type="dc:Point" x="879" y="385" /> <bpmndi:BPMNLabel> - <dc:Bounds x="853.5" y="473" width="0" height="12" /> + <dc:Bounds x="809" y="364" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="EndEvent_0knjkkx_di" bpmnElement="EndEvent_0knjkkx"> - <dc:Bounds x="1040.4" y="476" width="36" height="36" /> + <dc:Bounds x="1040" y="367" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1058.4" y="516" width="0" height="12" /> + <dc:Bounds x="1013" y="407" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_13r4lij_di" bpmnElement="SequenceFlow_13r4lij"> - <di:waypoint xsi:type="dc:Point" x="979" y="494" /> - <di:waypoint xsi:type="dc:Point" x="1040" y="494" /> + <di:waypoint xsi:type="dc:Point" x="979" y="385" /> + <di:waypoint xsi:type="dc:Point" x="1040" y="385" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1009.5" y="473" width="0" height="12" /> + <dc:Bounds x="965" y="364" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_0g7wcmb_di" bpmnElement="ExclusiveGateway_0g7wcmb" isMarkerVisible="true"> - <dc:Bounds x="778" y="647" width="50" height="50" /> + <dc:Bounds x="778" y="548" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="721" y="645" width="66" height="12" /> + <dc:Bounds x="721" y="546" width="66" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateThrowEvent_0q76lxg_di" bpmnElement="IntermediateThrowEvent_0q76lxg"> - <dc:Bounds x="785" y="589" width="36" height="36" /> + <dc:Bounds x="785" y="647" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="762" y="566" width="82" height="12" /> + <dc:Bounds x="762" y="693" width="82" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1y4us3g_di" bpmnElement="ScriptTask_1y4us3g"> - <dc:Bounds x="879" y="632" width="100" height="80" /> + <dc:Bounds x="879" y="533" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_0yzh2qs_di" bpmnElement="EndEvent_0yzh2qs"> - <dc:Bounds x="1040" y="654" width="36" height="36" /> + <dc:Bounds x="1040" y="555" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1058" y="694" width="0" height="12" /> + <dc:Bounds x="1013" y="595" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0bkvqao_di" bpmnElement="SequenceFlow_0bkvqao"> + <di:waypoint xsi:type="dc:Point" x="803" y="598" /> <di:waypoint xsi:type="dc:Point" x="803" y="647" /> - <di:waypoint xsi:type="dc:Point" x="803" y="625" /> <bpmndi:BPMNLabel> - <dc:Bounds x="818" y="630" width="0" height="12" /> + <dc:Bounds x="773" y="616.5" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1isdxh1_di" bpmnElement="SequenceFlow_1isdxh1"> - <di:waypoint xsi:type="dc:Point" x="828" y="672" /> - <di:waypoint xsi:type="dc:Point" x="879" y="672" /> + <di:waypoint xsi:type="dc:Point" x="828" y="573" /> + <di:waypoint xsi:type="dc:Point" x="879" y="573" /> <bpmndi:BPMNLabel> - <dc:Bounds x="853.5" y="651" width="0" height="12" /> + <dc:Bounds x="809" y="552" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0a9xori_di" bpmnElement="SequenceFlow_0a9xori"> - <di:waypoint xsi:type="dc:Point" x="979" y="672" /> - <di:waypoint xsi:type="dc:Point" x="1040" y="672" /> + <di:waypoint xsi:type="dc:Point" x="979" y="573" /> + <di:waypoint xsi:type="dc:Point" x="1040" y="573" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1009.5" y="651" width="0" height="12" /> + <dc:Bounds x="965" y="552" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateThrowEvent_1et42wh_di" bpmnElement="IntermediateThrowEvent_1et42wh"> - <dc:Bounds x="871" y="-69" width="36" height="36" /> + <dc:Bounds x="873" y="218" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="848" y="-91" width="82" height="12" /> + <dc:Bounds x="852" y="269" width="82" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0zijz16_di" bpmnElement="SequenceFlow_0zijz16"> - <di:waypoint xsi:type="dc:Point" x="889" y="72" /> - <di:waypoint xsi:type="dc:Point" x="889" y="20" /> - <di:waypoint xsi:type="dc:Point" x="889" y="20" /> - <di:waypoint xsi:type="dc:Point" x="889" y="-33" /> + <di:waypoint xsi:type="dc:Point" x="889" y="122" /> + <di:waypoint xsi:type="dc:Point" x="891" y="218" /> <bpmndi:BPMNLabel> - <dc:Bounds x="895" y="14" width="19" height="12" /> + <dc:Bounds x="861.4067820523877" y="137.3057489950117" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1bp5oce_di" bpmnElement="SequenceFlow_1bp5oce"> - <di:waypoint xsi:type="dc:Point" x="694" y="672" /> - <di:waypoint xsi:type="dc:Point" x="778" y="672" /> + <di:waypoint xsi:type="dc:Point" x="694" y="573" /> + <di:waypoint xsi:type="dc:Point" x="778" y="573" /> <bpmndi:BPMNLabel> - <dc:Bounds x="736" y="651" width="0" height="12" /> + <dc:Bounds x="691" y="552" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_17k4l6y_di" bpmnElement="ScriptTask_17k4l6y"> - <dc:Bounds x="1171" y="798" width="100" height="80" /> + <dc:Bounds x="1171" y="743" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_193e9tt_di" bpmnElement="EndEvent_193e9tt"> - <dc:Bounds x="1327" y="820" width="36" height="36" /> + <dc:Bounds x="1327" y="765" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1300" y="860" width="90" height="12" /> + <dc:Bounds x="1300" y="805" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1n6foyw_di" bpmnElement="SequenceFlow_1n6foyw"> - <di:waypoint xsi:type="dc:Point" x="1271" y="838" /> - <di:waypoint xsi:type="dc:Point" x="1327" y="838" /> + <di:waypoint xsi:type="dc:Point" x="1271" y="783" /> + <di:waypoint xsi:type="dc:Point" x="1327" y="783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1254" y="817" width="90" height="12" /> + <dc:Bounds x="1254" y="762" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1azhgda_di" bpmnElement="SequenceFlow_1azhgda"> - <di:waypoint xsi:type="dc:Point" x="1114" y="838" /> - <di:waypoint xsi:type="dc:Point" x="1171" y="838" /> + <di:waypoint xsi:type="dc:Point" x="1114" y="783" /> + <di:waypoint xsi:type="dc:Point" x="1171" y="783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1097.5" y="817" width="90" height="12" /> + <dc:Bounds x="1097.5" y="762" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_055b52t_di" bpmnElement="SequenceFlow_055b52t"> @@ -761,35 +761,35 @@ dcsi.postProcessAAIGET(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_13h2onn_di" bpmnElement="ScriptTask_13h2onn"> - <dc:Bounds x="234" y="798" width="100" height="80" /> + <dc:Bounds x="234" y="743" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_1527zgc_di" bpmnElement="CallActivity_1527zgc"> - <dc:Bounds x="391" y="798" width="100" height="80" /> + <dc:Bounds x="391" y="743" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0870pzc_di" bpmnElement="SequenceFlow_0870pzc"> - <di:waypoint xsi:type="dc:Point" x="334" y="838" /> - <di:waypoint xsi:type="dc:Point" x="391" y="838" /> + <di:waypoint xsi:type="dc:Point" x="334" y="783" /> + <di:waypoint xsi:type="dc:Point" x="391" y="783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="362.5" y="817" width="0" height="12" /> + <dc:Bounds x="362.5" y="762" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0td1f55_di" bpmnElement="ScriptTask_0td1f55"> - <dc:Bounds x="543" y="798" width="100" height="80" /> + <dc:Bounds x="543" y="743" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1f31l5s_di" bpmnElement="SequenceFlow_1f31l5s"> - <di:waypoint xsi:type="dc:Point" x="491" y="838" /> - <di:waypoint xsi:type="dc:Point" x="543" y="838" /> + <di:waypoint xsi:type="dc:Point" x="491" y="783" /> + <di:waypoint xsi:type="dc:Point" x="543" y="783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="517" y="817" width="0" height="12" /> + <dc:Bounds x="517" y="762" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1ixphei_di" bpmnElement="SequenceFlow_1ixphei"> - <di:waypoint xsi:type="dc:Point" x="643" y="838" /> - <di:waypoint xsi:type="dc:Point" x="687" y="838" /> + <di:waypoint xsi:type="dc:Point" x="643" y="783" /> + <di:waypoint xsi:type="dc:Point" x="687" y="783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="665" y="817" width="0" height="12" /> + <dc:Bounds x="665" y="762" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn2:definitions> +</bpmn2:definitions>
\ No newline at end of file diff --git a/common/src/test/java/org/openecomp/mso/client/dmaap/DmaapPublisherTest.java b/common/src/test/java/org/openecomp/mso/client/dmaap/DmaapPublisherTest.java new file mode 100644 index 0000000000..a9bf81d2ad --- /dev/null +++ b/common/src/test/java/org/openecomp/mso/client/dmaap/DmaapPublisherTest.java @@ -0,0 +1,60 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2018 Huawei Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.openecomp.mso.client.dmaap; + +import org.junit.Test; + +import javax.ws.rs.ProcessingException; +import java.io.IOException; +import java.util.Optional; + +public class DmaapPublisherTest { + + DmaapPublisher dmaapPublisher = new DmaapPublisher(120) { + @Override + public String getUserName() { + return "test"; + } + + @Override + public String getPassword() { + return "test"; + } + + @Override + public String getTopic() { + return "test"; + } + + @Override + public Optional<String> getHost() { + return Optional.of("http://localhost:8080"); + } + }; + + public DmaapPublisherTest() throws IOException { + } + + @Test(expected = ProcessingException.class) + public void sendTest() throws Exception { + dmaapPublisher.send("{'key': 'value'}"); + } + +}
\ No newline at end of file |