Merge pull request #472 from axonivy-market/fix-warning

Fix new missing webservice client id warning
axonivy-market · Sep 18, 2023 · dad8b59 · dad8b59
2 parents 39542d2 + dc6eda4
commit dad8b59
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 37 deletions.
diff --git a/error-handling/error-handling-demos/processes/Booking/Booking.p.json b/error-handling/error-handling-demos/processes/Booking/Booking.p.json
@@ -73,8 +73,7 @@
             "errorCode" : "booking:flight:failed"
           },
           "visual" : {
-            "at" : { "x" : 352, "y" : 160 },
-            "labelOffset" : { "x" : 19, "y" : 0 }
+            "at" : { "x" : 352, "y" : 160 }
           },
           "connect" : [
             { "id" : "f10", "to" : "f9", "via" : [ { "x" : 352, "y" : 288 } ] }
@@ -101,8 +100,7 @@
             "errorCode" : "booking:car:failed"
           },
           "visual" : {
-            "at" : { "x" : 512, "y" : 160 },
-            "labelOffset" : { "x" : 18, "y" : 1 }
+            "at" : { "x" : 512, "y" : 160 }
           },
           "connect" : [
             { "id" : "f12", "to" : "f11" }
@@ -186,7 +184,7 @@
       },
       "visual" : {
         "at" : { "x" : 752, "y" : 128 },
-        "labelOffset" : { "x" : -18, "y" : 38 }
+        "labelOffset" : { "x" : 17, "y" : 41 }
       }
     } ],
   "layout" : {

diff --git a/error-handling/error-handling-demos/processes/Booking/Service/Car.p.json b/error-handling/error-handling-demos/processes/Booking/Service/Car.p.json
@@ -23,7 +23,7 @@
         "labelOffset" : { "x" : 14, "y" : 37 }
       },
       "connect" : [
-        { "id" : "f4", "to" : "f3" }
+        { "id" : "f2", "to" : "f5" }
       ]
     }, {
       "id" : "f1",
@@ -32,8 +32,8 @@
         "at" : { "x" : 352, "y" : 64 }
       }
     }, {
-      "id" : "f3",
-      "type" : "WebServiceCall",
+      "id" : "f5",
+      "type" : "Script",
       "name" : "remote booking",
       "config" : {
         "output" : {
@@ -47,7 +47,7 @@
         "at" : { "x" : 224, "y" : 64 }
       },
       "connect" : [
-        { "id" : "f2", "to" : "f1" }
+        { "id" : "f3", "to" : "f1" }
       ]
     } ]
 }
diff --git a/error-handling/error-handling-demos/processes/Booking/Service/Flight.p.json b/error-handling/error-handling-demos/processes/Booking/Service/Flight.p.json
@@ -23,38 +23,17 @@
         }
       },
       "visual" : {
-        "at" : { "x" : 96, "y" : 64 },
-        "labelOffset" : { "x" : -40, "y" : 37 }
+        "at" : { "x" : 96, "y" : 64 }
       },
       "connect" : [
-        { "id" : "f4", "to" : "f3" }
+        { "id" : "f2", "to" : "f15" }
       ]
     }, {
       "id" : "f1",
       "type" : "CallSubEnd",
       "visual" : {
         "at" : { "x" : 512, "y" : 64 }
       }
-    }, {
-      "id" : "f3",
-      "type" : "WebServiceCall",
-      "name" : "register customer",
-      "visual" : {
-        "at" : { "x" : 224, "y" : 64 }
-      },
-      "connect" : [
-        { "id" : "f6", "to" : "f5" }
-      ]
-    }, {
-      "id" : "f5",
-      "type" : "WebServiceCall",
-      "name" : "book flight",
-      "visual" : {
-        "at" : { "x" : 384, "y" : 64 }
-      },
-      "connect" : [
-        { "id" : "f2", "to" : "f1" }
-      ]
     }, {
       "id" : "f7",
       "type" : "ErrorStartEvent",
@@ -107,11 +86,10 @@
         }
       },
       "visual" : {
-        "at" : { "x" : 96, "y" : 288 },
-        "labelOffset" : { "x" : -40, "y" : 37 }
+        "at" : { "x" : 96, "y" : 288 }
       },
       "connect" : [
-        { "id" : "f14", "to" : "f13" }
+        { "id" : "f6", "to" : "f5" }
       ]
     }, {
       "id" : "f11",
@@ -120,9 +98,50 @@
         "at" : { "x" : 512, "y" : 288 }
       }
     }, {
-      "id" : "f13",
-      "type" : "WebServiceCall",
+      "id" : "f15",
+      "type" : "Script",
+      "name" : "register customer",
+      "config" : {
+        "output" : {
+          "code" : "ivy.log.info(\"register customer\");"
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 224, "y" : 64 }
+      },
+      "connect" : [
+        { "id" : "f3", "to" : "f16" }
+      ]
+    }, {
+      "id" : "f16",
+      "type" : "Script",
+      "name" : "book flight",
+      "config" : {
+        "output" : {
+          "code" : [
+            "import ch.ivyteam.ivy.bpm.error.BpmError;",
+            "",
+            "if (Math.random() > 0.5) {",
+            "  BpmError.create(\"ivy:error:webservice:exception\").throwError();",
+            "}"
+          ]
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 392, "y" : 64 }
+      },
+      "connect" : [
+        { "id" : "f4", "to" : "f1" }
+      ]
+    }, {
+      "id" : "f5",
+      "type" : "Script",
       "name" : "cancel flight",
+      "config" : {
+        "output" : {
+          "code" : "ivy.log.info(\"Cancel flight\");"
+        }
+      },
       "visual" : {
         "at" : { "x" : 288, "y" : 288 }
       },