1.2.2 ready

fix bugs

Author: bsp

build.gradle

@@ -25,7 +25,7 @@ repositories {
     mavenCentral()
 }
 group = 'com.bryansharp'
-version = '1.2.1'
+version = '1.2.2'
 uploadArchives {
     version = version + '-SNAPSHOT'
     repositories {

src/main/groovy/com/bryansharp/gradle/hibeaver/HiBeaverParams.groovy

@@ -1,10 +1,10 @@
 package com.bryansharp.gradle.hibeaver
 
 public class HiBeaverParams {
-    String hiBeaverModifyName = null
+    String hiBeaverModifyName = ''
     boolean enableModify = true
     boolean watchTimeConsume = false
     boolean keepQuiet = false
     boolean showHelp = true
-    Map<String, List<Map<String, Object>>> modifyMatchMaps
+    Map<String, List<Map<String, Object>>> modifyMatchMaps = [:]
 }

src/main/groovy/com/bryansharp/gradle/hibeaver/InjectTransform.groovy

@@ -67,7 +67,9 @@ public class InjectTransform extends Transform {
 //        Log.info("flavorAndBuildType ${flavorAndBuildType}")
         targetClasses = [];
         Map<String, List<Map<String, Object>>> modifyMatchMaps = project.hiBeaver.modifyMatchMaps;
-        targetClasses.addAll(modifyMatchMaps.keySet());
+        if (modifyMatchMaps != null) {
+            targetClasses.addAll(modifyMatchMaps.keySet());
+        }
         /**
          * 获取所有依赖的classPaths
          */
@@ -176,8 +178,9 @@ public class InjectTransform extends Transform {
                 byte[] sourceClassBytes = IOUtils.toByteArray(inputStream);
                 if (entryName.endsWith(".class")) {
                     className = entryName.replace("/", ".").replace(".class", "")
-                    if (shouldModifyClass(className)) {
-                        modifiedClassBytes = ModifyClassUtil.modifyClasses(className, sourceClassBytes, project.hiBeaver.modifyMatchMaps.get(className));
+                    def modifyMatchMaps = project.hiBeaver.modifyMatchMaps
+                    if (modifyMatchMaps != null && shouldModifyClass(className)) {
+                        modifiedClassBytes = ModifyClassUtil.modifyClasses(className, sourceClassBytes, modifyMatchMaps.get(className));
                     }
                 }
                 if (modifiedClassBytes == null) {
@@ -200,27 +203,29 @@ public class InjectTransform extends Transform {
      * @return
      */
     public static boolean isJarNeedModify(File jarFile) {
-        if (jarFile) {
-            boolean modified = false;
-            /**
-             * 读取原jar
-             */
-            def file = new JarFile(jarFile);
-            Enumeration enumeration = file.entries();
-            while (enumeration.hasMoreElements()) {
-                JarEntry jarEntry = (JarEntry) enumeration.nextElement();
-                String entryName = jarEntry.getName();
-                String className
-                if (entryName.endsWith(".class")) {
-                    className = entryName.replace("/", ".").replace(".class", "")
-                    if (shouldModifyClass(className)) {
-                        modified = true;
+        boolean modified = false;
+        if (targetClasses != null && targetClasses.size() > 0) {
+            if (jarFile) {
+                /**
+                 * 读取原jar
+                 */
+                def file = new JarFile(jarFile);
+                Enumeration enumeration = file.entries();
+                while (enumeration.hasMoreElements()) {
+                    JarEntry jarEntry = (JarEntry) enumeration.nextElement();
+                    String entryName = jarEntry.getName();
+                    String className
+                    if (entryName.endsWith(".class")) {
+                        className = entryName.replace("/", ".").replace(".class", "")
+                        if (shouldModifyClass(className)) {
+                            modified = true;
+                        }
                     }
                 }
+                file.close();
             }
-            file.close();
-            return modified;
         }
+        return modified;
     }
 
     private static void writeStreamWithBuffer(InputStream inputStream, OutputStream out) {

src/main/groovy/com/bryansharp/gradle/hibeaver/utils/ModifyClassUtil.groovy

@@ -24,6 +24,9 @@ public class ModifyClassUtil {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        if (classBytesCode == null) {
+            classBytesCode = srcByteCode;
+        }
         return classBytesCode;
     }
 
@@ -79,16 +82,28 @@ public class ModifyClassUtil {
                     String methodDesc = map.get('methodDesc');
                     if (name.equals(metName)) {
                         Closure visit = map.get('adapter');
-                        if (methodDesc != null) {
-                            if (methodDesc.equals(desc)) {
-                                if (onlyVisit) {
-                                    myMv = new MethodLogAdapter(cv.visitMethod(access, name, desc, signature, exceptions));
-                                } else {
+                        if (visit != null) {
+                            if (methodDesc != null) {
+                                if (methodDesc.equals(desc)) {
+                                    if (onlyVisit) {
+                                        myMv = new MethodLogAdapter(cv.visitMethod(access, name, desc, signature, exceptions));
+                                    } else {
+                                        try {
+                                            myMv = visit(cv, access, name, desc, signature, exceptions);
+                                        } catch (Exception e) {
+                                            e.printStackTrace();
+                                            myMv = null
+                                        }
+                                    }
+                                }
+                            } else {
+                                try {
                                     myMv = visit(cv, access, name, desc, signature, exceptions);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    myMv = null
                                 }
                             }
-                        } else {
-                            myMv = visit(cv, access, name, desc, signature, exceptions);
                         }
                     }
             }