mq.spi

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;

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.*;

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;

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.*;

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;

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;
     }

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.*;

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;

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;

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;
 

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;
 

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;

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;
 

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.*;
 

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;

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;

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;

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;

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;

src/main/java/org/redkale/mq/spi/MessageProcessor.java

@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.mq;
+package org.redkale.mq.spi;
 
 /**
  *

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;

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;

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.*;

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;

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;

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.*;

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.*;

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;

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.*;

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;

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.*;

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.*;
 

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;

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.*;

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",

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;