Incorporate dmitrii's review

Signed-off-by: Ricardo Zanini <[email protected]>

Author: ricardozanini

mermaid/src/test/java/io/serverlessworkflow/mermaid/ClasspathYamlFinder.java

@@ -17,7 +17,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.net.JarURLConnection;
 import java.net.URL;
 import java.net.URLDecoder;
@@ -63,58 +62,50 @@ private static String normalizeBase(String base) {
     return b;
   }
 
-  private static Collection<String> scanFileUrl(URL url, String prefix) {
-    try {
-      Path root = Paths.get(URLDecoder.decode(url.getPath(), StandardCharsets.UTF_8));
-      if (!Files.exists(root)) return List.of();
+  private static Collection<String> scanFileUrl(URL url, String prefix) throws IOException {
+    Path root = Paths.get(URLDecoder.decode(url.getPath(), StandardCharsets.UTF_8));
+    if (!Files.exists(root)) return List.of();
 
-      // If we resolved exactly "<classpathRoot>/<prefix>/", we should prepend "prefix/"
-      // to the relativized filenames to mirror the JAR behaviour.
-      String rootStr = root.normalize().toString().replace('\\', '/');
-      boolean rootIsPrefixDir = !prefix.isEmpty() && rootStr.endsWith("/" + prefix);
+    // If we resolved exactly "<classpathRoot>/<prefix>/", we should prepend "prefix/"
+    // to the relativized filenames to mirror the JAR behaviour.
+    String rootStr = root.normalize().toString().replace('\\', '/');
+    boolean rootIsPrefixDir = !prefix.isEmpty() && rootStr.endsWith("/" + prefix);
 
-      try (Stream<Path> s = Files.walk(root)) {
-        return s.filter(Files::isRegularFile)
-            .filter(
-                p -> {
-                  String name = p.getFileName().toString().toLowerCase(Locale.ROOT);
-                  return name.endsWith(".yaml") || name.endsWith(".yml");
-                })
-            .map(
-                p -> {
-                  String rel = root.relativize(p).toString().replace(File.separatorChar, '/');
-                  // When scanning the specific prefix directory, add "prefix/" so callers get
-                  // paths relative to the classpath root, e.g. "workflows-samples/foo.yaml".
-                  return rootIsPrefixDir ? (prefix + "/" + rel) : rel;
-                })
-            .collect(Collectors.toCollection(LinkedHashSet::new));
-      }
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
+    try (Stream<Path> s = Files.walk(root)) {
+      return s.filter(Files::isRegularFile)
+          .filter(
+              p -> {
+                String name = p.getFileName().toString().toLowerCase(Locale.ROOT);
+                return name.endsWith(".yaml") || name.endsWith(".yml");
+              })
+          .map(
+              p -> {
+                String rel = root.relativize(p).toString().replace(File.separatorChar, '/');
+                // When scanning the specific prefix directory, add "prefix/" so callers get
+                // paths relative to the classpath root, e.g. "workflows-samples/foo.yaml".
+                return rootIsPrefixDir ? (prefix + "/" + rel) : rel;
+              })
+          .collect(Collectors.toCollection(LinkedHashSet::new));
     }
   }
 
-  private static Collection<String> scanJarUrl(URL url) {
-    try {
-      JarURLConnection conn = (JarURLConnection) url.openConnection();
-      try (JarFile jar = conn.getJarFile()) {
-        String dir = ensureDirPrefix(conn.getEntryName());
-        List<String> out = new ArrayList<>();
-        Enumeration<JarEntry> entries = jar.entries();
-        while (entries.hasMoreElements()) {
-          JarEntry je = entries.nextElement();
-          if (je.isDirectory()) continue;
-          String name = je.getName();
-          if (!name.startsWith(dir)) continue;
-          String lower = name.toLowerCase(Locale.ROOT);
-          if (lower.endsWith(".yaml") || lower.endsWith(".yml")) {
-            out.add(name);
-          }
+  private static Collection<String> scanJarUrl(URL url) throws IOException {
+    JarURLConnection conn = (JarURLConnection) url.openConnection();
+    try (JarFile jar = conn.getJarFile()) {
+      String dir = ensureDirPrefix(conn.getEntryName());
+      List<String> out = new ArrayList<>();
+      Enumeration<JarEntry> entries = jar.entries();
+      while (entries.hasMoreElements()) {
+        JarEntry je = entries.nextElement();
+        if (je.isDirectory()) continue;
+        String name = je.getName();
+        if (!name.startsWith(dir)) continue;
+        String lower = name.toLowerCase(Locale.ROOT);
+        if (lower.endsWith(".yaml") || lower.endsWith(".yml")) {
+          out.add(name);
         }
-        return out;
       }
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
+      return out;
     }
   }
 

mermaid/src/test/java/io/serverlessworkflow/mermaid/MermaidSmokeTest.java

@@ -15,37 +15,38 @@
  */
 package io.serverlessworkflow.mermaid;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.serverlessworkflow.api.WorkflowReader;
+import java.io.IOException;
+import java.util.stream.Stream;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 class MermaidSmokeTest {
 
   private static final String BASE = "workflows-samples"; // folder on test classpath
 
-  static java.util.stream.Stream<String> yamlSamples() {
-    try {
-      // First try the folder you expect, then rely on the fallback baked into the finder
-      var list = ClasspathYamlFinder.listYamlResources(BASE);
-      if (list.isEmpty()) {
-        throw new IllegalStateException(
-            """
-                        No YAML resources found on the test classpath.
-                        - Is serverlessworkflow-impl-test built and its *-tests.jar on the test classpath?
-                        - Are YAMLs under src/test/resources in that module?
-                        - Path inside JAR may differ from '/'.
-                        """);
-      }
-      return list.stream();
-    } catch (java.io.IOException e) {
-      throw new java.io.UncheckedIOException(e);
+  static Stream<String> yamlSamples() throws IOException {
+    // First try the folder you expect, then rely on the fallback baked into the finder
+    var list = ClasspathYamlFinder.listYamlResources(BASE);
+    if (list.isEmpty()) {
+      throw new IllegalStateException(
+          """
+                          No YAML resources found on the test classpath.
+                          - Is serverlessworkflow-impl-test built and its *-tests.jar on the test classpath?
+                          - Are YAMLs under src/test/resources in that module?
+                          - Path inside JAR may differ from '/'.
+                          """);
     }
+    return list.stream();
   }
 
   @ParameterizedTest(name = "{index} => {0}")
   @MethodSource("yamlSamples")
   void rendersBasicMermaidStructure(String resourcePath) throws Exception {
-    var wf = io.serverlessworkflow.api.WorkflowReader.readWorkflowFromClasspath(resourcePath);
+    var wf = WorkflowReader.readWorkflowFromClasspath(resourcePath);
     var mermaid = new io.serverlessworkflow.mermaid.Mermaid().from(wf);
-    org.assertj.core.api.Assertions.assertThat(mermaid).isNotBlank().contains("flowchart TD");
+    assertThat(mermaid).isNotBlank().contains("flowchart TD");
   }
 }