feat: support non http annotation

tuya · Aug 21, 2023 · 50debcd · 50debcd
1 parent ddc6c2b
commit 50debcd
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 9 deletions.
diff --git a/connector-api/pom.xml b/connector-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
     </parent>
 
     <artifactId>connector-api</artifactId>

diff --git a/connector-api/src/main/java/com/tuya/connector/api/core/delegate/RetrofitDelegate.java b/connector-api/src/main/java/com/tuya/connector/api/core/delegate/RetrofitDelegate.java
@@ -196,7 +196,6 @@ private Class<?> deriveFrom(Class<?> connectorInterface) {
 
             service.addMethod(serviceMethod);
         }
-
         return service.toClass(configuration.getClass().getClassLoader(), null);
     }
 

diff --git a/...ctor-api/src/main/java/com/tuya/connector/api/handler/ApiAnnotationHandlerDispatcher.java b/...ctor-api/src/main/java/com/tuya/connector/api/handler/ApiAnnotationHandlerDispatcher.java
@@ -5,6 +5,9 @@
 import com.tuya.connector.api.utils.Utils;
 import javassist.CtClass;
 import javassist.CtMethod;
+import javassist.bytecode.AnnotationsAttribute;
+import javassist.bytecode.AttributeInfo;
+import javassist.bytecode.ConstPool;
 import lombok.SneakyThrows;
 
 import java.lang.annotation.Annotation;
@@ -45,7 +48,9 @@ public class ApiAnnotationHandlerDispatcher {
     public static Object dispatchAndHandle(Annotation annotation, CtClass ctClass, CtMethod ctMethod) {
         try {
             BaseAnnotationHandler handler = KNOWN_HANDLERS.get(annotation.annotationType());
-            Objects.requireNonNull(handler, String.format("Handler is null for annotation: %s", annotation.getClass().getName()));
+            if (Objects.isNull(handler)) {
+                return otherAnnotations(annotation, ctClass, ctMethod);
+            }
             return handler.handle(annotation, ctClass, ctMethod);
         } catch (Exception e) {
             throw new ConnectorAnnotationException(
@@ -55,4 +60,26 @@ public static Object dispatchAndHandle(Annotation annotation, CtClass ctClass, C
             );
         }
     }
+
+    /**
+     * 非 HTTP 相关直接返回原注解
+     * @param annotation
+     * @param ctClass
+     * @param ctMethod
+     * @return
+     */
+    private static Object otherAnnotations(Annotation annotation, CtClass ctClass, CtMethod ctMethod) {
+        ConstPool constPool = ctClass.getClassFile().getConstPool();
+        AnnotationsAttribute methodAttribute;
+        AttributeInfo attribute = ctMethod.getMethodInfo().getAttribute(AnnotationsAttribute.visibleTag);
+        if (Objects.nonNull(attribute)) {
+            methodAttribute = (AnnotationsAttribute) attribute;
+        } else {
+            methodAttribute = new AnnotationsAttribute(constPool, AnnotationsAttribute.visibleTag);
+        }
+        javassist.bytecode.annotation.Annotation ctAnnotation = new javassist.bytecode.annotation.Annotation(annotation.annotationType().getTypeName(), constPool);
+        methodAttribute.addAnnotation(ctAnnotation);
+        ctMethod.getMethodInfo().addAttribute(methodAttribute);
+        return true;
+    }
 }
diff --git a/connector-api/src/test/java/com/tuya/connector/api/annotations/AnnotationConnector.java b/connector-api/src/test/java/com/tuya/connector/api/annotations/AnnotationConnector.java
@@ -1,5 +1,7 @@
 package com.tuya.connector.api.annotations;
 
+import lombok.NonNull;
+
 import java.util.List;
 import java.util.Map;
 
@@ -70,5 +72,6 @@ public interface AnnotationConnector extends AnnotationAbility{
 
     @Override
     @GET("/test/annotations/url-object")
+    @NonNull
     List<ResultObject> urlPost();
 }
diff --git a/connector-messaging/pom.xml b/connector-messaging/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
     </parent>
 
     <artifactId>connector-messaging</artifactId>

diff --git a/connector-spring-boot/connector-spring-boot-autoconfigure/pom.xml b/connector-spring-boot/connector-spring-boot-autoconfigure/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector-spring-boot</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
     </parent>
 
     <artifactId>connector-spring-boot-autoconfigure</artifactId>

diff --git a/connector-spring-boot/connector-spring-boot-starter/pom.xml b/connector-spring-boot/connector-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector-spring-boot</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
     </parent>
 
     <artifactId>connector-spring-boot-starter</artifactId>

diff --git a/connector-spring-boot/pom.xml b/connector-spring-boot/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
     </parent>
 
     <artifactId>connector-spring-boot</artifactId>

diff --git a/connector-spring/pom.xml b/connector-spring/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>connector</artifactId>
         <groupId>com.tuya</groupId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
     </parent>
 
     <artifactId>connector-spring</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.tuya</groupId>
     <artifactId>connector</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.1</version>
+    <version>1.3.2</version>
 
     <modules>
         <module>connector-api</module>