Merge branch 'main' into issue_225

ricardozanini · web-flow · commit 586936d605d3 · 2024-05-27T14:42:34.000-03:00
diff --git a/.github/project.yml b/.github/project.yml
@@ -0,0 +1,3 @@
+release:
+  current-version: 5.0.0
+  next-version: 6.0.0-SNAPSHOT
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Verify JAVA SDK
+name: sdk-java Verify
 
 on:
   push:
@@ -14,17 +14,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Cache Maven packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
-    - name: Verify with Maven
-      run: |
-        mvn -B -f pom.xml clean install verify
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+          cache: 'maven'
+
+      - name: Verify with Maven
+        run: |
+          mvn -B -f pom.xml clean install verify
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -0,0 +1,25 @@
+name: sdk-java Pre Release
+
+on:
+  pull_request:
+    paths:
+      - '.github/project.yml'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    name: pre release
+
+    steps:
+      - uses: radcortez/project-metadata-action@master
+        name: retrieve project metadata
+        id: metadata
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          metadata-file-path: '.github/project.yml'
+
+      - name: Validate version
+        if: contains(steps.metadata.outputs.current-version, 'SNAPSHOT')
+        run: |
+          echo '::error::Cannot release a SNAPSHOT version.'
+          exit 1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,60 @@
+name: sdk-java Release
+
+on:
+  pull_request:
+    types: [closed]
+    paths:
+      - '.github/project.yml'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    name: release
+    if: ${{github.event.pull_request.merged == true}}
+
+    steps:
+      - uses: radcortez/project-metadata-action@main
+        name: Retrieve project metadata
+        id: metadata
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          metadata-file-path: '.github/project.yml'
+
+      - uses: actions/checkout@v3
+
+      - name: Import GPG key
+        id: import_gpg
+        uses: crazy-max/ghaction-import-gpg@v5
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+          cache: 'maven'
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+
+      - name: Configure Git author
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+
+      - name: Maven release ${{steps.metadata.outputs.current-version}}
+        run: |
+          git checkout -b release
+          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
+          cat release.properties
+          git checkout ${{github.base_ref}}
+          git rebase release
+          mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+
+      - name: Push tags
+        run: git push && git push --tags
diff --git a/README.md b/README.md
@@ -20,8 +20,7 @@ to parse and validate workflow definitions as well as generate the workflow diag
 
 | Latest Releases | Conformance to spec version |
 | :---: | :---: |
