fix #157 : service implementations could not be loaded

didi · Apr 16, 2020 · 546266e · 546266e
1 parent e5ce227
commit 546266e
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 12 deletions.
diff --git a/booster-build/src/main/kotlin/com/didiglobal/booster/build/BoosterServiceLoader.kt b/booster-build/src/main/kotlin/com/didiglobal/booster/build/BoosterServiceLoader.kt
@@ -0,0 +1,21 @@
+package com.didiglobal.booster.build
+
+import java.util.ServiceLoader
+
+/**
+ * @author johnsonlee
+ */
+class BoosterServiceLoader {
+
+    companion object {
+
+        fun <S : Any> load(service: Class<S>, classLoader: ClassLoader): List<S> = listOf(
+                ServiceLoader.load(service),
+                ServiceLoader.load(service, classLoader)
+        ).flatten().distinctBy {
+            it.javaClass
+        }
+
+    }
+
+}
diff --git a/booster-command/build.gradle b/booster-command/build.gradle
@@ -2,6 +2,6 @@ apply from: '../gradle/booster.gradle'
 
 dependencies {
     api gradleApi()
-    api project(":booster-kotlinx")
+    api project(":booster-build")
     api "commons-io:commons-io:2.6"
 }
diff --git a/booster-command/src/main/kotlin/com/didiglobal/booster/command/CommandService.kt b/booster-command/src/main/kotlin/com/didiglobal/booster/command/CommandService.kt
@@ -1,7 +1,7 @@
 package com.didiglobal.booster.command
 
+import com.didiglobal.booster.build.BoosterServiceLoader
 import java.io.File
-import java.util.ServiceLoader
 
 /**
  * Represents a command service
@@ -10,7 +10,7 @@ class CommandService {
 
     companion object {
 
-        private val commands = ServiceLoader.load(CommandProvider::class.java, Command::class.java.classLoader).map {
+        private val commands = BoosterServiceLoader.load(CommandProvider::class.java, Command::class.java.classLoader).map {
             it.get()
         }.flatten().map {
             it.name to it

diff --git a/booster-gradle-plugin/src/main/kotlin/com/didiglobal/booster/gradle/BoosterPlugin.kt b/booster-gradle-plugin/src/main/kotlin/com/didiglobal/booster/gradle/BoosterPlugin.kt
@@ -3,10 +3,10 @@ package com.didiglobal.booster.gradle
 import com.android.build.gradle.AppExtension
 import com.android.build.gradle.LibraryExtension
 import com.didiglobal.booster.annotations.Priority
+import com.didiglobal.booster.build.BoosterServiceLoader
 import com.didiglobal.booster.task.spi.VariantProcessor
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import java.util.ServiceLoader
 
 /**
  * Represents the booster gradle plugin
@@ -47,7 +47,7 @@ class BoosterPlugin : Plugin<Project> {
     }
 
     private val variantProcessors: Collection<VariantProcessor>
-        get() = ServiceLoader.load(VariantProcessor::class.java, javaClass.classLoader).sortedBy {
+        get() = BoosterServiceLoader.load(VariantProcessor::class.java, javaClass.classLoader).sortedBy {
             it.javaClass.getAnnotation(Priority::class.java)?.value ?: 0
         }
 

diff --git a/booster-gradle-plugin/src/main/kotlin/com/didiglobal/booster/gradle/BoosterTransform.kt b/booster-gradle-plugin/src/main/kotlin/com/didiglobal/booster/gradle/BoosterTransform.kt
@@ -6,10 +6,10 @@ import com.android.build.api.transform.TransformInvocation
 import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.internal.pipeline.TransformManager
 import com.android.build.gradle.internal.pipeline.TransformManager.SCOPE_FULL_PROJECT
+import com.didiglobal.booster.build.BoosterServiceLoader
 import com.didiglobal.booster.transform.AbstractKlassPool
 import com.didiglobal.booster.transform.Transformer
 import org.gradle.api.Project
-import java.util.ServiceLoader
 
 /**
  * Represents the transform base
@@ -21,7 +21,7 @@ open class BoosterTransform(val project: Project) : Transform() {
     /*
      * Preload transformers as List to fix NoSuchElementException caused by ServiceLoader in parallel mode
      */
