From d525aa7c7aab6157e26c31f50019d4dbbd66aef0 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti Date: Fri, 27 Dec 2024 11:38:01 +0100 Subject: [PATCH] [Fix #506] Change order of parameters in WorkflowReader Signed-off-by: Francisco Javier Tirado Sarti --- .../api/WorkflowReader.java | 22 +++++++++---------- .../serverlessworkflow/api/FeaturesTest.java | 2 +- .../impl/WorkflowDefinitionTest.java | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api/src/main/java/io/serverlessworkflow/api/WorkflowReader.java b/api/src/main/java/io/serverlessworkflow/api/WorkflowReader.java index f5eb3f2e..6868a6dc 100644 --- a/api/src/main/java/io/serverlessworkflow/api/WorkflowReader.java +++ b/api/src/main/java/io/serverlessworkflow/api/WorkflowReader.java @@ -38,11 +38,11 @@ public static Workflow readWorkflow(byte[] input, WorkflowFormat format) throws } public static Workflow readWorkflow(Path path) throws IOException { - return readWorkflow(defaultReader(), path, WorkflowFormat.fromPath(path)); + return readWorkflow(path, WorkflowFormat.fromPath(path), defaultReader()); } public static Workflow readWorkflow(Path path, WorkflowFormat format) throws IOException { - return readWorkflow(defaultReader(), path, format); + return readWorkflow(path, format, defaultReader()); } public static Workflow readWorkflowFromString(String input, WorkflowFormat format) @@ -51,35 +51,35 @@ public static Workflow readWorkflowFromString(String input, WorkflowFormat forma } public static Workflow readWorkflowFromClasspath(String classpath) throws IOException { - return readWorkflowFromClasspath(defaultReader(), classpath); + return readWorkflowFromClasspath(classpath, defaultReader()); } public static Workflow readWorkflowFromClasspath( String classpath, ClassLoader cl, WorkflowFormat format) throws IOException { - return readWorkflowFromClasspath(defaultReader(), classpath); + return readWorkflowFromClasspath(classpath, defaultReader()); } - public static Workflow readWorkflow(WorkflowReaderOperations reader, Path path) + public static Workflow readWorkflow(Path path, WorkflowReaderOperations reader) throws IOException { - return readWorkflow(reader, path, WorkflowFormat.fromPath(path)); + return readWorkflow(path, WorkflowFormat.fromPath(path), reader); } public static Workflow readWorkflow( - WorkflowReaderOperations reader, Path path, WorkflowFormat format) throws IOException { + Path path, WorkflowFormat format, WorkflowReaderOperations reader) throws IOException { return reader.read(Files.readAllBytes(path), format); } public static Workflow readWorkflowFromClasspath( - WorkflowReaderOperations reader, String classpath) throws IOException { + String classpath, WorkflowReaderOperations reader) throws IOException { return readWorkflowFromClasspath( - reader, classpath, Thread.currentThread().getContextClassLoader(), - WorkflowFormat.fromFileName(classpath)); + WorkflowFormat.fromFileName(classpath), + reader); } public static Workflow readWorkflowFromClasspath( - WorkflowReaderOperations reader, String classpath, ClassLoader cl, WorkflowFormat format) + String classpath, ClassLoader cl, WorkflowFormat format, WorkflowReaderOperations reader) throws IOException { try (InputStream in = cl.getResourceAsStream(classpath)) { if (in == null) { diff --git a/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java b/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java index 5d58e8b7..39d7045b 100644 --- a/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java +++ b/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java @@ -60,7 +60,7 @@ public class FeaturesTest { "features/call-http-query-parameters.yaml" }) public void testSpecFeaturesParsing(String workflowLocation) throws IOException { - Workflow workflow = readWorkflowFromClasspath(validation(), workflowLocation); + Workflow workflow = readWorkflowFromClasspath(workflowLocation, validation()); assertWorkflow(workflow); assertWorkflowEquals(workflow, writeAndReadInMemory(workflow)); } diff --git a/impl/core/src/test/java/io/serverlessworkflow/impl/WorkflowDefinitionTest.java b/impl/core/src/test/java/io/serverlessworkflow/impl/WorkflowDefinitionTest.java index c97f11e5..6ac708b7 100644 --- a/impl/core/src/test/java/io/serverlessworkflow/impl/WorkflowDefinitionTest.java +++ b/impl/core/src/test/java/io/serverlessworkflow/impl/WorkflowDefinitionTest.java @@ -53,7 +53,7 @@ static void init() { @MethodSource("provideParameters") void testWorkflowExecution(String fileName, Consumer assertions) throws IOException { - assertions.accept(appl.workflowDefinition(readWorkflowFromClasspath(validation(), fileName))); + assertions.accept(appl.workflowDefinition(readWorkflowFromClasspath(fileName, validation()))); } private static Stream provideParameters() { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy