update review code

Author: 1071213885@qq.com

.idea/gradle.xml

@@ -1,5 +1,5 @@
 apply plugin: 'java-library'
-version '1.0.0'
+version '1.0.1'
 
 jar {
     manifest {

.idea/misc.xml

@@ -42,13 +42,22 @@ public static void create(ProcessingEnvironment processingEnvironment,
         int size = productChildes.size();
         for (int i = 0; i < size; i++) {
             Product product = productChildes.get(i);
+            String productKey = product.key;
+            String productClassName = product.className;
+            String productClassSimpleName = product.className
+                    .substring(productClassName.lastIndexOf(".") + 1);
+            String productPackageName = productClassName
+                    .substring(0, productClassName.lastIndexOf("."));
+
             if (i == 0) {
                 methodCreateBuilder
-                        .beginControlFlow("if($S.equals(key))", product.key)
-                        .addStatement("products.put(key , new $T())",ClassName.get(packageName, product.className));
+                        .beginControlFlow("if($S.equals(key))", productKey)
+                        .addStatement("products.put(key , new $T())",
+                                ClassName.get(productPackageName, productClassSimpleName));
             } else {
-                methodCreateBuilder.nextControlFlow("else if($S.equals(key))", product.key)
-                        .addStatement("products.put(key , new $T())",ClassName.get(packageName, product.className));
+                methodCreateBuilder.nextControlFlow("else if($S.equals(key))", productKey)
+                        .addStatement("products.put(key , new $T())",
+                                ClassName.get(productPackageName, productClassSimpleName));
             }
         }
 

FactoryBox/build.gradle

@@ -20,6 +20,8 @@
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.MirroredTypeException;
 import javax.lang.model.util.Elements;
 import javax.tools.Diagnostic;
 
@@ -56,12 +58,22 @@ public boolean process(Set<? extends TypeElement> set, RoundEnvironment roundEnv
         productTypes.clear();
         for (Element element : roundEnvironment.getElementsAnnotatedWith(FactoryBox.class)) {
 
-            String key = element.getAnnotation(FactoryBox.class).key();
-            //获取注解的所有文本情况
-            String annotationValue = element.getAnnotationMirrors().get(0).toString()
-                    .replaceAll("\"", "");
+            FactoryBox factoryBoxAnnotation = element.getAnnotation(FactoryBox.class);
+
+            //产品检索和判断的key
+            String key = factoryBoxAnnotation.key();
+
             //实现的接口
-            String interfaceName = productInterface("product", annotationValue);
+            String interfaceName = "";
+            try {
+                Class<?> clazz = factoryBoxAnnotation.product();
+                interfaceName = clazz.getCanonicalName();
+            } catch (MirroredTypeException mte) {
+                DeclaredType classTypeMirror = (DeclaredType) mte.getTypeMirror();
+                TypeElement classTypeElement = (TypeElement) classTypeMirror.asElement();
+                interfaceName = classTypeElement.getQualifiedName().toString();
+            }
+
             //被注解所在的包
             String productPackageName = mElementUtils.getPackageOf(element).getQualifiedName()
                     .toString();
@@ -102,16 +114,6 @@ public boolean process(Set<? extends TypeElement> set, RoundEnvironment roundEnv
 
     }
 
-    public static String productInterface(String annotationClassKey, String context) {
-        String productFatherName = "";
-        String patternKey = String.format("%s=([^,\\s]*).class", annotationClassKey);
-        Pattern pattern = Pattern.compile(patternKey);
-        Matcher matcher = pattern.matcher(context);
-        if (matcher.find()) {
-            productFatherName = matcher.group(1);
-        }
-        return productFatherName;
-    }
 
     private void printlnProcessorInfo(String info) {
         mMessager.printMessage(Diagnostic.Kind.NOTE, info);

FactoryBox/src/main/java/com/owant/compiler/create/FactoryTemp.java

@@ -4,6 +4,8 @@
 
 ```
 implementation 'com.owant.factorybox:factorybox:1.0.1'
+annotationProcessor 'com.google.dagger:dagger-compiler:2.2'
+
 ```
 
 使用google的auto-service和AbstractProcessor进行代码生成。看了不少讲解AbstractProcessor的教程，后来我一直在需要找其应用的实例。后来在项目中的一个配置文件经常改动想到了自动生成代码，于是考虑实践一下
@@ -50,33 +52,33 @@ import java.lang.String;
 import java.util.HashMap;
 
 public final class EventFactory {
+
   private final HashMap<String, Event> products;
 
   public EventFactory() {
-    this.products = new HashMap<String,Event>();
+    this.products = new HashMap<String, Event>();
   }
 
   public Event create(String key) throws Exception {
-    Event cache=products.get(key);
-    if(cache!=null) {
+    Event cache = products.get(key);
+    if (cache != null) {
       return cache;
     }
-    if("sub_event".equals(key)) {
-      products.put(key , new com.owant.createcode.sub.SubEvent());
-    } else if("create".equals(key)) {
-      products.put(key , new com.owant.createcode.CreateEvent());
-    } else if("destroy".equals(key)) {
-      products.put(key , new com.owant.createcode.testcode.DestroyEvent());
-    } else if("resume".equals(key)) {
-      products.put(key , new com.owant.createcode.testcode.ResumeEvent());
+    if ("sub_event".equals(key)) {
+      products.put(key, new SubEvent());
+    } else if ("create".equals(key)) {
+      products.put(key, new CreateEvent());
+    } else if ("destroy".equals(key)) {
+      products.put(key, new DestroyEvent());
+    } else if ("resume".equals(key)) {
+      products.put(key, new ResumeEvent());
     } else {
-      throw new Exception(String.format("没有到key=%s对应的实现",key));
+      throw new Exception(String.format("没有到key=%s对应的实现", key));
     }
     return products.get(key);
   }
 }
 
-
 ```
 
 

FactoryBox/src/main/java/com/owant/compiler/factorybox/FactoryBoxProcessor.java

@@ -41,9 +41,7 @@ dependencies {
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 
   annotationProcessor 'com.google.dagger:dagger-compiler:2.2'
-  implementation 'com.google.dagger:dagger:2.2'
-  compileOnly 'org.glassfish:javax.annotation:10.0-b28'
 
-  //    implementation project(path: ':FactoryBox')
-  implementation 'com.owant.factorybox:factorybox:1.0.1'
+      implementation project(path: ':FactoryBox')
+//  implementation 'com.owant.factorybox:factorybox:1.0.1'
 }