-    internal val transformers = ServiceLoader.load(Transformer::class.java, javaClass.classLoader).toList()
+    internal val transformers = BoosterServiceLoader.load(Transformer::class.java, javaClass.classLoader).toList()
 
     private val android: BaseExtension = project.getAndroid()
 

diff --git a/booster-transform-asm/src/main/kotlin/com/didiglobal/booster/transform/asm/AsmTransformer.kt b/booster-transform-asm/src/main/kotlin/com/didiglobal/booster/transform/asm/AsmTransformer.kt
@@ -1,6 +1,7 @@
 package com.didiglobal.booster.transform.asm
 
 import com.didiglobal.booster.annotations.Priority
+import com.didiglobal.booster.build.BoosterServiceLoader
 import com.didiglobal.booster.transform.TransformContext
 import com.didiglobal.booster.transform.Transformer
 import com.google.auto.service.AutoService
@@ -11,7 +12,6 @@ import java.io.File
 import java.io.InputStream
 import java.lang.management.ManagementFactory
 import java.lang.management.ThreadMXBean
-import java.util.ServiceLoader
 import java.util.jar.JarFile
 
 /**
@@ -31,7 +31,7 @@ class AsmTransformer : Transformer {
     /*
      * Preload transformers as List to fix NoSuchElementException caused by ServiceLoader in parallel mode
      */
-    constructor() : this(*ServiceLoader.load(ClassTransformer::class.java, AsmTransformer::class.java.classLoader).toList().toTypedArray())
+    constructor() : this(*BoosterServiceLoader.load(ClassTransformer::class.java, AsmTransformer::class.java.classLoader).toList().toTypedArray())
 
     /**
      * For unit test only

diff --git a/booster-transform-javassist/build.gradle b/booster-transform-javassist/build.gradle
@@ -3,7 +3,7 @@ apply from: '../gradle/booster.gradle'
 dependencies {
     kapt "com.google.auto.service:auto-service:1.0-rc6"
     api project(':booster-annotations')
-    api project(':booster-kotlinx')
+    api project(':booster-build')
     api project(':booster-transform-spi')
     api 'org.javassist:javassist:3.25.0-GA'
     api 'com.google.auto.service:auto-service:1.0-rc6'

diff --git a/...assist/src/main/kotlin/com/didiglobal/booster/transform/javassist/JavassistTransformer.kt b/...assist/src/main/kotlin/com/didiglobal/booster/transform/javassist/JavassistTransformer.kt
@@ -1,6 +1,7 @@
 package com.didiglobal.booster.transform.javassist
 
 import com.didiglobal.booster.annotations.Priority
+import com.didiglobal.booster.build.BoosterServiceLoader
 import com.didiglobal.booster.transform.TransformContext
 import com.didiglobal.booster.transform.Transformer
 import com.google.auto.service.AutoService
@@ -9,7 +10,6 @@ import java.io.ByteArrayOutputStream
 import java.io.DataOutputStream
 import java.lang.management.ManagementFactory
 import java.lang.management.ThreadMXBean
-import java.util.ServiceLoader
 
 /**
  * Represents bytecode transformer using Javassist
@@ -30,7 +30,7 @@ class JavassistTransformer : Transformer {
     /*
      * Preload transformers as List to fix NoSuchElementException caused by ServiceLoader in parallel mode
      */
-    constructor() : this(*ServiceLoader.load(ClassTransformer::class.java, JavassistTransformer::class.java.classLoader).toList().toTypedArray())
+    constructor() : this(*BoosterServiceLoader.load(ClassTransformer::class.java, JavassistTransformer::class.java.classLoader).toList().toTypedArray())
 
     /**
      * For unit test only