From bea6f6fd5ac218208c497a2ee0b70cfdaa94a03d Mon Sep 17 00:00:00 2001 From: redkale Date: Tue, 15 Oct 2024 17:07:31 +0800 Subject: [PATCH] test --- .../test/convert/InnerCoderEntityTest.java | 1 + .../test/convert/ObjectOrStringTest.java | 1 + .../test/convert/json/CustMessage2Test.java | 1 + .../test/convert/json/CustMessageTest.java | 1 + .../test/rest/_DynHelloRestServlet1.java | 40 +++++++++++-------- .../test/rest/_DynHelloRestServlet2.java | 4 +- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/test/java/org/redkale/test/convert/InnerCoderEntityTest.java b/src/test/java/org/redkale/test/convert/InnerCoderEntityTest.java index 9d271f17c..6172547bb 100644 --- a/src/test/java/org/redkale/test/convert/InnerCoderEntityTest.java +++ b/src/test/java/org/redkale/test/convert/InnerCoderEntityTest.java @@ -21,6 +21,7 @@ import org.redkale.util.Utility; * * @author zhangjx */ +@SuppressWarnings("unchecked") public class InnerCoderEntityTest { public static void main(String[] args) throws Throwable { InnerCoderEntityTest test = new InnerCoderEntityTest(); diff --git a/src/test/java/org/redkale/test/convert/ObjectOrStringTest.java b/src/test/java/org/redkale/test/convert/ObjectOrStringTest.java index 4a95352da..57e89a835 100644 --- a/src/test/java/org/redkale/test/convert/ObjectOrStringTest.java +++ b/src/test/java/org/redkale/test/convert/ObjectOrStringTest.java @@ -11,6 +11,7 @@ import org.redkale.convert.*; import org.redkale.convert.json.*; /** @author zhangjx */ +@SuppressWarnings("unchecked") public class ObjectOrStringTest { private boolean main; diff --git a/src/test/java/org/redkale/test/convert/json/CustMessage2Test.java b/src/test/java/org/redkale/test/convert/json/CustMessage2Test.java index c15e44551..44eb9f602 100644 --- a/src/test/java/org/redkale/test/convert/json/CustMessage2Test.java +++ b/src/test/java/org/redkale/test/convert/json/CustMessage2Test.java @@ -15,6 +15,7 @@ import org.redkale.convert.json.JsonConvert; import org.redkale.util.*; /** @author zhangjx */ +@SuppressWarnings("unchecked") public class CustMessage2Test { private boolean main; diff --git a/src/test/java/org/redkale/test/convert/json/CustMessageTest.java b/src/test/java/org/redkale/test/convert/json/CustMessageTest.java index c1a802257..ed28d357b 100644 --- a/src/test/java/org/redkale/test/convert/json/CustMessageTest.java +++ b/src/test/java/org/redkale/test/convert/json/CustMessageTest.java @@ -12,6 +12,7 @@ import org.redkale.convert.json.JsonConvert; import org.redkale.util.*; /** @author zhangjx */ +@SuppressWarnings("unchecked") public class CustMessageTest { private boolean main; diff --git a/src/test/java/org/redkale/test/rest/_DynHelloRestServlet1.java b/src/test/java/org/redkale/test/rest/_DynHelloRestServlet1.java index 0d29506d1..64f17dfcc 100644 --- a/src/test/java/org/redkale/test/rest/_DynHelloRestServlet1.java +++ b/src/test/java/org/redkale/test/rest/_DynHelloRestServlet1.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.io.Serializable; import java.util.*; import org.redkale.annotation.Resource; +import org.redkale.boot.Application; import org.redkale.net.http.*; import org.redkale.service.RetResult; import org.redkale.source.Flipper; @@ -21,35 +22,37 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { private Map _redkale_servicemap; public static void main(String[] args) throws Throwable { - final int port = 8888; + + Application application = Application.create(true); + HttpServer server = new HttpServer(application); HelloService service = new HelloService(); - HttpServer server = new HttpServer(); + RedkaleClassLoader classLoader = RedkaleClassLoader.currentClassLoader(); + Class clazz = SimpleRestServlet.class; + System.out.println(server.addRestServlet(classLoader, service, null, clazz, "/pipes")); + System.out.println(server.addRestServlet(classLoader, new HelloService(3), null, clazz, "/pipes")); - System.out.println(server.addRestServlet(null, service, null, SimpleRestServlet.class, "/pipes")); - System.out.println(server.addRestServlet(null, new HelloService(3), null, SimpleRestServlet.class, "/pipes")); - - AnyValueWriter conf = AnyValueWriter.create("port", "" + port); + AnyValueWriter conf = AnyValueWriter.create("port", "0"); server.init(conf); server.start(); Utility.sleep(100); - + final int port = server.getSocketAddress().getPort(); HelloEntity entity = new HelloEntity(); entity.setHelloname("my name"); Map headers = new HashMap<>(); headers.put("hello-res", "my res"); // headers.put(Rest.REST_HEADER_RESNAME, "my-res"); - String url = "http://127.0.0.1:" + port + "/pipes/hello/update?entity={}&bean2={}"; + String url = "http://127.0.0.1:" + port + "/pipes/hello/update?entity=%7B%7D&bean2=%7B%7D"; System.out.println(Utility.postHttpContent(url, headers, null)); - url = "http://127.0.0.1:" + port + "/pipes/hello/update2?entity={}&bean2={}"; + url = "http://127.0.0.1:" + port + "/pipes/hello/update2?entity=%7B%7D&bean2=%7B%7D"; System.out.println(Utility.postHttpContent(url, headers, null)); url = "http://127.0.0.1:" + port + "/pipes/hello/asyncfind/1234"; System.out.println("异步查找: " + Utility.postHttpContent(url, headers, null)); - url = "http://127.0.0.1:" + port + "/pipes/hello/listmap?map={'a':5}"; + url = "http://127.0.0.1:" + port + "/pipes/hello/listmap?map=%7B'a':5%7D"; System.out.println("listmap: " + Utility.postHttpContent(url, headers, null)); - url = "http://127.0.0.1:" + port + "/pipes/hello/create?entity={}"; + url = "http://127.0.0.1:" + port + "/pipes/hello/create?entity=%7B%7D"; System.out.println("增加记录: " + Utility.postHttpContent(url, headers, "{'a':2,'b':3}")); url = "http://127.0.0.1:" + port + "/pipes/hello/asyncfind/111111"; @@ -78,7 +81,8 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); - int id = Integer.parseInt(req.getPathLastParam()); + int id = Integer.parseInt( + req.getRequestPath().substring(req.getRequestPath().lastIndexOf('/') + 1)); service.deleteHello(id); resp.finishJson(RetResult.success()); } @@ -143,7 +147,8 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); - int id = Integer.parseInt(req.getPathLastParam()); + int id = Integer.parseInt( + req.getRequestPath().substring(req.getRequestPath().lastIndexOf('/') + 1)); HelloEntity bean = service.findHello(id); resp.finishJson(bean); } @@ -153,7 +158,8 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); - int id = Integer.parseInt(req.getPathLastParam()); + int id = Integer.parseInt( + req.getRequestPath().substring(req.getRequestPath().lastIndexOf('/') + 1)); resp.finishJson(service.asyncFindHello(id)); } @@ -162,7 +168,8 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); - int id = Integer.parseInt(req.getPathLastParam()); + int id = Integer.parseInt( + req.getRequestPath().substring(req.getRequestPath().lastIndexOf('/') + 1)); service.asyncFindHello(resp.createAsyncHandler(), id); } @@ -171,7 +178,8 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); - int id = Integer.parseInt(req.getPathLastParam()); + int id = Integer.parseInt( + req.getRequestPath().substring(req.getRequestPath().lastIndexOf('/') + 1)); service.asyncFindHello(resp.createAsyncHandler(HelloAsyncHandler.class), id); } } diff --git a/src/test/java/org/redkale/test/rest/_DynHelloRestServlet2.java b/src/test/java/org/redkale/test/rest/_DynHelloRestServlet2.java index 310330a46..a7c9ec00d 100644 --- a/src/test/java/org/redkale/test/rest/_DynHelloRestServlet2.java +++ b/src/test/java/org/redkale/test/rest/_DynHelloRestServlet2.java @@ -47,7 +47,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet { HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); - int id = Integer.parseInt(req.getPathLastParam()); + int id = Integer.parseInt(req.getRequestPath().substring(req.getRequestPath().lastIndexOf('/') + 1)); service.deleteHello(id); resp.finishJson(RetResult.success()); } @@ -89,7 +89,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet { HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); - int id = Integer.parseInt(req.getPathLastParam()); + int id = Integer.parseInt(req.getRequestPath().substring(req.getRequestPath().lastIndexOf('/') + 1)); HelloEntity bean = service.findHello(id); resp.finishJson(bean); }