[Fix_#359] Migration to 0.10 DSL

Author: fjtirado

api/pom.xml

@@ -17,10 +17,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -34,9 +30,10 @@
             <artifactId>jackson-dataformat-yaml</artifactId>
         </dependency>
         <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
+          <groupId>jakarta.validation</groupId>
+           <artifactId>jakarta.validation-api</artifactId>
         </dependency>
+ 
         <!-- test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -77,16 +74,20 @@
                 <groupId>org.jsonschema2pojo</groupId>
                 <artifactId>jsonschema2pojo-maven-plugin</artifactId>
                 <configuration>
-                    <sourceDirectory>${basedir}/src/main/resources/schema</sourceDirectory>
+                   <sourceDirectory>${basedir}/src/main/resources/schema</sourceDirectory>
+                   <!-- <sourcePaths>
+                      <sourcePath>https://raw.githubusercontent.com/serverlessworkflow/specification/main/schema/workflow.yaml</sourcePath>
+                    </sourcePaths> -->
+                    <sourceType>yamlschema</sourceType>
                     <targetPackage>io.serverlessworkflow.api.types</targetPackage>
                     <outputDirectory>${project.build.directory}/generated-sources/src/main/java</outputDirectory>
                     <includeJsr303Annotations>true</includeJsr303Annotations>
                     <generateBuilders>true</generateBuilders>
-                    <initializeCollections>false</initializeCollections>
-                    <includeAdditionalProperties>false</includeAdditionalProperties>
+                    <initializeCollections>true</initializeCollections>
+                    <includeAdditionalProperties>true</includeAdditionalProperties>
                     <includeToString>false</includeToString>
                     <includeHashcodeAndEquals>false</includeHashcodeAndEquals>
-                    <includeConstructors>true</includeConstructors>
+                    <includeConstructors>false</includeConstructors>
                     <constructorsRequiredPropertiesOnly>true</constructorsRequiredPropertiesOnly>
                     <serializable>true</serializable>
                     <targetVersion>${java.version}</targetVersion>

api/src/main/java/io/serverlessworkflow/api/mapper/JsonObjectMapperFactory.java renamed to api/src/main/java/io/serverlessworkflow/api/JsonObjectMapperFactory.java

@@ -13,15 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.mapper;
+package io.serverlessworkflow.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public class JsonObjectMapperFactory {
+class JsonObjectMapperFactory {
 
-  private static final ObjectMapper instance = new JsonObjectMapper();
+  private static final ObjectMapper instance =
+      ObjectMapperCommonConfig.configure(new ObjectMapper());
 
   public static final ObjectMapper mapper() {
     return instance;
   }
+
+  private JsonObjectMapperFactory() {}
 }

api/src/main/java/io/serverlessworkflow/api/mapper/YamlObjectMapperFactory.java renamed to api/src/main/java/io/serverlessworkflow/api/ObjectMapperCommonConfig.java

@@ -13,15 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.mapper;
+package io.serverlessworkflow.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 
-public class YamlObjectMapperFactory {
+class ObjectMapperCommonConfig {
 
-  private static final ObjectMapper instance = new YamlObjectMapper();
-
-  public static final ObjectMapper mapper() {
-    return instance;
+  public static ObjectMapper configure(ObjectMapper mapper) {
+    return mapper
+        .configure(SerializationFeature.INDENT_OUTPUT, true)
+        .configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false)
+        .configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false);
   }
+
+  private ObjectMapperCommonConfig() {}
 }

api/src/main/java/io/serverlessworkflow/api/validation/WorkflowSchemaLoader.java renamed to api/src/main/java/io/serverlessworkflow/api/WorkflowFormat.java

@@ -13,25 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.validation;
+package io.serverlessworkflow.api;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
-import java.io.UncheckedIOException;
+import java.nio.file.Path;
 
-public class WorkflowSchemaLoader {
+public enum WorkflowFormat {
+  JSON(JsonObjectMapperFactory.mapper()),
+  YAML(YamlObjectMapperFactory.mapper());
 
-  public static JsonNode getWorkflowSchema() {
-    try {
-      return ObjectMapperHolder.objectMapper.readTree(
-          WorkflowSchemaLoader.class.getResourceAsStream("/schema/workflow.json"));
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
+  private final ObjectMapper mapper;
+
+  public static WorkflowFormat fromPath(Path path) {
+    return fromFileName(path.getFileName().toString());
+  }
+
+  public static WorkflowFormat fromFileName(String fileName) {
+    return fileName.endsWith(".json") ? JSON : YAML;
+  }
+
+  private WorkflowFormat(ObjectMapper mapper) {
+    this.mapper = mapper;
   }
 
-  private static class ObjectMapperHolder {
-    public static final ObjectMapper objectMapper = new ObjectMapper();
+  public ObjectMapper mapper() {
+    return mapper;
   }
 }

api/src/main/java/io/serverlessworkflow/api/WorkflowReader.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.api;
+
+import io.serverlessworkflow.api.types.Workflow;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class WorkflowReader {
+
+  public static Workflow readWorkflow(InputStream input, WorkflowFormat format) throws IOException {
+    return format.mapper().readValue(input, Workflow.class);
+  }
+
+  public static Workflow readWorkflow(Reader input, WorkflowFormat format) throws IOException {
+    return format.mapper().readValue(input, Workflow.class);
+  }
+
+  public static Workflow readWorkflow(Path path, WorkflowFormat format) throws IOException {
+    return format.mapper().readValue(Files.readAllBytes(path), Workflow.class);
+  }
+
+  public static Workflow readWorkflowFromClasspath(String classpath) throws IOException {
+    return readWorkflowFromClasspath(
+        classpath,
+        Thread.currentThread().getContextClassLoader(),
+        WorkflowFormat.fromFileName(classpath));
+  }
+
+  public static Workflow readWorkflowFromClasspath(
+      String classpath, ClassLoader cl, WorkflowFormat format) throws IOException {
+    try (InputStream in = cl.getResourceAsStream(classpath)) {
+      if (in == null) {
+        throw new FileNotFoundException(classpath);
+      }
+      return readWorkflow(in, format);
+    }
+  }
+
+  private WorkflowReader() {}
+}

api/src/main/java/io/serverlessworkflow/api/WorkflowWriter.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.api;
+
+import io.serverlessworkflow.api.types.Workflow;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class WorkflowWriter {
+
+  public static void writeWorkflow(OutputStream output, Workflow workflow, WorkflowFormat format)
+      throws IOException {
+    format.mapper().writeValue(output, workflow);
+  }
+
+  public static void writeWorkflow(Writer output, Workflow workflow, WorkflowFormat format)
+      throws IOException {
+    format.mapper().writeValue(output, workflow);
+  }
+
+  public static void writeWorkflow(Path output, Workflow workflow) throws IOException {
+    writeWorkflow(output, workflow, WorkflowFormat.fromPath(output));
+  }
+
+  public static void writeWorkflow(Path output, Workflow workflow, WorkflowFormat format)
+      throws IOException {
+    try (OutputStream out = Files.newOutputStream(output)) {
+      writeWorkflow(out, workflow, format);
+    }
+  }
+
+  private WorkflowWriter() {}
+}

api/src/main/java/io/serverlessworkflow/api/mapper/YamlObjectMapper.java renamed to api/src/main/java/io/serverlessworkflow/api/YamlObjectMapperFactory.java

@@ -13,18 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.mapper;
+package io.serverlessworkflow.api;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature;
-import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
 
-public class YamlObjectMapper extends BaseObjectMapper {
-  public YamlObjectMapper() {
-    this(null);
-  }
+class YamlObjectMapperFactory {
+
+  private static final ObjectMapper instance =
+      ObjectMapperCommonConfig.configure(
+          new ObjectMapper(new YAMLFactory().enable(Feature.MINIMIZE_QUOTES)));
 
-  public YamlObjectMapper(WorkflowPropertySource context) {
-    super(new YAMLFactory().enable(Feature.MINIMIZE_QUOTES), context);
+  public static final ObjectMapper mapper() {
+    return instance;
   }
+
+  private YamlObjectMapperFactory() {}
 }