This commit is contained in:
redkale
2024-10-10 20:10:08 +08:00
parent dc3396daf5
commit ed2d9527bf
20 changed files with 991 additions and 1055 deletions

View File

@@ -16,11 +16,8 @@ import org.redkale.util.*;
/** @author zhangjx */
public class SncpClientCodecTest {
private boolean main;
public static void main(String[] args) throws Throwable {
SncpClientCodecTest test = new SncpClientCodecTest();
test.main = true;
test.run();
}

View File

@@ -12,11 +12,9 @@ import org.redkale.net.sncp.SncpAsyncHandler;
/** @author zhangjx */
public class SncpHandlerTest {
private boolean main;
public static void main(String[] args) throws Throwable {
SncpHandlerTest test = new SncpHandlerTest();
test.main = true;
test.run();
}
@@ -25,9 +23,7 @@ public class SncpHandlerTest {
SncpAsyncHandler.createHandler(CompletionHandler.class, new CompletionHandler() {
@Override
public void completed(Object result, Object attachment) {
if (main) {
System.out.println("handler result: " + result + ", attachment: " + attachment);
}
System.out.println("handler result: " + result + ", attachment: " + attachment);
}
@Override

View File

@@ -16,11 +16,8 @@ import org.redkale.util.*;
/** @author zhangjx */
public class SncpRequestParseTest {
private boolean main;
public static void main(String[] args) throws Throwable {
SncpRequestParseTest test = new SncpRequestParseTest();
test.main = true;
test.run();
}

View File

@@ -1,8 +1,6 @@
package org.redkale.test.sncp;
import java.io.File;
import java.net.InetSocketAddress;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import org.junit.jupiter.api.*;
@@ -64,7 +62,7 @@ public class SncpSleepTest {
CompletableFuture.allOf(futures).join();
long e = System.currentTimeMillis() - s;
System.out.println("耗时: " + e + " ms");
remoteCService.test(333L, new String[] {"aaa", "bbb"}, List.of(new File("D:/a.txt"), new File("D:/b.txt")));
//remoteCService.test(333L, new String[] {"aaa", "bbb"}, List.of(new File("D:/a.txt"), new File("D:/b.txt")));
server.shutdown();
workExecutor.shutdown();
Assertions.assertTrue(e < 600);

View File

@@ -1,166 +0,0 @@
/*
*
*/
package org.redkale.test.sncp;
import java.lang.reflect.Method;
import java.nio.channels.CompletionHandler;
import java.util.concurrent.CompletableFuture;
import org.redkale.annotation.ResourceType;
import org.redkale.convert.*;
import org.redkale.net.sncp.*;
import org.redkale.net.sncp.SncpServlet.SncpActionServlet;
import org.redkale.service.Service;
import org.redkale.test.util.TestBean;
import org.redkale.util.Uint128;
/** @author zhangjx */
public interface TestService extends Service {
public boolean change(TestBean bean, String name, int id);
public void insert(BooleanHandler handler, TestBean bean, String name, int id);
public void update(
long show, short v2, CompletionHandler<Boolean, TestBean> handler, TestBean bean, String name, int id);
public CompletableFuture<String> changeName(TestBean bean, String name, int id);
}
@ResourceType(TestService.class)
class TestServiceImpl implements TestService {
@Override
public boolean change(TestBean bean, String name, int id) {
return false;
}
public void delete(TestBean bean) {}
@Override
public void insert(BooleanHandler handler, TestBean bean, String name, int id) {}
@Override
public void update(
long show, short v2, CompletionHandler<Boolean, TestBean> handler, TestBean bean, String name, int id) {}
@Override
public CompletableFuture<String> changeName(TestBean bean, String name, int id) {
return null;
}
}
class BooleanHandler implements CompletionHandler<Boolean, TestBean> {
@Override
public void completed(Boolean result, TestBean attachment) {}
@Override
public void failed(Throwable exc, TestBean attachment) {}
}
class DynActionTestService_change extends SncpActionServlet {
public DynActionTestService_change(
String resourceName,
Class resourceType,
Service service,
Uint128 serviceid,
Uint128 actionid,
final Method method) {
super(resourceName, resourceType, service, serviceid, actionid, method);
}
@Override
public void action(SncpRequest request, SncpResponse response) throws Throwable {
Convert<Reader, Writer> convert = request.getConvert();
Reader in = request.getReader();
TestBean arg1 = convert.convertFrom(paramTypes[1], in);
String arg2 = convert.convertFrom(paramTypes[2], in);
int arg3 = convert.convertFrom(paramTypes[3], in);
TestService serviceObj = (TestService) service();
Object rs = serviceObj.change(arg1, arg2, arg3);
response.finish(boolean.class, rs);
}
}
class DynActionTestService_insert extends SncpActionServlet {
public DynActionTestService_insert(
String resourceName,
Class resourceType,
Service service,
Uint128 serviceid,
Uint128 actionid,
final Method method) {
super(resourceName, resourceType, service, serviceid, actionid, method);
}
@Override
public void action(SncpRequest request, SncpResponse response) throws Throwable {
Convert<Reader, Writer> convert = request.getConvert();
Reader in = request.getReader();
BooleanHandler arg0 = response.getParamAsyncHandler();
convert.convertFrom(CompletionHandler.class, in);
TestBean arg1 = convert.convertFrom(paramTypes[2], in);
String arg2 = convert.convertFrom(paramTypes[3], in);
int arg3 = convert.convertFrom(paramTypes[4], in);
TestService serviceObj = (TestService) service();
serviceObj.insert(arg0, arg1, arg2, arg3);
response.finishVoid();
}
}
class DynActionTestService_update extends SncpActionServlet {
public DynActionTestService_update(
String resourceName,
Class resourceType,
Service service,
Uint128 serviceid,
Uint128 actionid,
final Method method) {
super(resourceName, resourceType, service, serviceid, actionid, method);
}
@Override
public void action(SncpRequest request, SncpResponse response) throws Throwable {
Convert<Reader, Writer> convert = request.getConvert();
Reader in = request.getReader();
long a1 = convert.convertFrom(paramTypes[1], in);
short a2 = convert.convertFrom(paramTypes[2], in);
CompletionHandler a3 = response.getParamAsyncHandler();
convert.convertFrom(CompletionHandler.class, in);
TestBean arg1 = convert.convertFrom(paramTypes[4], in);
String arg2 = convert.convertFrom(paramTypes[5], in);
int arg3 = convert.convertFrom(paramTypes[6], in);
TestService serviceObj = (TestService) service();
serviceObj.update(a1, a2, a3, arg1, arg2, arg3);
response.finishVoid();
}
}
class DynActionTestService_changeName extends SncpActionServlet {
public DynActionTestService_changeName(
String resourceName,
Class resourceType,
Service service,
Uint128 serviceid,
Uint128 actionid,
final Method method) {
super(resourceName, resourceType, service, serviceid, actionid, method);
}
@Override
public void action(SncpRequest request, SncpResponse response) throws Throwable {
Convert<Reader, Writer> convert = request.getConvert();
Reader in = request.getReader();
TestBean arg1 = convert.convertFrom(paramTypes[1], in);
String arg2 = convert.convertFrom(paramTypes[2], in);
int arg3 = convert.convertFrom(paramTypes[3], in);
TestService serviceObj = (TestService) service();
CompletableFuture future = serviceObj.changeName(arg1, arg2, arg3);
response.finishFuture(paramHandlerResultType, future);
}
}

View File

@@ -1,12 +0,0 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.redkale.test.sncp;
import org.redkale.annotation.ResourceType;
/** @author zhangjx */
@ResourceType(SncpTestIService.class)
public class _DynLocalSncpTestService extends SncpTestServiceImpl {}

View File

@@ -9,9 +9,9 @@ import org.redkale.convert.Convert;
import org.redkale.convert.ConvertColumn;
import org.redkale.convert.Reader;
import org.redkale.convert.Writer;
import org.redkale.net.sncp.SncpActionServlet;
import org.redkale.net.sncp.SncpRequest;
import org.redkale.net.sncp.SncpResponse;
import org.redkale.net.sncp.SncpServlet.SncpActionServlet;
import org.redkale.service.Service;
import org.redkale.test.util.TestBean;
import org.redkale.util.Uint128;
@@ -36,7 +36,7 @@ public class DynActionTestService_change extends SncpActionServlet {
public void action(SncpRequest request, SncpResponse response) throws Throwable {
Convert<Reader, Writer> convert = request.getConvert();
Reader in = request.getReader();
DynActionTestService_change_paramBean bean = convert.convertFrom(paramComposeType, in);
DynActionTestService_change_paramBean bean = convert.convertFrom(paramComposeBeanType, in);
TestService serviceObj = (TestService) service();
Object rs = serviceObj.change(bean.arg1, bean.arg2, bean.arg3);
response.finish(boolean.class, rs);

View File

@@ -10,9 +10,9 @@ import org.redkale.convert.Convert;
import org.redkale.convert.ConvertColumn;
import org.redkale.convert.Reader;
import org.redkale.convert.Writer;
import org.redkale.net.sncp.SncpActionServlet;
import org.redkale.net.sncp.SncpRequest;
import org.redkale.net.sncp.SncpResponse;
import org.redkale.net.sncp.SncpServlet.SncpActionServlet;
import org.redkale.service.Service;
import org.redkale.test.util.TestBean;
import org.redkale.util.Uint128;
@@ -37,7 +37,7 @@ public class DynActionTestService_changeName extends SncpActionServlet {
public void action(SncpRequest request, SncpResponse response) throws Throwable {
Convert<Reader, Writer> convert = request.getConvert();
Reader in = request.getReader();
DynActionTestService_changeName_paramBean bean = convert.convertFrom(paramComposeType, in);
DynActionTestService_changeName_paramBean bean = convert.convertFrom(paramComposeBeanType, in);
TestService serviceObj = (TestService) service();
CompletableFuture future = serviceObj.changeName(bean.arg1, bean.arg2, bean.arg3);
response.finishFuture(paramHandlerResultType, future);

View File

@@ -8,9 +8,9 @@ import java.lang.reflect.Method;
import org.redkale.convert.Convert;
import org.redkale.convert.Reader;
import org.redkale.convert.Writer;
import org.redkale.net.sncp.SncpActionServlet;
import org.redkale.net.sncp.SncpRequest;
import org.redkale.net.sncp.SncpResponse;
import org.redkale.net.sncp.SncpServlet;
import org.redkale.service.Service;
import org.redkale.test.util.TestBean;
import org.redkale.util.Uint128;
@@ -19,7 +19,7 @@ import org.redkale.util.Uint128;
*
* @author zhangjx
*/
public class DynActionTestService_hello extends SncpServlet.SncpActionServlet {
public class DynActionTestService_hello extends SncpActionServlet {
public DynActionTestService_hello(
String resourceName,
@@ -35,7 +35,7 @@ public class DynActionTestService_hello extends SncpServlet.SncpActionServlet {
public void action(SncpRequest request, SncpResponse response) throws Throwable {
Convert<Reader, Writer> convert = request.getConvert();
Reader in = request.getReader();
TestBean bean = convert.convertFrom(paramComposeType, in);
TestBean bean = convert.convertFrom(paramComposeBeanType, in);
TestService serviceObj = (TestService) service();
serviceObj.hello(bean);
response.finishVoid();

View File

@@ -9,9 +9,9 @@ import org.redkale.convert.Convert;
import org.redkale.convert.ConvertColumn;
import org.redkale.convert.Reader;
import org.redkale.convert.Writer;
import org.redkale.net.sncp.SncpActionServlet;
import org.redkale.net.sncp.SncpRequest;
import org.redkale.net.sncp.SncpResponse;
import org.redkale.net.sncp.SncpServlet.SncpActionServlet;
import org.redkale.service.Service;
import org.redkale.test.util.TestBean;
import org.redkale.util.Uint128;
@@ -36,7 +36,7 @@ public class DynActionTestService_insert extends SncpActionServlet {
public void action(SncpRequest request, SncpResponse response) throws Throwable {
Convert<Reader, Writer> convert = request.getConvert();
Reader in = request.getReader();
DynActionTestService_insert_paramBean bean = convert.convertFrom(paramComposeType, in);
DynActionTestService_insert_paramBean bean = convert.convertFrom(paramComposeBeanType, in);
bean.arg0 = response.getParamAsyncHandler();
TestService serviceObj = (TestService) service();
serviceObj.insert(bean.arg0, bean.arg1, bean.arg2, bean.arg3);

View File

@@ -10,9 +10,9 @@ import org.redkale.convert.Convert;
import org.redkale.convert.ConvertColumn;
import org.redkale.convert.Reader;
import org.redkale.convert.Writer;
import org.redkale.net.sncp.SncpActionServlet;
import org.redkale.net.sncp.SncpRequest;
import org.redkale.net.sncp.SncpResponse;
import org.redkale.net.sncp.SncpServlet.SncpActionServlet;
import org.redkale.service.Service;
import org.redkale.test.util.TestBean;
import org.redkale.util.Uint128;
@@ -37,7 +37,7 @@ public class DynActionTestService_update extends SncpActionServlet {
public void action(SncpRequest request, SncpResponse response) throws Throwable {
Convert<Reader, Writer> convert = request.getConvert();
Reader in = request.getReader();
DynActionTestService_update_paramBean bean = convert.convertFrom(paramComposeType, in);
DynActionTestService_update_paramBean bean = convert.convertFrom(paramComposeBeanType, in);
bean.arg3 = response.getParamAsyncHandler();
TestService serviceObj = (TestService) service();
serviceObj.update(bean.arg1, bean.arg2, bean.arg3, bean.arg4, bean.arg5, bean.arg6);
@@ -75,4 +75,4 @@ public class DynActionTestService_update extends SncpActionServlet {
@ConvertColumn(index = 6)
public int arg6;
}
}
}