Remove ClassLoaderCache

detekt · Oct 4, 2021 · 194abe3 · 194abe3
1 parent da743dd
commit 194abe3
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 183 deletions.
diff --git a/...kt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/ClassLoaderCache.kt b/...kt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/ClassLoaderCache.kt
diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/invoke/DetektInvoker.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/invoke/DetektInvoker.kt
@@ -1,7 +1,5 @@
 package io.gitlab.arturbosch.detekt.invoke
 
-import io.gitlab.arturbosch.detekt.internal.ClassLoaderCache
-import io.gitlab.arturbosch.detekt.internal.GlobalClassLoaderCache
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
@@ -10,8 +8,6 @@ import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.workers.WorkAction
 import org.gradle.workers.WorkParameters
-import java.io.PrintStream
-import java.lang.reflect.InvocationTargetException
 
 internal interface DetektInvoker {
 
@@ -21,16 +17,6 @@ internal interface DetektInvoker {
         taskName: String,
         ignoreFailures: Boolean = false
     )
-
-    companion object {
-
-        fun create(isDryRun: Boolean): DetektInvoker =
-            if (isDryRun) {
-                DryRunInvoker()
-            } else {
-                DefaultCliInvoker()
-            }
-    }
 }
 
 private const val DRY_RUN_PROPERTY = "detekt-dry-run"
@@ -80,39 +66,6 @@ abstract class DetektWorkAction : WorkAction<DetektWorkParameters> {
         msg != null && "Build failed with" in msg && "issues" in msg
 }
 
-internal class DefaultCliInvoker(
-    private val classLoaderCache: ClassLoaderCache = GlobalClassLoaderCache
-) : DetektInvoker {
-
-    override fun invokeCli(
-        arguments: List<String>,
-        classpath: FileCollection,
-        taskName: String,
-        ignoreFailures: Boolean
-    ) {
-        try {
-            val loader = classLoaderCache.getOrCreate(classpath)
-            val clazz = loader.loadClass("io.gitlab.arturbosch.detekt.cli.Main")
-            val runner = clazz.getMethod(
-                "buildRunner",
-                Array<String>::class.java,
-                PrintStream::class.java,
-                PrintStream::class.java
-            ).invoke(null, arguments.toTypedArray(), System.out, System.err)
-            runner::class.java.getMethod("execute").invoke(runner)
-        } catch (reflectionWrapper: InvocationTargetException) {
-            val message = reflectionWrapper.targetException.message
-            if (message != null && isBuildFailure(message) && ignoreFailures) {
-                return
-            }
-            throw GradleException(message ?: "There was a problem running detekt.", reflectionWrapper)
-        }
-    }
-
-    private fun isBuildFailure(msg: String?) =
-        msg != null && "Build failed with" in msg && "issues" in msg
-}
-
 private class DryRunInvoker : DetektInvoker {
 
     override fun invokeCli(

diff --git a/...radle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/internal/ClassLoaderCacheSpec.kt b/...radle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/internal/ClassLoaderCacheSpec.kt
diff --git a/...gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/invoke/DefaultCliInvokerSpec.kt b/...gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/invoke/DefaultCliInvokerSpec.kt