[Fix #506] Change order of parameters in WorkflowReader

fjtirado · fjtirado · commit 5d56713915aa · 2024-12-27T11:38:01.000+01:00
diff --git 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
@@ -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
@@ -53,7 +53,7 @@ static void init() {
   @MethodSource("provideParameters")
   void testWorkflowExecution(String fileName, Consumer<WorkflowDefinition> assertions)
       throws IOException {
-    assertions.accept(appl.workflowDefinition(readWorkflowFromClasspath(validation(), fileName)));
+    assertions.accept(appl.workflowDefinition(readWorkflowFromClasspath(fileName, validation())));
   }
 
   private static Stream<Arguments> provideParameters() {

Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,11 @@ public static Workflow readWorkflow(byte[] input, WorkflowFormat format) throws`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public static Workflow readWorkflow(Path path) throws IOException {`
`41`		`- return readWorkflow(defaultReader(), path, WorkflowFormat.fromPath(path));`
	`41`	`+ return readWorkflow(path, WorkflowFormat.fromPath(path), defaultReader());`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public static Workflow readWorkflow(Path path, WorkflowFormat format) throws IOException {`
`45`		`- return readWorkflow(defaultReader(), path, format);`
	`45`	`+ return readWorkflow(path, format, defaultReader());`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public static Workflow readWorkflowFromString(String input, WorkflowFormat format)`
`@@ -51,35 +51,35 @@ public static Workflow readWorkflowFromString(String input, WorkflowFormat forma`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public static Workflow readWorkflowFromClasspath(String classpath) throws IOException {`
`54`		`- return readWorkflowFromClasspath(defaultReader(), classpath);`
	`54`	`+ return readWorkflowFromClasspath(classpath, defaultReader());`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public static Workflow readWorkflowFromClasspath(`
`58`	`58`	`String classpath, ClassLoader cl, WorkflowFormat format) throws IOException {`
`59`		`- return readWorkflowFromClasspath(defaultReader(), classpath);`
	`59`	`+ return readWorkflowFromClasspath(classpath, defaultReader());`
`60`	`60`	`}`
`61`	`61`
`62`		`- public static Workflow readWorkflow(WorkflowReaderOperations reader, Path path)`
	`62`	`+ public static Workflow readWorkflow(Path path, WorkflowReaderOperations reader)`
`63`	`63`	`throws IOException {`
`64`		`- return readWorkflow(reader, path, WorkflowFormat.fromPath(path));`
	`64`	`+ return readWorkflow(path, WorkflowFormat.fromPath(path), reader);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public static Workflow readWorkflow(`
`68`		`- WorkflowReaderOperations reader, Path path, WorkflowFormat format) throws IOException {`
	`68`	`+ Path path, WorkflowFormat format, WorkflowReaderOperations reader) throws IOException {`
`69`	`69`	`return reader.read(Files.readAllBytes(path), format);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public static Workflow readWorkflowFromClasspath(`
`73`		`- WorkflowReaderOperations reader, String classpath) throws IOException {`
	`73`	`+ String classpath, WorkflowReaderOperations reader) throws IOException {`
`74`	`74`	`return readWorkflowFromClasspath(`
`75`		`- reader,`
`76`	`75`	`classpath,`
`77`	`76`	`Thread.currentThread().getContextClassLoader(),`
`78`		`- WorkflowFormat.fromFileName(classpath));`
	`77`	`+ WorkflowFormat.fromFileName(classpath),`
	`78`	`+ reader);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public static Workflow readWorkflowFromClasspath(`
`82`		`- WorkflowReaderOperations reader, String classpath, ClassLoader cl, WorkflowFormat format)`
	`82`	`+ String classpath, ClassLoader cl, WorkflowFormat format, WorkflowReaderOperations reader)`
`83`	`83`	`throws IOException {`
`84`	`84`	`try (InputStream in = cl.getResourceAsStream(classpath)) {`
`85`	`85`	`if (in == null) {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public class FeaturesTest {`
`60`	`60`	`"features/call-http-query-parameters.yaml"`
`61`	`61`	`})`
`62`	`62`	`public void testSpecFeaturesParsing(String workflowLocation) throws IOException {`
`63`		`- Workflow workflow = readWorkflowFromClasspath(validation(), workflowLocation);`
	`63`	`+ Workflow workflow = readWorkflowFromClasspath(workflowLocation, validation());`
`64`	`64`	`assertWorkflow(workflow);`
`65`	`65`	`assertWorkflowEquals(workflow, writeAndReadInMemory(workflow));`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static void init() {`
`53`	`53`	`@MethodSource("provideParameters")`
`54`	`54`	`void testWorkflowExecution(String fileName, Consumer<WorkflowDefinition> assertions)`
`55`	`55`	`throws IOException {`
`56`		`- assertions.accept(appl.workflowDefinition(readWorkflowFromClasspath(validation(), fileName)));`
	`56`	`+ assertions.accept(appl.workflowDefinition(readWorkflowFromClasspath(fileName, validation())));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`private static Stream<Arguments> provideParameters() {`