Fix reflection issue inside gradle plugin

RoRoche · May 6, 2020 · 175cbac · 175cbac
1 parent 8710e27
commit 175cbac
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/src/main/groovy/com/github/roroche/plantuml/tasks/BuildClassDiagramTask.groovy b/src/main/groovy/com/github/roroche/plantuml/tasks/BuildClassDiagramTask.groovy
@@ -41,15 +41,7 @@ class BuildClassDiagramTask extends DefaultTask implements CustomTask {
                 "Classes to ignore: {}",
                 extension.ignoredClasses
         )
-        getLogger().lifecycle(
-                "URLs to scan: " + project.sourceSets.main.output.classesDirs.files
-        )
-        final URL[] urls = project.sourceSets.main.output.classesDirs.files.collect { File dir ->
-            dir.listFiles()
-        }.flatten().collect {
-            getLogger().lifecycle(
-                    "File?: " + it
-            )
+        final URL[] urls = project.sourceSets.main.output.classesDirs.files.collect {
             if (it != null) {
                 it.toURI().toURL()
             }

diff --git a/src/main/kotlin/com/github/roroche/plantuml/classes/ClsInPackage.kt b/src/main/kotlin/com/github/roroche/plantuml/classes/ClsInPackage.kt
@@ -5,6 +5,7 @@ import org.reflections.Configuration
 import org.reflections.Reflections
 import org.reflections.scanners.SubTypesScanner
 import org.reflections.scanners.TypeAnnotationsScanner
+import org.reflections.util.ClasspathHelper
 import org.reflections.util.ConfigurationBuilder
 import java.net.URL
 import java.net.URLClassLoader
@@ -42,13 +43,12 @@ class ClsInPackage(
      */
     constructor(
         packageName: String,
-        urls: Array<URL>,
         classLoader: ClassLoader
     ) : this(
         packageName = packageName,
         configuration = ConfigurationBuilder(
         ).setUrls(
-            urls.toList()
+            ClasspathHelper.forClassLoader(classLoader)
         ).setScanners(
             SubTypesScanner(false),
             TypeAnnotationsScanner()
@@ -68,7 +68,6 @@ class ClsInPackage(
         urls: Array<URL>
     ) : this(
         packageName = packageName,
-        urls = urls,
         classLoader = URLClassLoader(urls)
     )
 

diff --git a/src/test/groovy/com/github/roroche/plantuml/BuildClassDiagramTaskTest.groovy b/src/test/groovy/com/github/roroche/plantuml/BuildClassDiagramTaskTest.groovy
@@ -8,7 +8,6 @@ import com.github.roroche.plantuml.tasks.BuildClassDiagramTask
 import com.github.roroche.plantuml.tasks.ClassDiagramExtension
 import com.pragmaticobjects.oo.tests.TestCase
 import com.pragmaticobjects.oo.tests.junit5.TestsSuite
-import org.gradle.testfixtures.ProjectBuilder
 import org.junit.jupiter.api.io.TempDir
 
 import java.nio.file.Path
@@ -23,7 +22,7 @@ class BuildClassDiagramTaskTest extends TestsSuite {
                         "test buildClassDiagramTask",
                         new CreateTaskAssertion(
                                 new CreatedTask(
-                                        ProjectBuilder.builder().build(),
+                                        BuiltProject.instance.toProject(),
                                         "buildClassDiagramTask",
                                         BuildClassDiagramTask.class,
                                         new ClassDiagramExtension(
@@ -39,7 +38,7 @@ class BuildClassDiagramTaskTest extends TestsSuite {
                         "test buildClassDiagramTask print diagram to file",
                         new ExecuteTaskAssertion(
                                 new CreatedTask(
-                                        ProjectBuilder.builder().build(),
+                                        BuiltProject.instance.toProject(),
                                         "buildClassDiagramTask",
                                         BuildClassDiagramTask.class,
                                         new ClassDiagramExtension(

diff --git a/src/test/groovy/com/github/roroche/plantuml/BuiltProject.groovy b/src/test/groovy/com/github/roroche/plantuml/BuiltProject.groovy
@@ -14,6 +14,7 @@ class BuiltProject {
      * @return The Project instance.
      */
     Project toProject() {
+        project.sourceSets.main.output.classesDirs = project.buildDir.toPath().resolve("classes").resolve("java")
         return project
     }
 }