-| [4.0.4.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/4.0.4.Final) | [v0.8](https://github.com/serverlessworkflow/specification/tree/0.8.x) |
-| [4.0.3.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/4.0.3.Final) | [v0.8](https://github.com/serverlessworkflow/specification/tree/0.8.x) |
+| [4.0.5.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/4.0.5.Final) | [v0.8](https://github.com/serverlessworkflow/specification/tree/0.8.x) |
 | [3.0.0.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/3.0.0.Final) | [v0.7](https://github.com/serverlessworkflow/specification/tree/0.7.x) |
 | [2.0.0.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/2.0.0.Final) | [v0.6](https://github.com/serverlessworkflow/specification/tree/0.6.x) |
 | [1.0.3.Final](https://github.com/serverlessworkflow/sdk-java/releases/tag/1.0.3.Final) | [v0.5](https://github.com/serverlessworkflow/specification/tree/0.5.x) |
diff --git a/api/pom.xml b/api/pom.xml
@@ -145,7 +145,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.coveo</groupId>
+                <groupId>com.spotify.fmt</groupId>
                 <artifactId>fmt-maven-plugin</artifactId>
                 <configuration>
                     <sourceDirectory>src/main/java</sourceDirectory>
diff --git a/api/src/main/java/io/serverlessworkflow/api/workflow/Auth.java b/api/src/main/java/io/serverlessworkflow/api/workflow/Auth.java
@@ -17,10 +17,11 @@
 package io.serverlessworkflow.api.workflow;
 
 import io.serverlessworkflow.api.auth.AuthDefinition;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Auth {
+public class Auth implements Serializable {
   private String refValue;
   private List<AuthDefinition> authDefs;
 
diff --git a/api/src/main/java/io/serverlessworkflow/api/workflow/Constants.java b/api/src/main/java/io/serverlessworkflow/api/workflow/Constants.java
@@ -16,8 +16,9 @@
 package io.serverlessworkflow.api.workflow;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import java.io.Serializable;
 
-public class Constants {
+public class Constants implements Serializable {
   private String refValue;
   private JsonNode constantsDef;
 
diff --git a/api/src/main/java/io/serverlessworkflow/api/workflow/DataInputSchema.java b/api/src/main/java/io/serverlessworkflow/api/workflow/DataInputSchema.java
@@ -16,8 +16,9 @@
 package io.serverlessworkflow.api.workflow;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import java.io.Serializable;
 
-public class DataInputSchema {
+public class DataInputSchema implements Serializable {
   private String refValue;
   private JsonNode schemaDef;
   private boolean failOnValidationErrors = true;
diff --git a/api/src/main/java/io/serverlessworkflow/api/workflow/Errors.java b/api/src/main/java/io/serverlessworkflow/api/workflow/Errors.java
@@ -16,9 +16,10 @@
 package io.serverlessworkflow.api.workflow;
 
 import io.serverlessworkflow.api.error.ErrorDefinition;
+import java.io.Serializable;
 import java.util.List;
 
-public class Errors {
+public class Errors implements Serializable {
   private String refValue;
   private List<ErrorDefinition> errorDefs;
 
diff --git a/api/src/main/java/io/serverlessworkflow/api/workflow/Events.java b/api/src/main/java/io/serverlessworkflow/api/workflow/Events.java
@@ -16,9 +16,10 @@
 package io.serverlessworkflow.api.workflow;
 
 import io.serverlessworkflow.api.events.EventDefinition;
+import java.io.Serializable;
 import java.util.List;
 
-public class Events {
+public class Events implements Serializable {
   private String refValue;
   private List<EventDefinition> eventDefs;
 
diff --git a/api/src/main/java/io/serverlessworkflow/api/workflow/Functions.java b/api/src/main/java/io/serverlessworkflow/api/workflow/Functions.java
@@ -16,9 +16,10 @@
 package io.serverlessworkflow.api.workflow;
 
 import io.serverlessworkflow.api.functions.FunctionDefinition;
+import java.io.Serializable;
 import java.util.List;
 
-public class Functions {
+public class Functions implements Serializable {
   private String refValue;
   private List<FunctionDefinition> functionDefs;
 
diff --git a/api/src/main/java/io/serverlessworkflow/api/workflow/Retries.java b/api/src/main/java/io/serverlessworkflow/api/workflow/Retries.java
@@ -16,9 +16,10 @@
 package io.serverlessworkflow.api.workflow;
 
 import io.serverlessworkflow.api.retry.RetryDefinition;
+import java.io.Serializable;
 import java.util.List;
 
-public class Retries {
+public class Retries implements Serializable {
   private String refValue;
   private List<RetryDefinition> retryDefs;
 
diff --git a/api/src/main/java/io/serverlessworkflow/api/workflow/Secrets.java b/api/src/main/java/io/serverlessworkflow/api/workflow/Secrets.java
@@ -15,9 +15,10 @@
  */
 package io.serverlessworkflow.api.workflow;
 
+import java.io.Serializable;
 import java.util.List;
 
-public class Secrets {
+public class Secrets implements Serializable {
   private String refValue;
   private List<String> secretDefs;
 
diff --git a/api/src/main/resources/schema/states/switchstate.json b/api/src/main/resources/schema/states/switchstate.json
@@ -36,6 +36,6 @@
     }
   },
   "required": [
-    "default"
+    "defaultCondition"
   ]
 }
diff --git a/api/src/main/resources/schema/workflow.json b/api/src/main/resources/schema/workflow.json
@@ -11,7 +11,8 @@
   "properties": {
     "id": {
       "type": "string",
-      "description": "Workflow unique identifier"
+      "description": "Workflow unique identifier",
+      "minLength": 1
     },
     "key": {
       "type": "string",
@@ -160,6 +161,7 @@
     }
   },
  "required": [
+        "id",
         "name",
         "version",
         "states"
diff --git a/api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java b/api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java
@@ -41,7 +41,6 @@
 import io.serverlessworkflow.api.workflow.*;
 import java.util.List;
 import java.util.Map;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -263,7 +262,8 @@ public void testTransitions(String workflowLocation) {
     assertNotNull(cond2.getTransition().getProduceEvents());
     assertEquals(1, cond2.getTransition().getProduceEvents().size());
     assertNotNull(cond2.getTransition().getProduceEvents().get(0).getContextAttributes());
-    Map<String, String> contextAttributes = cond2.getTransition().getProduceEvents().get(0).getContextAttributes();
+    Map<String, String> contextAttributes =
+        cond2.getTransition().getProduceEvents().get(0).getContextAttributes();
     assertEquals(2, contextAttributes.size());
     assertEquals("IN", contextAttributes.get("order_location"));
     assertEquals("online", contextAttributes.get("order_type"));
diff --git a/diagram/pom.xml b/diagram/pom.xml
@@ -130,7 +130,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.coveo</groupId>
+                <groupId>com.spotify.fmt</groupId>
                 <artifactId>fmt-maven-plugin</artifactId>
                 <configuration>
                     <sourceDirectory>src/main/java</sourceDirectory>
diff --git a/pom.xml b/pom.xml
diff --git a/spi/pom.xml b/spi/pom.xml
diff --git a/utils/pom.xml b/utils/pom.xml
diff --git a/utils/src/main/java/io/serverlessworkflow/utils/WorkflowUtils.java b/utils/src/main/java/io/serverlessworkflow/utils/WorkflowUtils.java
diff --git a/validation/pom.xml b/validation/pom.xml
diff --git a/validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java b/validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+release:`
	`2`	`+ current-version: 5.0.0`
	`3`	`+ next-version: 6.0.0-SNAPSHOT`