[Fix serverlessworkflow#359] Generating not referenced Pojos

Signed-off-by: Francisco Javier Tirado Sarti <ftirados@redhat.com>

Author: fjtirado

api/pom.xml

@@ -94,7 +94,15 @@
                     <targetVersion>${java.version}</targetVersion>
                     <usePrimitives>true</usePrimitives>
                     <useJakartaValidation>true</useJakartaValidation>
+                    <customRuleFactory>io.serverlessworkflow.generator.UnreferencedFactory</customRuleFactory>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.serverlessworkflow</groupId>
+                        <artifactId>custom-generator</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <goals>

api/src/main/resources/schema/workflow.yaml

@@ -51,9 +51,13 @@ properties:
           $ref: '#/$defs/error'
         description: The workflow's reusable errors.
       extensions:
-        type: object
-        additionalProperties:
-          $ref: '#/$defs/extension'
+        type: array
+        items:
+          type: object
+          minProperties: 1
+          maxProperties: 1
+          additionalProperties:
+            $ref: '#/$defs/extension'
         description: The workflow's extensions.
       functions:
         type: object
@@ -72,11 +76,8 @@ properties:
         description: The workflow's secrets.
     description: Defines the workflow's reusable components.
   do:
-    type: object
-    minProperties: 1
-    additionalProperties:
-      $ref: '#/$defs/task'
-    description: Defines the tasks the workflow must perform
+    description: Defines the task the workflow must perform
+    $ref: '#/$defs/task'
   timeout:
     $ref: '#/$defs/timeout'
     description: The workflow's timeout configuration, if any.
@@ -109,6 +110,9 @@ $defs:
       output:
         $ref: '#/$defs/output'
         description: Configure the task's output.
+      export:
+        $ref: '#/$defs/export'
+        description: Export task output to context.
       timeout:
         $ref: '#/$defs/timeout'
         description: The task's timeout configuration, if any.
@@ -133,7 +137,7 @@ $defs:
       - properties:
           call:
             type: string
-            constant: asyncapi
+            const: asyncapi
           with:
             type: object
             properties:
@@ -156,15 +160,17 @@ $defs:
                 type: object
                 description: The payload to call the AsyncAPI operation with, if any.
               authentication:
-                ref: '#/$defs/authenticationPolicy'
                 description: The authentication policy, if any, to use when calling the AsyncAPI operation.
+                oneOf:
+                  - $ref: '#/$defs/authenticationPolicy'
+                  - type: string
             required: [ document, operationRef ]
             description: Defines the AsyncAPI call to perform.
         required: [ call, with ]
       - properties:
           call:
             type: string
-            constant: grpc
+            const: grpc
           with:
             type: object
             properties:
@@ -187,8 +193,10 @@ $defs:
                     max: 65535
                     description: The port number of the GRPC service to call.
                   authentication:
-                    $ref: '#/$defs/authenticationPolicy'
                     description: The endpoint's authentication policy, if any.
+                    oneOf:
+                      - $ref: '#/$defs/authenticationPolicy'
+                      - type: string
                 required: [ name, host ]
               method:
                 type: string
@@ -203,16 +211,19 @@ $defs:
       - properties:
           call:
             type: string
-            constant: http
+            const: http
           with:
             type: object
             properties:
               method:
                 type: string
                 description: The HTTP method of the HTTP request to perform.
               endpoint:
-                $ref: '#/$defs/endpoint'
                 description: The HTTP endpoint to send the request to.
+                oneOf:
+                  - $ref: '#/$defs/endpoint'
+                  - type: string
+                    format: uri-template
               headers:
                 type: object
                 description: A name/value mapping of the headers, if any, of the HTTP request to perform.
@@ -228,7 +239,7 @@ $defs:
       - properties:
           call:
             type: string
-            constant: openapi
+            const: openapi
           with:
             type: object
             properties:
@@ -243,8 +254,10 @@ $defs:
                 additionalProperties: true
                 description: A name/value mapping of the parameters of the OpenAPI operation to call.
               authentication:
-                $ref: '#/$defs/authenticationPolicy'
                 description: The authentication policy, if any, to use when calling the OpenAPI operation.
+                oneOf:
+                  - $ref: '#/$defs/authenticationPolicy'
+                  - type: string
               output:
                 type: string
                 enum: [ raw, content, response ]
@@ -264,33 +277,44 @@ $defs:
             description: A name/value mapping of the parameters, if any, to call the function with.
         required: [ call ]
   compositeTask:
+    type: object    
+    required: [ execute ]
+    description: Serves as a pivotal orchestrator within workflow systems, enabling the seamless integration and execution of multiple subtasks to accomplish complex operations
     properties:
       execute:
         type: object
-        oneOf:
-        - properties:
-            concurrently:
-              type: object
-              minProperties: 2
-              additionalProperties:
-                $ref: '#/$defs/task'
-              description: A name/definition mapping of the tasks to perform concurrently.
-            compete:
-              type: boolean
-              description: Indicates whether or not the concurrent tasks are racing against each other, with a single possible winner, which sets the composite task's output.
-          required: [ concurrently ]
-        - properties:  
-            sequentially:
-              type: object
-              minProperties: 2
-              additionalProperties:
-                $ref: '#/$defs/task'
-              description: A name/definition mapping of the tasks to perform sequentially.
-          required: [ sequentially ]
         description: Configures the task execution strategy to use
-    required: [ execute ]
-    description: Serves as a pivotal orchestrator within workflow systems, enabling the seamless integration and execution of multiple subtasks to accomplish complex operations
+        oneOf:
+          - required: [ concurrently ]
+            properties:
+              concurrently:
+                description: A list of the tasks to perform concurrently.
+                type: array
+                minItems: 2
+                items:
+                  type: object
+                  minProperties: 1
+                  maxProperties: 1
+                  additionalProperties:
+                    $ref: '#/$defs/task'
+              compete:
+                description: Indicates whether or not the concurrent tasks are racing against each other, with a single possible winner, which sets the composite task's output.
+                type: boolean
+                default: false
+          - required: [ sequentially ]
+            properties:  
+              sequentially:
+                description: A list of the tasks to perform sequentially.        
+                type: array
+                minItems: 2
+                items:
+                  type: object
+                  minProperties: 1
+                  maxProperties: 1
+                  additionalProperties:
+                    $ref: '#/$defs/task'
   emitTask:
+    type: object
     properties:
       emit:
         type: object
@@ -332,6 +356,7 @@ $defs:
         default: continue
       - type: string
   forTask:
+    type: object
     properties:
       for:
         type: object
@@ -487,25 +512,32 @@ $defs:
     type: object
     properties:
       switch:
-        type: object
-        minProperties: 1
-        additionalProperties:
+        type: array
+        minItems: 1
+        items:
           type: object
-          properties:
-            when:
-              type: string
-              description: A runtime expression used to determine whether or not the case matches.
-            then:
-              $ref: '#/$defs/flowDirective'
-              description: The flow directive to execute when the case matches.
+          minProperties: 1
+          maxProperties: 1
+          additionalProperties:
+            type: object
+            properties:
+              name:
+                type: string
+                description: The case's name.
+              when:
+                type: string
+                description: A runtime expression used to determine whether or not the case matches.
+              then:
+                $ref: '#/$defs/flowDirective'
+                description: The flow directive to execute when the case matches.
     required: [ switch ]
     description: Enables conditional branching within workflows, allowing them to dynamically select different paths based on specified conditions or criteria
   tryTask:
     type: object
     properties:
       try:
-        $ref: '#/$defs/task'
         description: The task to perform.
+        $ref: '#/$defs/task'
       catch:
         type: object
         properties:
@@ -524,8 +556,8 @@ $defs:
             $ref: '#/$defs/retryPolicy'
             description: The retry policy to use, if any, when catching errors.
           do:
-            $ref: '#/$defs/task'
             description: The definition of the task to run when catching an error.
+            $ref: '#/$defs/task'
     required: [ try, catch ]
     description: Serves as a mechanism within workflows to handle errors gracefully, potentially retrying failed tasks before proceeding with alternate ones.
   waitTask:
@@ -665,11 +697,13 @@ $defs:
     properties:
       uri:
         type: string
-        format: uri
+        format: uri-template
         description: The endpoint's URI.
       authentication:
-        $ref: '#/$defs/authenticationPolicy'
         description: The authentication policy to use.
+        oneOf:
+          - $ref: '#/$defs/authenticationPolicy'
+          - type: string
     required: [ uri ]
   eventConsumptionStrategy:
     type: object
@@ -746,11 +780,11 @@ $defs:
         type: string
         description: A runtime expression, if any, used to determine whether or not the extension should apply in the specified context.
       before:
-        $ref: '#/$defs/task'
         description: The task to execute before the extended task, if any.
-      after:
         $ref: '#/$defs/task'
+      after:
         description: The task to execute after the extended task, if any.
+        $ref: '#/$defs/task'
     required: [ extend ]
     description: The definition of a an extension.
   externalResource:
@@ -761,8 +795,10 @@ $defs:
         format: uri
         description: The endpoint's URI.
       authentication:
-        $ref: '#/$defs/authenticationPolicy'
         description: The authentication policy to use.
+        oneOf:
+          - $ref: '#/$defs/authenticationPolicy'
+          - type: string
       name:
         type: string
         description: The external resource's name, if any.
@@ -783,13 +819,20 @@ $defs:
       schema:
         $ref: '#/$defs/schema'
         description: The schema used to describe and validate the output of the workflow or task.
-      from:
+      as:
         type: string
         description: A runtime expression, if any, used to mutate and/or filter the output of the workflow or task.
-      to:
-        type: string
-        description: A runtime expression, if any, used to output data to the current context.
     description: Configures the output of a workflow or task.
+  export:
+    type: object
+    properties:
+      schema:
+        $ref: '#/$defs/schema'
+        description: The schema used to describe and validate the workflow context.
+      as:
+        type: string
+        description: A runtime expression, if any, used to export the output data to the context.
+    description: Set the content of the context. 
   retryPolicy:
     type: object
     properties:

custom-generator/pom.xml

@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.serverlessworkflow</groupId>
+    <artifactId>serverlessworkflow-parent</artifactId>
+    <version>7.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>custom-generator</artifactId>
+   <dependencies>
+        <dependency>
+            <groupId>org.jsonschema2pojo</groupId>
+            <artifactId>jsonschema2pojo-core</artifactId>
+        </dependency>
+   </dependencies>
+   <build>
+   <plugins>
+      <plugin>
+        <groupId>com.spotify.fmt</groupId>
+        <artifactId>fmt-maven-plugin</artifactId>
+        <configuration>
+            <sourceDirectory>src/main/java</sourceDirectory>
+            <testSourceDirectory>src/test/java</testSourceDirectory>
+            <verbose>false</verbose>
+            <filesNamePattern>.*\.java</filesNamePattern>
+            <skip>false</skip>
+            <skipSortingImports>false</skipSortingImports>
+            <style>google</style>
+        </configuration>
+        <executions>
+            <execution>
+                <goals>
+                    <goal>format</goal>
+                </goals>
+            </execution>
+        </executions>
+      </plugin>
+     </plugins>
+   </build>
+</project>