Merge pull request #103 from meituan/bugfix/double_scan_bug_fix

[feat]  call task 执行多次问题修复

Author: zjiecode

WmPlugin/baseplugin/src/main/java/com/kronos/plugin/base/BaseTransform.kt

@@ -17,9 +17,9 @@ import java.util.concurrent.Executors
 import java.util.concurrent.ForkJoinPool
 
 class BaseTransform(
-        transformInvocation: TransformInvocation?,
-        callBack: TransformCallBack,
-        single: Boolean = false
+    transformInvocation: TransformInvocation?,
+    callBack: TransformCallBack,
+    single: Boolean = false
 ) {
     private var mCallBack: TransformCallBack? = callBack
     var context: Context? = null
@@ -70,8 +70,8 @@ class BaseTransform(
                     }
                     /*获得输出文件*/
                     val dest = outputProvider!!.getContentLocation(
-                            destName + "_" + hexName,
-                            jarInput.contentTypes, jarInput.scopes, Format.JAR
+                        destName + "_" + hexName,
+                        jarInput.contentTypes, jarInput.scopes, Format.JAR
                     )
                     if (isIncremental) {
                         when (status) {
@@ -113,8 +113,8 @@ class BaseTransform(
     @Throws(IOException::class)
     private fun foreachClass(directoryInput: DirectoryInput) {
         val dest = outputProvider!!.getContentLocation(
-                directoryInput.name, directoryInput.contentTypes,
-                directoryInput.scopes, Format.DIRECTORY
+            directoryInput.name, directoryInput.contentTypes,
+            directoryInput.scopes, Format.DIRECTORY
         )
         destFiles.add(dest)
         val map = directoryInput.changedFiles
@@ -135,7 +135,7 @@ class BaseTransform(
                             null
                         }
                         tasks.add(callable)
-                        executor.submit(callable)
+                        //  executor.submit(callable)
                     }
                     Status.REMOVED -> deleteDirectory(destFile, dest)
                     else -> {
@@ -171,8 +171,8 @@ class BaseTransform(
         try {
             if (classFile.name.endsWith(".class")) {
                 val absolutePath = classFile.absolutePath.replace(
-                        dest.absolutePath +
-                                File.separator, ""
+                    dest.absolutePath +
+                            File.separator, ""
                 )
                 val className = ClassUtils.path2Classname(absolutePath)
                 val bytes = IOUtils.toByteArray(FileInputStream(classFile))
@@ -188,8 +188,8 @@ class BaseTransform(
     private fun modifySingleFile(dir: File, file: File, dest: File) {
         try {
             val absolutePath = file.absolutePath.replace(
-                    dir.absolutePath +
-                            File.separator, ""
+                dir.absolutePath +
+                        File.separator, ""
             )
             val className = ClassUtils.path2Classname(absolutePath)
             if (absolutePath.endsWith(".class")) {
@@ -236,7 +236,7 @@ class BaseTransform(
                 if (classFile.name.endsWith(".class")) {
                     val task = Callable<Void> {
                         val absolutePath = classFile.absolutePath.replace(
-                                dir.absolutePath + File.separator, ""
+                            dir.absolutePath + File.separator, ""
                         )
                         val className = ClassUtils.path2Classname(absolutePath)
                         if (!simpleScan) {
@@ -249,7 +249,6 @@ class BaseTransform(
                         null
                     }
                     tasks.add(task)
-                    executor.submit(task)
                 }
             }
         }
@@ -275,7 +274,8 @@ class BaseTransform(
         val task = Callable<Void> {
             try {
                 if (!simpleScan) {
-                    val modifiedJar = JarUtils.modifyJarFile(jarInput.file, context?.temporaryDir, this)
+                    val modifiedJar =
+                        JarUtils.modifyJarFile(jarInput.file, context?.temporaryDir, this)
                     FileUtils.copyFile(modifiedJar, dest)
                 } else {
                     val jarFile = jarInput.file
@@ -291,7 +291,6 @@ class BaseTransform(
             null
         }
         tasks.add(task)
-        executor.submit(task)
     }
 
     private fun diffJar(dest: File, jarInput: JarInput) {