Merge pull request #18 from tsurdilo/functionsdefupdate

Update for function definitions (openapi)

Author: Tihomir Surdilovic

api/src/main/resources/schema/functions/functiondef.json

@@ -7,21 +7,16 @@
       "description": "Function unique name",
       "minLength": 1
     },
-    "resource": {
+    "operation": {
       "type": "string",
-      "description": "Function resource (URI)"
-    },
-    "type": {
-      "type": "string",
-      "description": "Type of function to implement. Can be defined by implementations",
+      "description": "Combination of the function/service OpenAPI definition URI and the operationID of the operation that needs to be invoked, separated by a '#'. For example 'https://petstore.swagger.io/v2/swagger.json#getPetById'",
       "minLength": 1
     },
     "metadata": {
       "$ref": "../metadata/metadata.json"
     }
   },
   "required": [
-    "name",
-    "resource"
+    "name"
   ]
 }

api/src/main/resources/schema/states/switchstate.json

@@ -30,6 +30,7 @@
       "description": "If eventConditions is used, defines the time period to wait for events (ISO 8601 format)"
     },
     "default": {
+      "description": "Default transition of the workflow if there is no matching data conditions. Can include a transition or end definition",
       "$ref": "../default/defaultdef.json"
     }
   },

api/src/test/java/io/serverlessworkflow/api/test/WorkflowToMarkupTest.java

@@ -63,7 +63,8 @@ public void testSingleFunction() {
 
         Workflow workflow = new Workflow().withId("test-workflow").withName("test-workflow-name").withVersion("1.0")
                 .withFunctions(new Functions(Arrays.asList(
-                        new FunctionDefinition().withName("testFunction").withResource("testResource").withType("testType")))
+                        new FunctionDefinition().withName("testFunction")
+                                .withOperation("testSwaggerDef#testOperationId")))
                 )
                 .withStates(Arrays.asList(
                         new DelayState().withName("delayState").withType(DELAY)
@@ -98,7 +99,8 @@ public void testSingleEvent() {
                                 .withKind(EventDefinition.Kind.PRODUCED)))
                 )
                 .withFunctions(new Functions(Arrays.asList(
-                        new FunctionDefinition().withName("testFunction").withResource("testResource").withType("testType")))
+                        new FunctionDefinition().withName("testFunction")
+                                .withOperation("testSwaggerDef#testOperationId")))
                 )
                 .withStates(Arrays.asList(
                         new DelayState().withName("delayState").withType(DELAY)

api/src/test/resources/examples/applicantrequest.json

@@ -6,7 +6,7 @@
   "functions": [
     {
       "name": "sendRejectionEmailFunction",
-      "resource": "functionResourse"
+      "operation": "http://myapis.org/applicationapi.json#emailRejection"
     }
   ],
   "states":[

api/src/test/resources/examples/applicantrequest.yml

@@ -5,7 +5,7 @@ name: Applicant Request Decision Workflow
 description: Determine if applicant request is valid
 functions:
   - name: sendRejectionEmailFunction
-    resource: functionResourse
+    operation: http://myapis.org/applicationapi.json#emailRejection
 states:
   - name: CheckApplication
     type: switch

api/src/test/resources/examples/carauctionbids.json

@@ -6,8 +6,7 @@
   "functions": [
     {
       "name": "StoreBidFunction",
-      "resource": "storeBidResource",
-      "type": "function"
+      "operation": "http://myapis.org/carauctionapi.json#storeBid"
     }
   ],
   "events": [

api/src/test/resources/examples/carauctionbids.yml

@@ -4,8 +4,7 @@ name: Car Auction Bidding Workflow
 description: Store a single bid whole the car auction is active
 functions:
   - name: StoreBidFunction
-    resource: storeBidResource
-    type: function
+    operation: http://myapis.org/carauctionapi.json#storeBid
 events:
   - name: CarBidEvent
     type: carBidMadeType

api/src/test/resources/examples/creditcheck.json

@@ -5,13 +5,12 @@
   "description": "Perform Customer Credit Check",
   "functions": [
     {
-      "name": "callCreditCheckMicroservice",
-      "resource": "creditCheckResource",
-      "type": "microservice"
+      "name": "creditCheckFunction",
+      "operation": "http://myapis.org/creditcheckapi.json#doCreditCheck"
     },
     {
       "name": "sendRejectionEmailFunction",
-      "resource": "rejectEmailResource"
+      "operation": "http://myapis.org/creditcheckapi.json#rejectionEmail"
     }
   ],
   "events": [

api/src/test/resources/examples/creditcheck.yml

@@ -4,11 +4,10 @@ version: '1.0'
 name: Customer Credit Check Workflow
 description: Perform Customer Credit Check
 functions:
-  - name: callCreditCheckMicroservice
-    resource: creditCheckResource
-    type: microservice
+  - name: creditCheckFunction
+    operation: http://myapis.org/creditcheckapi.json#doCreditCheck
   - name: sendRejectionEmailFunction
-    resource: rejectEmailResource
+    operation: http://myapis.org/creditcheckapi.json#rejectionEmail
 events:
   - name: CreditCheckCompletedEvent
     type: creditCheckCompleteType

api/src/test/resources/examples/eventbasedgreeting.json

@@ -13,7 +13,7 @@
   "functions": [
     {
       "name": "greetingFunction",
-      "resource": "functionResourse"
+      "operation": "file://myapis/greetingapis.json#greeting"
     }
   ],
   "states":[