Skip to content

Commit 9d4564f

Browse files
radtristeradtriste
authored
Merge branch 'main' into issue_225
2 parents 8a6fc36 + 68fedde commit 9d4564f

35 files changed

+687
-548
lines changed

‎.github/dependabot.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "maven" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
assignees:
13+
- ricardozanini
14+
- tsurdilo

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.DS_Store
12
HELP.md
23
target/
34
!.mvn/wrapper/maven-wrapper.jar

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ to parse and validate workflow definitions as well as generate the workflow diag
2020

2121
| Latest Releases | Conformance to spec version |
2222
| :---: | :---: |
23+
| [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) |
2324
| [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) |
2425
| [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) |
2526
| [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) |

‎api/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
<artifactId>serverlessworkflow-api</artifactId>
1313
<name>Serverless Workflow :: API</name>
14-
<version>${project.parent.version}</version>
1514
<packaging>jar</packaging>
1615
<description>Java SDK for Serverless Workflow Specification</description>
1716

@@ -27,31 +26,19 @@
2726
<dependency>
2827
<groupId>com.fasterxml.jackson.core</groupId>
2928
<artifactId>jackson-core</artifactId>
30-
<version>[2.13.0,)</version>
3129
</dependency>
3230
<dependency>
3331
<groupId>com.fasterxml.jackson.core</groupId>
3432
<artifactId>jackson-databind</artifactId>
35-
<version>[2.13.0,)</version>
3633
</dependency>
3734
<dependency>
3835
<groupId>com.fasterxml.jackson.dataformat</groupId>
3936
<artifactId>jackson-dataformat-yaml</artifactId>
40-
<version>[2.13.0,)</version>
4137
</dependency>
4238
<dependency>
4339
<groupId>jakarta.validation</groupId>
4440
<artifactId>jakarta.validation-api</artifactId>
4541
</dependency>
46-
<dependency>
47-
<groupId>org.json</groupId>
48-
<artifactId>json</artifactId>
49-
</dependency>
50-
<dependency>
51-
<groupId>com.github.erosb</groupId>
52-
<artifactId>everit-json-schema</artifactId>
53-
</dependency>
54-
5542
<!-- test -->
5643
<dependency>
5744
<groupId>org.junit.jupiter</groupId>

‎api/src/main/java/io/serverlessworkflow/api/deserializers/AuthDeserializer.java‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@
2020
import com.fasterxml.jackson.databind.JsonNode;
2121
import com.fasterxml.jackson.databind.ObjectMapper;
2222
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
23-
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2423
import io.serverlessworkflow.api.auth.AuthDefinition;
2524
import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
2625
import io.serverlessworkflow.api.utils.Utils;
2726
import io.serverlessworkflow.api.workflow.Auth;
2827
import java.io.IOException;
2928
import java.util.ArrayList;
3029
import java.util.List;
31-
import org.json.JSONObject;
3230
import org.slf4j.Logger;
3331
import org.slf4j.LoggerFactory;
3432

