From b52090d1f2bc3a6e853cce4883666a58235060b6 Mon Sep 17 00:00:00 2001 From: redkale Date: Sun, 24 Dec 2023 08:32:24 +0800 Subject: [PATCH] mq.spi --- src/main/java/module-info.java | 3 ++- src/main/java/org/redkale/boot/Application.java | 2 ++ src/main/java/org/redkale/boot/NodeHttpServer.java | 2 +- src/main/java/org/redkale/boot/NodeServer.java | 1 + src/main/java/org/redkale/boot/NodeSncpServer.java | 2 +- src/main/java/org/redkale/mq/MessageConext.java | 2 +- .../org/redkale/mq/{ => spi}/HttpMessageRequest.java | 2 +- .../org/redkale/mq/{ => spi}/HttpMessageResponse.java | 4 ++-- .../org/redkale/mq/{ => spi}/HttpMessageServlet.java | 2 +- .../java/org/redkale/mq/{ => spi}/HttpResultCoder.java | 4 ++-- .../org/redkale/mq/{ => spi}/HttpRpcMessageClient.java | 7 +++++-- .../redkale/mq/{ => spi}/HttpSimpleRequestCoder.java | 2 +- .../java/org/redkale/mq/{ => spi}/MessageAgent.java | 10 +++++++--- .../org/redkale/mq/{ => spi}/MessageAgentProvider.java | 2 +- .../java/org/redkale/mq/{ => spi}/MessageClient.java | 2 +- .../redkale/mq/{ => spi}/MessageClientConsumer.java | 2 +- .../redkale/mq/{ => spi}/MessageClientProducer.java | 2 +- .../java/org/redkale/mq/{ => spi}/MessageCoder.java | 2 +- .../org/redkale/mq/{ => spi}/MessageModuleEngine.java | 8 +++++++- .../org/redkale/mq/{ => spi}/MessageProcessor.java | 2 +- .../java/org/redkale/mq/{ => spi}/MessageRecord.java | 5 ++++- .../redkale/mq/{ => spi}/MessageRecordSerializer.java | 2 +- .../org/redkale/mq/{ => spi}/MessageRespFuture.java | 2 +- .../org/redkale/mq/{ => spi}/MessageRespProcessor.java | 2 +- .../java/org/redkale/mq/{ => spi}/MessageServlet.java | 2 +- .../org/redkale/mq/{ => spi}/SncpMessageRequest.java | 2 +- .../org/redkale/mq/{ => spi}/SncpMessageResponse.java | 2 +- .../org/redkale/mq/{ => spi}/SncpMessageServlet.java | 2 +- src/main/java/org/redkale/net/http/HttpServer.java | 1 + src/main/java/org/redkale/net/http/Rest.java | 1 + src/main/java/org/redkale/net/http/WebSocketNode.java | 2 +- .../java/org/redkale/net/http/WebSocketServlet.java | 2 +- src/main/java/org/redkale/net/sncp/Sncp.java | 2 +- src/main/java/org/redkale/net/sncp/SncpRemoteInfo.java | 3 +++ src/main/java/org/redkale/util/RedkaleClassLoader.java | 1 + .../java/org/redkale/test/http/RequestCoderTest.java | 2 +- 36 files changed, 61 insertions(+), 35 deletions(-) rename src/main/java/org/redkale/mq/{ => spi}/HttpMessageRequest.java (94%) rename src/main/java/org/redkale/mq/{ => spi}/HttpMessageResponse.java (95%) rename src/main/java/org/redkale/mq/{ => spi}/HttpMessageServlet.java (95%) rename src/main/java/org/redkale/mq/{ => spi}/HttpResultCoder.java (95%) rename src/main/java/org/redkale/mq/{ => spi}/HttpRpcMessageClient.java (87%) rename src/main/java/org/redkale/mq/{ => spi}/HttpSimpleRequestCoder.java (96%) rename src/main/java/org/redkale/mq/{ => spi}/MessageAgent.java (96%) rename src/main/java/org/redkale/mq/{ => spi}/MessageAgentProvider.java (89%) rename src/main/java/org/redkale/mq/{ => spi}/MessageClient.java (96%) rename src/main/java/org/redkale/mq/{ => spi}/MessageClientConsumer.java (93%) rename src/main/java/org/redkale/mq/{ => spi}/MessageClientProducer.java (92%) rename src/main/java/org/redkale/mq/{ => spi}/MessageCoder.java (96%) rename src/main/java/org/redkale/mq/{ => spi}/MessageModuleEngine.java (98%) rename src/main/java/org/redkale/mq/{ => spi}/MessageProcessor.java (83%) rename src/main/java/org/redkale/mq/{ => spi}/MessageRecord.java (95%) rename src/main/java/org/redkale/mq/{ => spi}/MessageRecordSerializer.java (96%) rename src/main/java/org/redkale/mq/{ => spi}/MessageRespFuture.java (95%) rename src/main/java/org/redkale/mq/{ => spi}/MessageRespProcessor.java (98%) rename src/main/java/org/redkale/mq/{ => spi}/MessageServlet.java (96%) rename src/main/java/org/redkale/mq/{ => spi}/SncpMessageRequest.java (92%) rename src/main/java/org/redkale/mq/{ => spi}/SncpMessageResponse.java (95%) rename src/main/java/org/redkale/mq/{ => spi}/SncpMessageServlet.java (94%) diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 69a9466c1..8d2a674a5 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -29,6 +29,7 @@ module org.redkale { exports org.redkale.lock; exports org.redkale.lock.spi; exports org.redkale.mq; + exports org.redkale.mq.spi; exports org.redkale.net; exports org.redkale.net.client; exports org.redkale.net.http; @@ -46,7 +47,7 @@ module org.redkale { uses org.redkale.cluster.ClusterAgentProvider; uses org.redkale.convert.ConvertProvider; uses org.redkale.inject.ResourceAnnotationProvider; - uses org.redkale.mq.MessageAgentProvider; + uses org.redkale.mq.spi.MessageAgentProvider; uses org.redkale.schedule.spi.ScheduleManagerProvider; uses org.redkale.source.CacheSourceProvider; uses org.redkale.source.DataSourceProvider; diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java index 36f1e65d4..1b31c9227 100644 --- a/src/main/java/org/redkale/boot/Application.java +++ b/src/main/java/org/redkale/boot/Application.java @@ -5,6 +5,8 @@ */ package org.redkale.boot; +import org.redkale.mq.spi.MessageModuleEngine; +import org.redkale.mq.spi.MessageAgent; import java.io.*; import java.lang.reflect.*; import java.net.*; diff --git a/src/main/java/org/redkale/boot/NodeHttpServer.java b/src/main/java/org/redkale/boot/NodeHttpServer.java index cdd355cee..2a9f95db0 100644 --- a/src/main/java/org/redkale/boot/NodeHttpServer.java +++ b/src/main/java/org/redkale/boot/NodeHttpServer.java @@ -20,7 +20,7 @@ import org.redkale.boot.ClassFilter.FilterEntry; import org.redkale.cluster.ClusterAgent; import org.redkale.inject.ResourceFactory; import org.redkale.inject.ResourceTypeLoader; -import org.redkale.mq.MessageAgent; +import org.redkale.mq.spi.MessageAgent; import org.redkale.net.*; import org.redkale.net.http.*; import org.redkale.net.sncp.Sncp; diff --git a/src/main/java/org/redkale/boot/NodeServer.java b/src/main/java/org/redkale/boot/NodeServer.java index 285cf4b2a..c6e0ffcbe 100644 --- a/src/main/java/org/redkale/boot/NodeServer.java +++ b/src/main/java/org/redkale/boot/NodeServer.java @@ -5,6 +5,7 @@ */ package org.redkale.boot; +import org.redkale.mq.spi.MessageAgent; import java.io.*; import java.lang.annotation.Annotation; import java.lang.reflect.*; diff --git a/src/main/java/org/redkale/boot/NodeSncpServer.java b/src/main/java/org/redkale/boot/NodeSncpServer.java index b3af0e68a..3ed51167b 100644 --- a/src/main/java/org/redkale/boot/NodeSncpServer.java +++ b/src/main/java/org/redkale/boot/NodeSncpServer.java @@ -9,7 +9,7 @@ import java.net.InetSocketAddress; import java.util.*; import java.util.logging.Level; import org.redkale.boot.ClassFilter.FilterEntry; -import org.redkale.mq.MessageAgent; +import org.redkale.mq.spi.MessageAgent; import org.redkale.net.*; import org.redkale.net.sncp.*; import org.redkale.service.Local; diff --git a/src/main/java/org/redkale/mq/MessageConext.java b/src/main/java/org/redkale/mq/MessageConext.java index ce90bf3b8..df40a2289 100644 --- a/src/main/java/org/redkale/mq/MessageConext.java +++ b/src/main/java/org/redkale/mq/MessageConext.java @@ -25,7 +25,7 @@ public class MessageConext { @ConvertColumn(index = 2) protected Integer partition; - protected MessageConext(String topic, Integer partition) { + public MessageConext(String topic, Integer partition) { this.topic = topic; this.partition = partition; } diff --git a/src/main/java/org/redkale/mq/HttpMessageRequest.java b/src/main/java/org/redkale/mq/spi/HttpMessageRequest.java similarity index 94% rename from src/main/java/org/redkale/mq/HttpMessageRequest.java rename to src/main/java/org/redkale/mq/spi/HttpMessageRequest.java index 92bfc562a..2e20275bd 100644 --- a/src/main/java/org/redkale/mq/HttpMessageRequest.java +++ b/src/main/java/org/redkale/mq/spi/HttpMessageRequest.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import org.redkale.convert.Convert; import org.redkale.net.http.*; diff --git a/src/main/java/org/redkale/mq/HttpMessageResponse.java b/src/main/java/org/redkale/mq/spi/HttpMessageResponse.java similarity index 95% rename from src/main/java/org/redkale/mq/HttpMessageResponse.java rename to src/main/java/org/redkale/mq/spi/HttpMessageResponse.java index 006d3971a..7c839e207 100644 --- a/src/main/java/org/redkale/mq/HttpMessageResponse.java +++ b/src/main/java/org/redkale/mq/spi/HttpMessageResponse.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.lang.reflect.Type; import java.nio.ByteBuffer; @@ -12,7 +12,7 @@ import java.util.Arrays; import java.util.function.*; import java.util.logging.Level; import org.redkale.convert.Convert; -import static org.redkale.mq.MessageRecord.CTYPE_HTTP_RESULT; +import static org.redkale.mq.spi.MessageRecord.CTYPE_HTTP_RESULT; import org.redkale.net.Response; import org.redkale.net.http.*; import org.redkale.service.RetResult; diff --git a/src/main/java/org/redkale/mq/HttpMessageServlet.java b/src/main/java/org/redkale/mq/spi/HttpMessageServlet.java similarity index 95% rename from src/main/java/org/redkale/mq/HttpMessageServlet.java rename to src/main/java/org/redkale/mq/spi/HttpMessageServlet.java index 6b3abbd52..2bb86a256 100644 --- a/src/main/java/org/redkale/mq/HttpMessageServlet.java +++ b/src/main/java/org/redkale/mq/spi/HttpMessageServlet.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.util.logging.*; import org.redkale.net.Context; diff --git a/src/main/java/org/redkale/mq/HttpResultCoder.java b/src/main/java/org/redkale/mq/spi/HttpResultCoder.java similarity index 95% rename from src/main/java/org/redkale/mq/HttpResultCoder.java rename to src/main/java/org/redkale/mq/spi/HttpResultCoder.java index 1ac54e5f2..de79b5177 100644 --- a/src/main/java/org/redkale/mq/HttpResultCoder.java +++ b/src/main/java/org/redkale/mq/spi/HttpResultCoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.net.HttpCookie; import java.nio.ByteBuffer; @@ -11,7 +11,7 @@ import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import org.redkale.convert.Convert; import org.redkale.convert.json.JsonConvert; -import static org.redkale.mq.MessageCoder.*; +import static org.redkale.mq.spi.MessageCoder.*; import org.redkale.net.http.HttpResult; import org.redkale.util.Utility; diff --git a/src/main/java/org/redkale/mq/HttpRpcMessageClient.java b/src/main/java/org/redkale/mq/spi/HttpRpcMessageClient.java similarity index 87% rename from src/main/java/org/redkale/mq/HttpRpcMessageClient.java rename to src/main/java/org/redkale/mq/spi/HttpRpcMessageClient.java index 589a3f631..81a93f7ed 100644 --- a/src/main/java/org/redkale/mq/HttpRpcMessageClient.java +++ b/src/main/java/org/redkale/mq/spi/HttpRpcMessageClient.java @@ -1,12 +1,15 @@ /* * */ -package org.redkale.mq; +package org.redkale.mq.spi; +import org.redkale.mq.spi.HttpResultCoder; +import org.redkale.mq.spi.MessageCoder; +import org.redkale.mq.spi.HttpSimpleRequestCoder; import java.io.Serializable; import java.util.concurrent.CompletableFuture; import org.redkale.cluster.HttpRpcClient; -import static org.redkale.mq.MessageRecord.CTYPE_HTTP_REQUEST; +import static org.redkale.mq.spi.MessageRecord.CTYPE_HTTP_REQUEST; import org.redkale.net.http.HttpResult; import org.redkale.net.http.HttpSimpleRequest; diff --git a/src/main/java/org/redkale/mq/HttpSimpleRequestCoder.java b/src/main/java/org/redkale/mq/spi/HttpSimpleRequestCoder.java similarity index 96% rename from src/main/java/org/redkale/mq/HttpSimpleRequestCoder.java rename to src/main/java/org/redkale/mq/spi/HttpSimpleRequestCoder.java index ddb63437f..925af243a 100644 --- a/src/main/java/org/redkale/mq/HttpSimpleRequestCoder.java +++ b/src/main/java/org/redkale/mq/spi/HttpSimpleRequestCoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.io.Serializable; import java.nio.ByteBuffer; diff --git a/src/main/java/org/redkale/mq/MessageAgent.java b/src/main/java/org/redkale/mq/spi/MessageAgent.java similarity index 96% rename from src/main/java/org/redkale/mq/MessageAgent.java rename to src/main/java/org/redkale/mq/spi/MessageAgent.java index bc215403e..2051612ef 100644 --- a/src/main/java/org/redkale/mq/MessageAgent.java +++ b/src/main/java/org/redkale/mq/spi/MessageAgent.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -26,12 +26,16 @@ import org.redkale.convert.ConvertType; import org.redkale.convert.json.JsonConvert; import org.redkale.inject.Resourcable; import org.redkale.inject.ResourceEvent; +import org.redkale.mq.MessageConext; +import org.redkale.mq.MessageConsumer; +import org.redkale.mq.MessageProducer; +import org.redkale.mq.ResourceConsumer; +import org.redkale.mq.ResourceProducer; import org.redkale.net.WorkThread; import org.redkale.net.http.*; import org.redkale.net.sncp.*; import org.redkale.service.*; import org.redkale.util.*; -import org.redkale.annotation.ResourceChanged; /** * MQ管理器 @@ -52,7 +56,7 @@ public abstract class MessageAgent implements Resourcable { @Resource(required = false) protected Environment environment; - + @Resource(name = RESNAME_APP_NODEID) protected int nodeid; diff --git a/src/main/java/org/redkale/mq/MessageAgentProvider.java b/src/main/java/org/redkale/mq/spi/MessageAgentProvider.java similarity index 89% rename from src/main/java/org/redkale/mq/MessageAgentProvider.java rename to src/main/java/org/redkale/mq/spi/MessageAgentProvider.java index 1e9526614..b57df86ea 100644 --- a/src/main/java/org/redkale/mq/MessageAgentProvider.java +++ b/src/main/java/org/redkale/mq/spi/MessageAgentProvider.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import org.redkale.util.*; diff --git a/src/main/java/org/redkale/mq/MessageClient.java b/src/main/java/org/redkale/mq/spi/MessageClient.java similarity index 96% rename from src/main/java/org/redkale/mq/MessageClient.java rename to src/main/java/org/redkale/mq/spi/MessageClient.java index e83a36715..53c7791d6 100644 --- a/src/main/java/org/redkale/mq/MessageClient.java +++ b/src/main/java/org/redkale/mq/spi/MessageClient.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/org/redkale/mq/MessageClientConsumer.java b/src/main/java/org/redkale/mq/spi/MessageClientConsumer.java similarity index 93% rename from src/main/java/org/redkale/mq/MessageClientConsumer.java rename to src/main/java/org/redkale/mq/spi/MessageClientConsumer.java index a51be4afc..280cf12d3 100644 --- a/src/main/java/org/redkale/mq/MessageClientConsumer.java +++ b/src/main/java/org/redkale/mq/spi/MessageClientConsumer.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.util.Collection; import java.util.Objects; diff --git a/src/main/java/org/redkale/mq/MessageClientProducer.java b/src/main/java/org/redkale/mq/spi/MessageClientProducer.java similarity index 92% rename from src/main/java/org/redkale/mq/MessageClientProducer.java rename to src/main/java/org/redkale/mq/spi/MessageClientProducer.java index 5af4a98f0..b0ed9ba91 100644 --- a/src/main/java/org/redkale/mq/MessageClientProducer.java +++ b/src/main/java/org/redkale/mq/spi/MessageClientProducer.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/org/redkale/mq/MessageCoder.java b/src/main/java/org/redkale/mq/spi/MessageCoder.java similarity index 96% rename from src/main/java/org/redkale/mq/MessageCoder.java rename to src/main/java/org/redkale/mq/spi/MessageCoder.java index c3dcbb112..ac35071cf 100644 --- a/src/main/java/org/redkale/mq/MessageCoder.java +++ b/src/main/java/org/redkale/mq/spi/MessageCoder.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.io.Serializable; import java.math.BigInteger; diff --git a/src/main/java/org/redkale/mq/MessageModuleEngine.java b/src/main/java/org/redkale/mq/spi/MessageModuleEngine.java similarity index 98% rename from src/main/java/org/redkale/mq/MessageModuleEngine.java rename to src/main/java/org/redkale/mq/spi/MessageModuleEngine.java index b134189c8..d2cb8f3c0 100644 --- a/src/main/java/org/redkale/mq/MessageModuleEngine.java +++ b/src/main/java/org/redkale/mq/spi/MessageModuleEngine.java @@ -1,8 +1,10 @@ /* * */ -package org.redkale.mq; +package org.redkale.mq.spi; +import org.redkale.mq.spi.MessageAgent; +import org.redkale.mq.spi.MessageAgentProvider; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashSet; @@ -23,6 +25,10 @@ import org.redkale.inject.ResourceAnnotationProvider; import org.redkale.inject.ResourceEvent; import org.redkale.inject.ResourceFactory; import org.redkale.inject.ResourceTypeLoader; +import org.redkale.mq.MessageConsumer; +import org.redkale.mq.MessageProducer; +import org.redkale.mq.ResourceConsumer; +import org.redkale.mq.ResourceProducer; import org.redkale.net.http.RestException; import org.redkale.util.AnyValue; import org.redkale.util.AnyValueWriter; diff --git a/src/main/java/org/redkale/mq/MessageProcessor.java b/src/main/java/org/redkale/mq/spi/MessageProcessor.java similarity index 83% rename from src/main/java/org/redkale/mq/MessageProcessor.java rename to src/main/java/org/redkale/mq/spi/MessageProcessor.java index bdfc8d180..f71122acf 100644 --- a/src/main/java/org/redkale/mq/MessageProcessor.java +++ b/src/main/java/org/redkale/mq/spi/MessageProcessor.java @@ -1,7 +1,7 @@ /* * */ -package org.redkale.mq; +package org.redkale.mq.spi; /** * diff --git a/src/main/java/org/redkale/mq/MessageRecord.java b/src/main/java/org/redkale/mq/spi/MessageRecord.java similarity index 95% rename from src/main/java/org/redkale/mq/MessageRecord.java rename to src/main/java/org/redkale/mq/spi/MessageRecord.java index 977379159..bd4a18798 100644 --- a/src/main/java/org/redkale/mq/MessageRecord.java +++ b/src/main/java/org/redkale/mq/spi/MessageRecord.java @@ -3,8 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; +import org.redkale.mq.spi.HttpResultCoder; +import org.redkale.mq.spi.MessageCoder; +import org.redkale.mq.spi.HttpSimpleRequestCoder; import java.io.Serializable; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/src/main/java/org/redkale/mq/MessageRecordSerializer.java b/src/main/java/org/redkale/mq/spi/MessageRecordSerializer.java similarity index 96% rename from src/main/java/org/redkale/mq/MessageRecordSerializer.java rename to src/main/java/org/redkale/mq/spi/MessageRecordSerializer.java index 1c37f2cff..889f655e0 100644 --- a/src/main/java/org/redkale/mq/MessageRecordSerializer.java +++ b/src/main/java/org/redkale/mq/spi/MessageRecordSerializer.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.io.Serializable; import java.nio.ByteBuffer; diff --git a/src/main/java/org/redkale/mq/MessageRespFuture.java b/src/main/java/org/redkale/mq/spi/MessageRespFuture.java similarity index 95% rename from src/main/java/org/redkale/mq/MessageRespFuture.java rename to src/main/java/org/redkale/mq/spi/MessageRespFuture.java index 0c3a6714a..6a7375988 100644 --- a/src/main/java/org/redkale/mq/MessageRespFuture.java +++ b/src/main/java/org/redkale/mq/spi/MessageRespFuture.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.util.concurrent.*; import java.util.logging.*; diff --git a/src/main/java/org/redkale/mq/MessageRespProcessor.java b/src/main/java/org/redkale/mq/spi/MessageRespProcessor.java similarity index 98% rename from src/main/java/org/redkale/mq/MessageRespProcessor.java rename to src/main/java/org/redkale/mq/spi/MessageRespProcessor.java index 6059a0533..31618bd63 100644 --- a/src/main/java/org/redkale/mq/MessageRespProcessor.java +++ b/src/main/java/org/redkale/mq/spi/MessageRespProcessor.java @@ -1,7 +1,7 @@ /* * */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/org/redkale/mq/MessageServlet.java b/src/main/java/org/redkale/mq/spi/MessageServlet.java similarity index 96% rename from src/main/java/org/redkale/mq/MessageServlet.java rename to src/main/java/org/redkale/mq/spi/MessageServlet.java index 973c4d123..57c0ea739 100644 --- a/src/main/java/org/redkale/mq/MessageServlet.java +++ b/src/main/java/org/redkale/mq/spi/MessageServlet.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.util.concurrent.CompletionException; import java.util.logging.Level; diff --git a/src/main/java/org/redkale/mq/SncpMessageRequest.java b/src/main/java/org/redkale/mq/spi/SncpMessageRequest.java similarity index 92% rename from src/main/java/org/redkale/mq/SncpMessageRequest.java rename to src/main/java/org/redkale/mq/spi/SncpMessageRequest.java index cec23b478..5817f63f5 100644 --- a/src/main/java/org/redkale/mq/SncpMessageRequest.java +++ b/src/main/java/org/redkale/mq/spi/SncpMessageRequest.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import java.nio.ByteBuffer; import org.redkale.net.sncp.*; diff --git a/src/main/java/org/redkale/mq/SncpMessageResponse.java b/src/main/java/org/redkale/mq/spi/SncpMessageResponse.java similarity index 95% rename from src/main/java/org/redkale/mq/SncpMessageResponse.java rename to src/main/java/org/redkale/mq/spi/SncpMessageResponse.java index 6f774204a..bbc1bca28 100644 --- a/src/main/java/org/redkale/mq/SncpMessageResponse.java +++ b/src/main/java/org/redkale/mq/spi/SncpMessageResponse.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import org.redkale.convert.bson.BsonWriter; import org.redkale.net.sncp.*; diff --git a/src/main/java/org/redkale/mq/SncpMessageServlet.java b/src/main/java/org/redkale/mq/spi/SncpMessageServlet.java similarity index 94% rename from src/main/java/org/redkale/mq/SncpMessageServlet.java rename to src/main/java/org/redkale/mq/spi/SncpMessageServlet.java index 1d1545cce..092e8cdcb 100644 --- a/src/main/java/org/redkale/mq/SncpMessageServlet.java +++ b/src/main/java/org/redkale/mq/spi/SncpMessageServlet.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.redkale.mq; +package org.redkale.mq.spi; import org.redkale.net.Context; import org.redkale.net.Request; diff --git a/src/main/java/org/redkale/net/http/HttpServer.java b/src/main/java/org/redkale/net/http/HttpServer.java index 594ffda8e..336ec9ccd 100644 --- a/src/main/java/org/redkale/net/http/HttpServer.java +++ b/src/main/java/org/redkale/net/http/HttpServer.java @@ -5,6 +5,7 @@ */ package org.redkale.net.http; +import org.redkale.mq.spi.MessageAgent; import java.lang.reflect.Field; import java.net.HttpCookie; import java.text.*; diff --git a/src/main/java/org/redkale/net/http/Rest.java b/src/main/java/org/redkale/net/http/Rest.java index 88ecd47f0..c396e28d6 100644 --- a/src/main/java/org/redkale/net/http/Rest.java +++ b/src/main/java/org/redkale/net/http/Rest.java @@ -5,6 +5,7 @@ */ package org.redkale.net.http; +import org.redkale.mq.spi.MessageAgent; import java.io.*; import java.lang.annotation.*; import static java.lang.annotation.ElementType.TYPE; diff --git a/src/main/java/org/redkale/net/http/WebSocketNode.java b/src/main/java/org/redkale/net/http/WebSocketNode.java index 1037524ea..c9834c4d1 100644 --- a/src/main/java/org/redkale/net/http/WebSocketNode.java +++ b/src/main/java/org/redkale/net/http/WebSocketNode.java @@ -17,7 +17,7 @@ import org.redkale.boot.Application; import static org.redkale.boot.Application.RESNAME_APP_NODEID; import org.redkale.convert.*; import org.redkale.convert.json.JsonConvert; -import org.redkale.mq.MessageAgent; +import org.redkale.mq.spi.MessageAgent; import static org.redkale.net.http.WebSocket.RETCODE_GROUP_EMPTY; import org.redkale.net.sncp.Sncp; import org.redkale.service.*; diff --git a/src/main/java/org/redkale/net/http/WebSocketServlet.java b/src/main/java/org/redkale/net/http/WebSocketServlet.java index e36295da2..6469ab9e1 100644 --- a/src/main/java/org/redkale/net/http/WebSocketServlet.java +++ b/src/main/java/org/redkale/net/http/WebSocketServlet.java @@ -23,7 +23,7 @@ import static org.redkale.boot.Application.RESNAME_SERVER_RESFACTORY; import org.redkale.convert.Convert; import org.redkale.inject.Resourcable; import org.redkale.inject.ResourceFactory; -import org.redkale.mq.MessageAgent; +import org.redkale.mq.spi.MessageAgent; import org.redkale.net.*; import org.redkale.util.*; diff --git a/src/main/java/org/redkale/net/sncp/Sncp.java b/src/main/java/org/redkale/net/sncp/Sncp.java index 68abdfd3a..8047399de 100644 --- a/src/main/java/org/redkale/net/sncp/Sncp.java +++ b/src/main/java/org/redkale/net/sncp/Sncp.java @@ -21,7 +21,7 @@ import org.redkale.convert.Convert; import org.redkale.convert.bson.BsonConvert; import org.redkale.inject.Resourcable; import org.redkale.inject.ResourceFactory; -import org.redkale.mq.MessageAgent; +import org.redkale.mq.spi.MessageAgent; import org.redkale.net.http.WebSocketNode; import org.redkale.net.sncp.SncpRemoteInfo.SncpRemoteAction; import org.redkale.schedule.Scheduled; diff --git a/src/main/java/org/redkale/net/sncp/SncpRemoteInfo.java b/src/main/java/org/redkale/net/sncp/SncpRemoteInfo.java index a10f889f9..61cd71759 100644 --- a/src/main/java/org/redkale/net/sncp/SncpRemoteInfo.java +++ b/src/main/java/org/redkale/net/sncp/SncpRemoteInfo.java @@ -3,6 +3,9 @@ */ package org.redkale.net.sncp; +import org.redkale.mq.spi.MessageRecord; +import org.redkale.mq.spi.MessageClient; +import org.redkale.mq.spi.MessageAgent; import java.lang.annotation.Annotation; import java.lang.reflect.*; import java.net.*; diff --git a/src/main/java/org/redkale/util/RedkaleClassLoader.java b/src/main/java/org/redkale/util/RedkaleClassLoader.java index f71a62e0c..86207a8f7 100644 --- a/src/main/java/org/redkale/util/RedkaleClassLoader.java +++ b/src/main/java/org/redkale/util/RedkaleClassLoader.java @@ -59,6 +59,7 @@ public class RedkaleClassLoader extends URLClassLoader { "org.redkale.lock", "org.redkale.lock.spi", "org.redkale.mq", + "org.redkale.mq.spi", "org.redkale.net", "org.redkale.net.client", "org.redkale.net.http", diff --git a/src/test/java/org/redkale/test/http/RequestCoderTest.java b/src/test/java/org/redkale/test/http/RequestCoderTest.java index 42a5703d4..4fac7eaf2 100644 --- a/src/test/java/org/redkale/test/http/RequestCoderTest.java +++ b/src/test/java/org/redkale/test/http/RequestCoderTest.java @@ -6,7 +6,7 @@ package org.redkale.test.http; import java.lang.reflect.Field; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.redkale.mq.HttpSimpleRequestCoder; +import org.redkale.mq.spi.HttpSimpleRequestCoder; import org.redkale.net.client.ClientRequest; import org.redkale.net.http.HttpSimpleRequest;