feat:apt扫描路由增加重复报错逻辑

wangshuwen15222 · wangshuwen15222 · commit 9263b612984b · 2023-01-10T14:07:39.000+08:00
diff --git a/app/src/main/java/cn/cheney/app/MainActivity.java b/app/src/main/java/cn/cheney/app/MainActivity.java
@@ -58,18 +58,18 @@ public void notFound() {
             book.name = "Kotlin";
             List<Book> bookList = new ArrayList<>();
             bookList.add(book);
-            Boolean setSuccess = XRouter.<Boolean>method("moduleA/setBookList?bookList="
-                    + JSON.toJSONString(bookList) + "&strValue=strValue")
+            Boolean setSuccess = XRouter.<Boolean>method("moduleA/setBookInfo?bookList="
+                    + JSON.toJSONString(bookList))
                     .call();
             AlertUtil.showAlert(MainActivity.this, "" + setSuccess);
         });
 
-        //路由执行异步方法
+        //路由执行异步方法+测试uri encode逻辑
         findViewById(R.id.btn3).setOnClickListener(v -> {
             Book book = new Book();
             book.name = "Kotlin";
             //测试urlEncode参数
-            XRouter.<Book>method("moduleA/setBookInfo?info=%7B%22key%22%3A%20%22%26info2%3D123%22%7D")
+            XRouter.<Book>method("moduleA/asyncSetBookName?info=%7B%22key%22%3A%20%22%26info2%3D123%22%7D")
                     .put("book", book).call(new RouteCallback() {
                 @Override
                 public void onResult(Map<String, Object> result) {
diff --git a/gradle.properties b/gradle.properties
@@ -18,8 +18,8 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-debug = false
+debug = true
 pluginVersion = 1.0.6
-annotationVersion = 1.0.6
-compilerVersion = 1.0.7
-coreVersion = 1.0.7
+annotationVersion = 1.0.8
+compilerVersion = 1.0.8
+coreVersion = 1.0.8
diff --git a/m_test/src/main/java/cn/cheney/mtest/activity/ActivityA.java b/m_test/src/main/java/cn/cheney/mtest/activity/ActivityA.java
@@ -19,7 +19,7 @@
 import cn.cheney.xrouter.annotation.XRoute;
 import cn.cheney.xrouter.core.XRouter;
 
-@XRoute(module = "moduleA", path = {"page/a","page/a/copy"})
+@XRoute(module = "moduleA", path = {"page/a"})
 public class ActivityA extends AppCompatActivity {
     @XParam()
     Book book;
diff --git a/m_test/src/main/java/cn/cheney/mtest/module/ModuleA.java b/m_test/src/main/java/cn/cheney/mtest/module/ModuleA.java
@@ -20,19 +20,19 @@ public class ModuleA {
 
     private static final String TAG = ModuleA.class.getSimpleName();
 
-    @XMethod(name = "setBookInfo")
-    public static void getAsyncBookName(@XParam(name = XParam.RequestId) String requestId,
+    @XMethod(name = "asyncSetBookName")
+    public static void asyncSetBookName(@XParam(name = XParam.RequestId) String requestId,
                                         @XParam(name = "info") Map<String, String> mapInfo) {
         Log.i(TAG, "setBookInfo requestId =" + requestId + " mapInfo=" + mapInfo);
         HashMap<String, Object> map = new HashMap<>();
         map.put("result", "success");
         XRouter.getInstance().invokeCallback(requestId, map);
     }
 
+
     @XMethod(name = "setBookInfo")
-    public static Boolean setBookList(Context context, List<Book> bookList, String strValue) {
+    public static Boolean setBookList(Context context, List<Book> bookList) {
         Log.i(TAG, "setBookList bookList=" + JSON.toJSONString(bookList));
-        Log.i(TAG, "setBookList strValue=" + strValue);
         return true;
     }
 
diff --git a/m_test/src/main/java/cn/cheney/mtest/module/ModuleB.java b/m_test/src/main/java/cn/cheney/mtest/module/ModuleB.java
@@ -0,0 +1,41 @@
+package cn.cheney.mtest.module;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.alibaba.fastjson.JSON;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import cn.cheney.mtest.entity.Book;
+import cn.cheney.xrouter.annotation.XMethod;
+import cn.cheney.xrouter.annotation.XParam;
+import cn.cheney.xrouter.annotation.XRoute;
+import cn.cheney.xrouter.core.XRouter;
+
+@XRoute(module = "moduleB")
+public class ModuleB {
+
+    private static final String TAG = ModuleB.class.getSimpleName();
+
+    @XMethod(name = "asyncSetBookName")
+    public static void asyncSetBookName(@XParam(name = XParam.RequestId) String requestId,
+                                        @XParam(name = "info") Map<String, String> mapInfo) {
+        Log.i(TAG, "setBookInfo requestId =" + requestId + " mapInfo=" + mapInfo);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("result", "success");
+        XRouter.getInstance().invokeCallback(requestId, map);
+    }
+
+    @XMethod(name = "setBookInfo")
+    public static Boolean setBookList(Context context, List<Book> bookList, String strValue) {
+        Log.i(TAG, "setBookList bookList=" + JSON.toJSONString(bookList));
+        Log.i(TAG, "setBookList strValue=" + strValue);
+        return true;
+    }
+
+
+}
+
diff --git a/xrouter_compiler/src/main/java/cn/cheney/xrouter/compiler/XRouterProcessor.java b/xrouter_compiler/src/main/java/cn/cheney/xrouter/compiler/XRouterProcessor.java
@@ -20,6 +20,7 @@
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.util.Elements;
@@ -41,6 +42,7 @@ public class XRouterProcessor extends AbstractProcessor {
 
     private Holder holder;
     private Map<String, ModuleClassGenerator> moduleMap = new HashMap<>();
+    private Set<String> routeSet = new HashSet<>();
     private Map<TypeElement, List<Element>> paramsMap = new HashMap<>();
 
     @Override
@@ -180,7 +182,12 @@ private void processRoute(RoundEnvironment roundEnvironment) {
             } else {
                 groupClassGenerator = moduleMap.get(route.module());
             }
-            groupClassGenerator.generateSeg(typeElement, route.path());
+            String[] paths = route.path();
+            if (checkUriRepeat(typeElement, module, paths)) {
+                return;
+            }
+            groupClassGenerator.generateSeg(typeElement, paths);
+
         }
         for (Map.Entry<String, ModuleClassGenerator> entry : moduleMap.entrySet()) {
             ModuleClassGenerator moduleClassGenerator = entry.getValue();
@@ -189,6 +196,40 @@ private void processRoute(RoundEnvironment roundEnvironment) {
     }
 
 
+    private boolean checkUriRepeat(TypeElement classType, String module, String[] activityRoutePaths) {
+        for (String path : activityRoutePaths) {
+            String uri = module + "/" + path;
+            if (routeSet.contains(uri)) {
+                Logger.e("the page uri=" + uri + " is repeat !!! please check  class="
+                        + classType.getQualifiedName());
+                return true;
+            }
+            routeSet.add(uri);
+        }
+        for (Element element : classType.getEnclosedElements()) {
+            if (element instanceof ExecutableElement) {
+                ExecutableElement executableElement = (ExecutableElement) element;
+                XMethod xMethod = executableElement.getAnnotation(XMethod.class);
+                if (null == xMethod) {
+                    continue;
+                }
+                String methodPath = xMethod.name();
+                if (methodPath.isEmpty()) {
+                    continue;
+                }
+                String methodUri = module + "/" + methodPath;
+                if (routeSet.contains(methodUri)) {
+                    Logger.e("the uri=" + methodUri + " is repeat !!! please check in method="
+                            + executableElement.getSimpleName() + " class="
+                            + classType.getQualifiedName());
+                    return true;
+                }
+                routeSet.add(methodUri);
+            }
+        }
+        return false;
+    }
+
     private void processInterceptor(RoundEnvironment roundEnvironment) {
         Set<? extends Element> elementSet = roundEnvironment.getElementsAnnotatedWith(XInterceptor.class);
         if (null == elementSet || elementSet.isEmpty()) {
diff --git a/xrouter_compiler/src/main/java/cn/cheney/xrouter/compiler/generator/ModuleClassGenerator.java b/xrouter_compiler/src/main/java/cn/cheney/xrouter/compiler/generator/ModuleClassGenerator.java
@@ -93,11 +93,13 @@ private MethodSpec.Builder loadMethodBuilder() {
     public void generateSeg(TypeElement classType, String[] paths) {
         TypeMirror typeActivity = holder.elementUtils
                 .getTypeElement(XTypeMirror.ACTIVITY).asType();
+        //页面路由
         if (holder.types.isSubtype(classType.asType(), typeActivity)) {
             for (String path : paths) {
                 addActivityInvoke(classType, path);
             }
         }
+        //方法路由
         for (Element element : classType.getEnclosedElements()) {
             if (element instanceof ExecutableElement) {
                 ExecutableElement executableElement = (ExecutableElement) element;

Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,13 @@ private MethodSpec.Builder loadMethodBuilder() {`
`93`	`93`	`public void generateSeg(TypeElement classType, String[] paths) {`
`94`	`94`	`TypeMirror typeActivity = holder.elementUtils`
`95`	`95`	`.getTypeElement(XTypeMirror.ACTIVITY).asType();`
	`96`	`+ //页面路由`
`96`	`97`	`if (holder.types.isSubtype(classType.asType(), typeActivity)) {`
`97`	`98`	`for (String path : paths) {`
`98`	`99`	`addActivityInvoke(classType, path);`
`99`	`100`	`}`
`100`	`101`	`}`
	`102`	`+ //方法路由`
`101`	`103`	`for (Element element : classType.getEnclosedElements()) {`
`102`	`104`	`if (element instanceof ExecutableElement) {`
`103`	`105`	`ExecutableElement executableElement = (ExecutableElement) element;`