From ddc6c2bce03cc9e4496837088ae5a306dd2bcc18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E9=A3=8E?= Date: Fri, 18 Aug 2023 18:03:26 +0800 Subject: [PATCH] =?UTF-8?q?test:=20=E5=AF=B9=E8=B1=A1=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connector/api/annotations/AnnotationAbility.java | 3 +++ .../api/annotations/AnnotationConnector.java | 5 +++++ .../connector/api/annotations/AnnotationTest.java | 8 ++++++++ .../tuya/connector/api/annotations/ResultObject.java | 12 ++++++++++++ connector-assist/pom.xml | 8 ++++++++ .../controller/restful/AnnotationController.java | 11 +++++++++++ 6 files changed, 47 insertions(+) create mode 100644 connector-api/src/test/java/com/tuya/connector/api/annotations/ResultObject.java diff --git a/connector-api/src/test/java/com/tuya/connector/api/annotations/AnnotationAbility.java b/connector-api/src/test/java/com/tuya/connector/api/annotations/AnnotationAbility.java index 145fe7d..1ea8377 100644 --- a/connector-api/src/test/java/com/tuya/connector/api/annotations/AnnotationAbility.java +++ b/connector-api/src/test/java/com/tuya/connector/api/annotations/AnnotationAbility.java @@ -1,5 +1,6 @@ package com.tuya.connector.api.annotations; +import java.util.List; import java.util.Map; /** @@ -38,4 +39,6 @@ public interface AnnotationAbility { String urlPost(String url, Map param); + List urlPost(); + } 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 index eb5e09b..da6ed4e 100644 --- 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,6 @@ package com.tuya.connector.api.annotations; +import java.util.List; import java.util.Map; /** @@ -66,4 +67,8 @@ public interface AnnotationConnector extends AnnotationAbility{ @Override @POST String urlPost(@Url String url, @Body Map param); + + @Override + @GET("/test/annotations/url-object") + List urlPost(); } diff --git a/connector-api/src/test/java/com/tuya/connector/api/annotations/AnnotationTest.java b/connector-api/src/test/java/com/tuya/connector/api/annotations/AnnotationTest.java index f2b4eb6..d242f90 100644 --- a/connector-api/src/test/java/com/tuya/connector/api/annotations/AnnotationTest.java +++ b/connector-api/src/test/java/com/tuya/connector/api/annotations/AnnotationTest.java @@ -13,6 +13,7 @@ import org.junit.jupiter.params.provider.ValueSource; import java.util.HashMap; +import java.util.List; import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -137,4 +138,11 @@ void urlPostTest() { assertEquals(v2, jsonRet.getString("k2")); } + @Test + void urlObjectTest() { + List rets = ability.urlPost(); + System.out.println(JSON.toJSONString(rets)); + assertEquals(2, rets.size()); + } + } diff --git a/connector-api/src/test/java/com/tuya/connector/api/annotations/ResultObject.java b/connector-api/src/test/java/com/tuya/connector/api/annotations/ResultObject.java new file mode 100644 index 0000000..f97705d --- /dev/null +++ b/connector-api/src/test/java/com/tuya/connector/api/annotations/ResultObject.java @@ -0,0 +1,12 @@ +package com.tuya.connector.api.annotations; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ResultObject implements Serializable { + String abc; + String deFg; + String mn_pq; +} diff --git a/connector-assist/pom.xml b/connector-assist/pom.xml index f56b787..dc50be9 100644 --- a/connector-assist/pom.xml +++ b/connector-assist/pom.xml @@ -54,6 +54,14 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + 9 + 9 + + diff --git a/connector-assist/src/main/java/com/tuya/connector/assist/controller/restful/AnnotationController.java b/connector-assist/src/main/java/com/tuya/connector/assist/controller/restful/AnnotationController.java index 43aba03..a470ed9 100644 --- a/connector-assist/src/main/java/com/tuya/connector/assist/controller/restful/AnnotationController.java +++ b/connector-assist/src/main/java/com/tuya/connector/assist/controller/restful/AnnotationController.java @@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.*; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -110,4 +111,14 @@ public Result urlPost(@RequestBody Map p) { return Result.builder().result(JSON.toJSONString(p)).build(); } + @GetMapping("/url-object") + public Result> urlObject() { + log.warn("/url-object"); + return Result.>builder().result( + List.of( + Map.of("abc", 1, "deFg", 2, "mn_pq", 3), + Map.of("abc", 4, "deFg", 5, "mn_pq", 6) + )).build(); + } + }