Merge pull request #41 from SentryMan/moduleReading

Fix Edge Cases in module parsing

Author: rbygrave

prism-core/src/main/java/io/avaje/prism/internal/ModuleInfoReaderWriter.java

@@ -113,27 +113,22 @@ public static void write(PrintWriter out, String packageName) {
             + "    var imports = new ArrayList<String>();\n"
             + "\n"
             + "    while (importMatcher.find()) {\n"
-            + "      imports.add(usesMatcher.group(1));\n"
+            + "      imports.add(importMatcher.group(1));\n"
             + "    }\n"
             + "\n"
             + "    while (providesMatcher.find()) {\n"
-            + "      String providedInterface = providesMatcher.group(1);\n"
+            + "      String providedInterface = resolveImport(imports,providesMatcher.group(1));\n"
             + "      String implementationClasses = providesMatcher.group(2);\n"
             + "\n"
-            + "      if (!providedInterface.contains(\".\")) {\n"
-            + "        implementationClasses = resolveImport(imports, providedInterface);\n"
-            + "      }\n"
             + "      List<String> implementations =\n"
             + "          Arrays.stream(implementationClasses.split(SPLIT_PATTERN))\n"
-            + "              .map(s -> s.contains(\".\") ? s : resolveImport(imports, providedInterface))\n"
+            + "              .map(s -> resolveImport(imports, s))\n"
             + "              .collect(toList());\n"
             + "      provides.add(new Provides(providedInterface, implementations));\n"
             + "    }\n"
             + "    while (usesMatcher.find()) {\n"
-            + "      String usedInterface = usesMatcher.group(1);\n"
-            + "      if (!usedInterface.contains(\".\")) {\n"
-            + "        usedInterface = resolveImport(imports, usedInterface);\n"
-            + "      }\n"
+            + "      String usedInterface = resolveImport(imports, usesMatcher.group(1));\n"
+            + "\n"
             + "      uses.add(new Uses(usedInterface));\n"
             + "    }\n"
             + "  }\n"
@@ -142,7 +137,7 @@ public static void write(PrintWriter out, String packageName) {
             + "    return imports.stream()\n"
             + "        .filter(s -> s.contains(providedInterface))\n"
             + "        .findFirst()\n"
-            + "        .orElse(providedInterface);\n"
+            + "        .orElse(providedInterface).replaceAll(\"\\\\s\", \"\");\n"
             + "  }\n"
             + "\n"
             + "  /**\n"