Merge branch 'main' into 2

soniasingla · web-flow · commit 869247146739 · 2021-05-07T00:11:17.000+05:30
diff --git a/.muse.toml b/.muse.toml
@@ -0,0 +1,5 @@
+# Ignore results from target directory
+ignoreFiles = """
+**/target/generated-sources/src/main/java/io/serverlessworkflow/api/states/DefaultState.java
+**/target/generated-sources/src/main/java/io/serverlessworkflow/api/error/Error.java
+"""
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/CronDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/CronDeserializer.java
@@ -19,20 +19,17 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import io.serverlessworkflow.api.cron.Cron;
 import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 public class CronDeserializer extends StdDeserializer<Cron> {
 
     private static final long serialVersionUID = 510l;
-    private static Logger logger = LoggerFactory.getLogger(CronDeserializer.class);
 
+    @SuppressWarnings("unused")
     private WorkflowPropertySource context;
 
     public CronDeserializer() {
@@ -52,7 +49,6 @@ public CronDeserializer(WorkflowPropertySource context) {
     public Cron deserialize(JsonParser jp,
                                    DeserializationContext ctxt) throws IOException {
 
-        ObjectMapper mapper = (ObjectMapper) jp.getCodec();
         JsonNode node = jp.getCodec().readTree(jp);
 
         Cron cron = new Cron();
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/EndDefinitionDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/EndDefinitionDeserializer.java
@@ -25,8 +25,6 @@
 import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
 import io.serverlessworkflow.api.produce.ProduceEvent;
 import io.serverlessworkflow.api.start.Start;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,8 +33,8 @@
 public class EndDefinitionDeserializer extends StdDeserializer<End> {
 
     private static final long serialVersionUID = 510l;
-    private static Logger logger = LoggerFactory.getLogger(EndDefinitionDeserializer.class);
 
+    @SuppressWarnings("unused")
     private WorkflowPropertySource context;
 
     public EndDefinitionDeserializer() {
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/EventsDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/EventsDeserializer.java
@@ -39,6 +39,7 @@ public class EventsDeserializer extends StdDeserializer<Events> {
     private static final long serialVersionUID = 510l;
     private static Logger logger = LoggerFactory.getLogger(EventsDeserializer.class);
 
+    @SuppressWarnings("unused")
     private WorkflowPropertySource context;
 
     public EventsDeserializer() {
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/FunctionRefDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/FunctionRefDeserializer.java
@@ -23,16 +23,14 @@
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import io.serverlessworkflow.api.functions.FunctionRef;
 import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 public class FunctionRefDeserializer extends StdDeserializer<FunctionRef> {
 
     private static final long serialVersionUID = 510l;
-    private static Logger logger = LoggerFactory.getLogger(FunctionRefDeserializer.class);
 
+    @SuppressWarnings("unused")
     private WorkflowPropertySource context;
 
     public FunctionRefDeserializer() {
@@ -59,7 +57,6 @@ public FunctionRef deserialize(JsonParser jp,
 
         if (!node.isObject()) {
             functionRef.setRefName(node.asText());
-            ObjectMapper objectMapper = new ObjectMapper();
             functionRef.setArguments(null);
             return functionRef;
         } else {
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/FunctionsDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/FunctionsDeserializer.java
@@ -39,6 +39,7 @@ public class FunctionsDeserializer extends StdDeserializer<Functions> {
     private static final long serialVersionUID = 510l;
     private static Logger logger = LoggerFactory.getLogger(FunctionsDeserializer.class);
 
+    @SuppressWarnings("unused")
     private WorkflowPropertySource context;
 
     public FunctionsDeserializer() {
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/RetriesDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/RetriesDeserializer.java
@@ -39,6 +39,7 @@ public class RetriesDeserializer extends StdDeserializer<Retries> {
     private static final long serialVersionUID = 510l;
     private static Logger logger = LoggerFactory.getLogger(RetriesDeserializer.class);
 
+    @SuppressWarnings("unused")
     private WorkflowPropertySource context;
 
     public RetriesDeserializer() {
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/ScheduleDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/ScheduleDeserializer.java
@@ -31,6 +31,7 @@ public class ScheduleDeserializer extends StdDeserializer<Schedule> {
 
     private static final long serialVersionUID = 510l;
 
+    @SuppressWarnings("unused")
     private WorkflowPropertySource context;
 
     public ScheduleDeserializer() {
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/StartDefinitionDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/StartDefinitionDeserializer.java
@@ -31,6 +31,7 @@ public class StartDefinitionDeserializer extends StdDeserializer<Start> {
 
     private static final long serialVersionUID = 510l;
 
+    @SuppressWarnings("unused")
     private WorkflowPropertySource context;
 
     public StartDefinitionDeserializer() {
diff --git a/api/src/main/java/io/serverlessworkflow/api/deserializers/TransitionDeserializer.java b/api/src/main/java/io/serverlessworkflow/api/deserializers/TransitionDeserializer.java
@@ -33,6 +33,7 @@ public class TransitionDeserializer extends StdDeserializer<Transition> {
 
     private static final long serialVersionUID = 510l;
 
+    @SuppressWarnings("unused")
     private WorkflowPropertySource context;
 
     public TransitionDeserializer() {
diff --git a/api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java b/api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java
@@ -29,7 +29,7 @@ public BaseObjectMapper(JsonFactory factory,
                             WorkflowPropertySource workflowPropertySource) {
         super(factory);
 
-        workflowModule = new WorkflowModule((workflowPropertySource));
+        workflowModule = new WorkflowModule(workflowPropertySource);
 
         configure(SerializationFeature.INDENT_OUTPUT,
                 true);
diff --git a/api/src/main/java/io/serverlessworkflow/api/mapper/YamlObjectMapper.java b/api/src/main/java/io/serverlessworkflow/api/mapper/YamlObjectMapper.java
@@ -26,6 +26,6 @@ public YamlObjectMapper() {
     }
 
     public YamlObjectMapper(WorkflowPropertySource context) {
-        super((new YAMLFactory()).enable(Feature.MINIMIZE_QUOTES), context);
+        super(new YAMLFactory().enable(Feature.MINIMIZE_QUOTES), context);
     }
 }
diff --git a/api/src/main/java/io/serverlessworkflow/api/schemaclient/ResourceSchemaClient.java b/api/src/main/java/io/serverlessworkflow/api/schemaclient/ResourceSchemaClient.java
@@ -23,6 +23,7 @@
 
 public class ResourceSchemaClient implements SchemaClient {
 
+    @SuppressWarnings("unused")
     private final SchemaClient fallbackClient;
     private final String baseResourcePath = "/schema/";
 
@@ -31,6 +32,7 @@ public ResourceSchemaClient(SchemaClient fallbackClient) {
                 "fallbackClient cannot be null");
     }
 
+    @Override
     public InputStream get(String path) {
         path = path.substring("https://wg-serverless.org/".length());
         return this.getClass().getResourceAsStream(baseResourcePath + path);
diff --git a/api/src/main/java/io/serverlessworkflow/api/utils/Utils.java b/api/src/main/java/io/serverlessworkflow/api/utils/Utils.java
@@ -23,6 +23,8 @@
 import java.util.stream.Collectors;
 
 public class Utils {
+
+    @SuppressWarnings("DefaultCharset")
     public static String getResourceFileAsString(String fileName) throws IOException {
         ClassLoader classLoader = ClassLoader.getSystemClassLoader();
         try (InputStream is = classLoader.getResourceAsStream(fileName)) {
diff --git a/diagram/src/main/java/io/serverlessworkflow/diagram/WorkflowDiagramImpl.java b/diagram/src/main/java/io/serverlessworkflow/diagram/WorkflowDiagramImpl.java
@@ -22,16 +22,14 @@
 import net.sourceforge.plantuml.FileFormat;
 import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.SourceStringReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.Charset;
 
 public class WorkflowDiagramImpl implements WorkflowDiagram {
 
-    private static final Logger logger = LoggerFactory.getLogger(WorkflowDiagramImpl.class);
 
+    @SuppressWarnings("unused")
     private String source;
     private Workflow workflow;
     private boolean showLegend = false;
diff --git a/diagram/src/main/java/io/serverlessworkflow/diagram/model/ModelConnection.java b/diagram/src/main/java/io/serverlessworkflow/diagram/model/ModelConnection.java
@@ -31,7 +31,7 @@ public ModelConnection(String left, String right, String desc) {
 
     @Override
     public String toString() {
-        StringBuffer retBuff = new StringBuffer();
+        StringBuilder retBuff = new StringBuilder();
         retBuff.append(System.lineSeparator());
         retBuff.append(left.equals(WorkflowDiagramUtils.wfStart) ? WorkflowDiagramUtils.startEnd : left);
         retBuff.append(WorkflowDiagramUtils.connection);
diff --git a/diagram/src/main/java/io/serverlessworkflow/diagram/model/ModelState.java b/diagram/src/main/java/io/serverlessworkflow/diagram/model/ModelState.java
@@ -22,6 +22,8 @@
 import java.util.List;
 
 public class ModelState {
+
+    @SuppressWarnings("unused")
     private String name;
     private String noSpaceName;
     private List<String> stateInfo = new ArrayList<>();
@@ -37,7 +39,7 @@ public void addInfo(String info) {
 
     @Override
     public String toString() {
-        StringBuffer retBuff = new StringBuffer();
+        StringBuilder retBuff = new StringBuilder();
         retBuff.append(System.lineSeparator());
         for(String info : stateInfo) {
             retBuff.append(noSpaceName).append(WorkflowDiagramUtils.description)
diff --git a/diagram/src/main/java/io/serverlessworkflow/diagram/model/ModelStateDef.java b/diagram/src/main/java/io/serverlessworkflow/diagram/model/ModelStateDef.java
@@ -31,7 +31,7 @@ public ModelStateDef(String name, String type) {
 
     @Override
     public String toString() {
-        StringBuffer retBuff = new StringBuffer();
+        StringBuilder retBuff = new StringBuilder();
         retBuff.append(WorkflowDiagramUtils.stateDef)
                 .append(noSpaceName)
                 .append(WorkflowDiagramUtils.stateAsName)
diff --git a/diagram/src/main/java/io/serverlessworkflow/diagram/model/WorkflowDiagramModel.java b/diagram/src/main/java/io/serverlessworkflow/diagram/model/WorkflowDiagramModel.java
@@ -49,7 +49,7 @@ private void inspect(Workflow workflow) {
         // title
         setTitle(workflow.getName());
         if (workflow.getVersion() != null && workflow.getVersion().trim().length() > 0) {
-            StringBuffer titleBuf = new StringBuffer()
+            StringBuilder titleBuf = new StringBuilder()
                     .append(workflow.getName())
                     .append(WorkflowDiagramUtils.versionSeparator)
                     .append(workflow.getVersion());
@@ -58,7 +58,7 @@ private void inspect(Workflow workflow) {
 
         // legend
         if (workflow.getDescription() != null && workflow.getDescription().trim().length() > 0) {
-            StringBuffer legendBuff = new StringBuffer()
+            StringBuilder legendBuff = new StringBuilder()
                     .append(WorkflowDiagramUtils.legendStart)
                     .append(workflow.getDescription())
                     .append(WorkflowDiagramUtils.legendEnd);
diff --git a/diagram/src/main/java/io/serverlessworkflow/diagram/utils/WorkflowDiagramUtils.java b/diagram/src/main/java/io/serverlessworkflow/diagram/utils/WorkflowDiagramUtils.java
@@ -32,7 +32,8 @@ public class WorkflowDiagramUtils {
     public static final String description = " : ";
     public static final String title = "title ";
     public static final String footer = "center footer Serverless Workflow Specification - serverlessworkflow.io";
-    public static final String legendEnd = new StringBuffer().append(System.lineSeparator()).append("endlegend").toString();
+    public static final String legendStart = new StringBuilder().append("legend top center").append(System.lineSeparator()).toString();
+    public static final String legendEnd = new StringBuilder().append(System.lineSeparator()).append("endlegend").toString();
     public static final String stateDef = "state ";
     public static final String stateAsName = " as ";
     public static final String typeDefStart = " << ";
diff --git a/validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java b/validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java
@@ -45,7 +45,7 @@ public class WorkflowValidatorImpl implements WorkflowValidator {
 
     private static final Logger logger = LoggerFactory.getLogger(WorkflowValidatorImpl.class);
     private boolean schemaValidationEnabled = true;
-    private List<ValidationError> validationErrors = new ArrayList();
+    private List<ValidationError> validationErrors = new ArrayList<>();
     private Schema workflowSchema = WorkflowSchemaLoader.getWorkflowSchema();
     private String source;
     private Workflow workflow;
@@ -388,7 +388,7 @@ private void addValidationError(String message,
     private class Validation {
 
         final Set<String> events = new HashSet<>();
-        final Set<String> functions = new HashSet();
+        final Set<String> functions = new HashSet<>();
         final Set<String> states = new HashSet<>();
         Integer endStates = 0;
 