@@ -69,21 +67,8 @@ public Auth deserialize(JsonParser jp, DeserializationContext ctxt) throws IOExc
6967
} else {
7068
String authFileDef = node.asText();
7169
String authFileSrc = Utils.getResourceFileAsString(authFileDef);
72-
JsonNode authRefNode;
73-
ObjectMapper jsonWriter = new ObjectMapper();
7470
if (authFileSrc != null && authFileSrc.trim().length() > 0) {
75-
// if its a yaml def convert to json first
76-
if (!authFileSrc.trim().startsWith("{")) {
77-
// convert yaml to json to validate
78-
ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
79-
Object obj = yamlReader.readValue(authFileSrc, Object.class);
80-
81-
authRefNode =
82-
jsonWriter.readTree(new JSONObject(jsonWriter.writeValueAsString(obj)).toString());
83-
} else {
84-
authRefNode = jsonWriter.readTree(new JSONObject(authFileSrc).toString());
85-
}
86-
71+
JsonNode authRefNode = Utils.getNode(authFileSrc);
8772
JsonNode refAuth = authRefNode.get("auth");
8873
if (refAuth != null) {
8974
for (final JsonNode nodeEle : refAuth) {

‎api/src/main/java/io/serverlessworkflow/api/deserializers/ConstantsDeserializer.java‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@
1818
import com.fasterxml.jackson.core.JsonParser;
1919
import com.fasterxml.jackson.databind.DeserializationContext;
2020
import com.fasterxml.jackson.databind.JsonNode;
21-
import com.fasterxml.jackson.databind.ObjectMapper;
2221
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
23-
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2422
import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
2523
import io.serverlessworkflow.api.utils.Utils;
2624
import io.serverlessworkflow.api.workflow.Constants;
2725
import java.io.IOException;
28-
import org.json.JSONObject;
2926
import org.slf4j.Logger;
3027
import org.slf4j.LoggerFactory;
3128

@@ -64,21 +61,8 @@ public Constants deserialize(JsonParser jp, DeserializationContext ctxt) throws
6461
String constantsFileDef = node.asText();
6562
constants.setRefValue(constantsFileDef);
6663
String constantsFileSrc = Utils.getResourceFileAsString(constantsFileDef);
67-
JsonNode constantsRefNode;
68-
ObjectMapper jsonWriter = new ObjectMapper();
6964
if (constantsFileSrc != null && constantsFileSrc.trim().length() > 0) {
70-
// if its a yaml def convert to json first
71-
if (!constantsFileSrc.trim().startsWith("{")) {
72-
// convert yaml to json to validate
73-
ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
74-
Object obj = yamlReader.readValue(constantsFileSrc, Object.class);
75-
76-
constantsRefNode =
77-
jsonWriter.readTree(new JSONObject(jsonWriter.writeValueAsString(obj)).toString());
78-
} else {
79-
constantsRefNode = jsonWriter.readTree(new JSONObject(constantsFileSrc).toString());
80-
}
81-
65+
JsonNode constantsRefNode = Utils.getNode(constantsFileSrc);
8266
JsonNode refConstants = constantsRefNode.get("constants");
8367
if (refConstants != null) {
8468
constantsDefinition = refConstants;

‎api/src/main/java/io/serverlessworkflow/api/deserializers/ErrorsDeserializer.java‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@
2020
import com.fasterxml.jackson.databind.JsonNode;
2121
import com.fasterxml.jackson.databind.ObjectMapper;
2222
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
23-
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2423
import io.serverlessworkflow.api.error.ErrorDefinition;
2524
import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
2625
import io.serverlessworkflow.api.utils.Utils;
2726
import io.serverlessworkflow.api.workflow.Errors;
2827
import java.io.IOException;
2928
import java.util.ArrayList;
3029
import java.util.List;
31-
import org.json.JSONObject;
3230
import org.slf4j.Logger;
3331
import org.slf4j.LoggerFactory;
3432

@@ -69,21 +67,8 @@ public Errors deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
6967
} else {
7068
String errorsFileDef = node.asText();
7169
String errorsFileSrc = Utils.getResourceFileAsString(errorsFileDef);
72-
JsonNode errorsRefNode;
73-
ObjectMapper jsonWriter = new ObjectMapper();
7470
if (errorsFileSrc != null && errorsFileSrc.trim().length() > 0) {
75-
// if its a yaml def convert to json first
76-
if (!errorsFileSrc.trim().startsWith("{")) {
77-
// convert yaml to json to validate
78-
ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
79-
Object obj = yamlReader.readValue(errorsFileSrc, Object.class);
80-
81-
errorsRefNode =
82-
jsonWriter.readTree(new JSONObject(jsonWriter.writeValueAsString(obj)).toString());
83-
} else {
84-
errorsRefNode = jsonWriter.readTree(new JSONObject(errorsFileSrc).toString());
85-
}
86-
71+
JsonNode errorsRefNode = Utils.getNode(errorsFileSrc);
8772
JsonNode refErrors = errorsRefNode.get("errors");
8873
if (refErrors != null) {
8974
for (final JsonNode nodeEle : refErrors) {

‎api/src/main/java/io/serverlessworkflow/api/deserializers/EventsDeserializer.java‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@
2020
import com.fasterxml.jackson.databind.JsonNode;
2121
import com.fasterxml.jackson.databind.ObjectMapper;
2222
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
23-
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2423
import io.serverlessworkflow.api.events.EventDefinition;
2524
import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
2625
import io.serverlessworkflow.api.utils.Utils;
2726
import io.serverlessworkflow.api.workflow.Events;
2827
import java.io.IOException;
2928
import java.util.ArrayList;
3029
import java.util.List;
31-
import org.json.JSONObject;
3230
import org.slf4j.Logger;
3331
import org.slf4j.LoggerFactory;
3432

@@ -69,21 +67,9 @@ public Events deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
6967
} else {
7068
String eventsFileDef = node.asText();
7169
String eventsFileSrc = Utils.getResourceFileAsString(eventsFileDef);
72-
JsonNode eventsRefNode;
73-
ObjectMapper jsonWriter = new ObjectMapper();
7470
if (eventsFileSrc != null && eventsFileSrc.trim().length() > 0) {
7571
// if its a yaml def convert to json first
76-
if (!eventsFileSrc.trim().startsWith("{")) {
77-
// convert yaml to json to validate
78-
ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
79-
Object obj = yamlReader.readValue(eventsFileSrc, Object.class);
80-
81-
eventsRefNode =
82-
jsonWriter.readTree(new JSONObject(jsonWriter.writeValueAsString(obj)).toString());
83-
} else {
84-
eventsRefNode = jsonWriter.readTree(new JSONObject(eventsFileSrc).toString());
85-
}
86-
72+
JsonNode eventsRefNode = Utils.getNode(eventsFileSrc);
8773
JsonNode refEvents = eventsRefNode.get("events");
8874
if (refEvents != null) {
8975
for (final JsonNode nodeEle : refEvents) {

‎api/src/main/java/io/serverlessworkflow/api/deserializers/FunctionsDeserializer.java‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@
2020
import com.fasterxml.jackson.databind.JsonNode;
2121
import com.fasterxml.jackson.databind.ObjectMapper;
2222
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
23-
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2423
import io.serverlessworkflow.api.functions.FunctionDefinition;
2524
import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
2625
import io.serverlessworkflow.api.utils.Utils;
2726
import io.serverlessworkflow.api.workflow.Functions;
2827
import java.io.IOException;
2928
import java.util.ArrayList;
3029
import java.util.List;
31-
import org.json.JSONObject;
3230
import org.slf4j.Logger;
3331
import org.slf4j.LoggerFactory;
3432

@@ -69,20 +67,9 @@ public Functions deserialize(JsonParser jp, DeserializationContext ctxt) throws
6967
String functionsFileDef = node.asText();
7068
String functionsFileSrc = Utils.getResourceFileAsString(functionsFileDef);
7169
JsonNode functionsRefNode;
72-
ObjectMapper jsonWriter = new ObjectMapper();
7370
if (functionsFileSrc != null && functionsFileSrc.trim().length() > 0) {
7471
// if its a yaml def convert to json first
75-
if (!functionsFileSrc.trim().startsWith("{")) {
76-
// convert yaml to json to validate
77-
ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
78-
Object obj = yamlReader.readValue(functionsFileSrc, Object.class);
79-
80-
functionsRefNode =
81-
jsonWriter.readTree(new JSONObject(jsonWriter.writeValueAsString(obj)).toString());
82-
} else {
83-
functionsRefNode = jsonWriter.readTree(new JSONObject(functionsFileSrc).toString());
84-
}
85-
72+
functionsRefNode = Utils.getNode(functionsFileSrc);
8673
JsonNode refFunctions = functionsRefNode.get("functions");
8774
if (refFunctions != null) {
8875
for (final JsonNode nodeEle : refFunctions) {

‎api/src/main/java/io/serverlessworkflow/api/deserializers/RetriesDeserializer.java‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@
2020
import com.fasterxml.jackson.databind.JsonNode;
2121
import com.fasterxml.jackson.databind.ObjectMapper;
2222
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
23-
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2423
import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
2524
import io.serverlessworkflow.api.retry.RetryDefinition;
2625
import io.serverlessworkflow.api.utils.Utils;
2726
import io.serverlessworkflow.api.workflow.Retries;
2827
import java.io.IOException;
2928
import java.util.ArrayList;
3029
import java.util.List;
31-
import org.json.JSONObject;
3230
import org.slf4j.Logger;
3331
import org.slf4j.LoggerFactory;
3432

@@ -69,21 +67,8 @@ public Retries deserialize(JsonParser jp, DeserializationContext ctxt) throws IO
6967
} else {
7068
String retriesFileDef = node.asText();
7169
String retriesFileSrc = Utils.getResourceFileAsString(retriesFileDef);
72-
JsonNode retriesRefNode;
73-
ObjectMapper jsonWriter = new ObjectMapper();
7470
if (retriesFileSrc != null && retriesFileSrc.trim().length() > 0) {
75-
// if its a yaml def convert to json first
76-
if (!retriesFileSrc.trim().startsWith("{")) {
77-
// convert yaml to json to validate
78-
ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
79-
Object obj = yamlReader.readValue(retriesFileSrc, Object.class);
80-
81-
retriesRefNode =
82-
jsonWriter.readTree(new JSONObject(jsonWriter.writeValueAsString(obj)).toString());
83-
} else {
84-
retriesRefNode = jsonWriter.readTree(new JSONObject(retriesFileSrc).toString());
85-
}
86-
71+
JsonNode retriesRefNode = Utils.getNode(retriesFileSrc);
8772
JsonNode refRetries = retriesRefNode.get("retries");
8873
if (refRetries != null) {
8974
for (final JsonNode nodeEle : refRetries) {

0 commit comments

Comments
 (0)