diff --git a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/MqttClientApplication.java b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/MqttClientApplication.java similarity index 88% rename from example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/MqttClientApplication.java rename to example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/MqttClientApplication.java index ae1ccc2c..cefdd5ea 100644 --- a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/MqttClientApplication.java +++ b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/MqttClientApplication.java @@ -1,4 +1,4 @@ -package org.dromara.mica.mqtt.client.noear; +package org.dromara.mica.mqtt.client.solon; import org.noear.solon.Solon; import org.noear.solon.annotation.Configuration; diff --git a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/controller/ClientController.java b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/controller/ClientController.java similarity index 73% rename from example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/controller/ClientController.java rename to example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/controller/ClientController.java index 957980f9..cd88ec5c 100644 --- a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/controller/ClientController.java +++ b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/controller/ClientController.java @@ -1,7 +1,7 @@ -package org.dromara.mica.mqtt.client.noear.controller; +package org.dromara.mica.mqtt.client.solon.controller; -import org.dromara.mica.mqtt.client.noear.service.ClientService; +import org.dromara.mica.mqtt.client.solon.service.ClientService; import org.noear.solon.annotation.*; @Mapping("/mqtt/client") diff --git a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientConnectedListener.java b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientConnectedListener.java similarity index 96% rename from example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientConnectedListener.java rename to example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientConnectedListener.java index c36d9851..23b0a8d5 100644 --- a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientConnectedListener.java +++ b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientConnectedListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.mica.mqtt.client.noear.listener; +package org.dromara.mica.mqtt.client.solon.listener; import org.dromara.mica.mqtt.client.solon.event.MqttConnectedEvent; import org.dromara.mica.mqtt.core.client.MqttClientCreator; diff --git a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientDisconnectListener.java b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientDisconnectListener.java similarity index 96% rename from example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientDisconnectListener.java rename to example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientDisconnectListener.java index 789a7881..38ceb255 100644 --- a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientDisconnectListener.java +++ b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientDisconnectListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.mica.mqtt.client.noear.listener; +package org.dromara.mica.mqtt.client.solon.listener; import org.dromara.mica.mqtt.client.solon.event.MqttDisconnectEvent; import org.dromara.mica.mqtt.core.client.MqttClientCreator; diff --git a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientMessageListener.java b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientMessageListener.java similarity index 94% rename from example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientMessageListener.java rename to example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientMessageListener.java index 4266dd20..49778f44 100644 --- a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientMessageListener.java +++ b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientMessageListener.java @@ -1,4 +1,4 @@ -package org.dromara.mica.mqtt.client.noear.listener; +package org.dromara.mica.mqtt.client.solon.listener; import org.dromara.mica.mqtt.client.solon.MqttClientSubscribe; import org.dromara.mica.mqtt.codec.MqttPublishMessage; diff --git a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientSubscribeListener.java b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientSubscribeListener.java similarity index 96% rename from example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientSubscribeListener.java rename to example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientSubscribeListener.java index 2bc607c2..e8a5b63f 100644 --- a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientSubscribeListener.java +++ b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientSubscribeListener.java @@ -1,4 +1,4 @@ -package org.dromara.mica.mqtt.client.noear.listener; +package org.dromara.mica.mqtt.client.solon.listener; import org.dromara.mica.mqtt.client.solon.MqttClientSubscribe; import org.dromara.mica.mqtt.codec.MqttQoS; diff --git a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/service/ClientService.java b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/service/ClientService.java similarity index 93% rename from example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/service/ClientService.java rename to example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/service/ClientService.java index 34568634..0d88e902 100644 --- a/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/noear/service/ClientService.java +++ b/example/mica-mqtt-client-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/client/solon/service/ClientService.java @@ -1,4 +1,4 @@ -package org.dromara.mica.mqtt.client.noear.service; +package org.dromara.mica.mqtt.client.solon.service; import org.dromara.mica.mqtt.client.solon.MqttClientTemplate; diff --git a/example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/SslMqttClientTest.java b/example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/ssl/SslMqttClientTest.java similarity index 97% rename from example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/SslMqttClientTest.java rename to example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/ssl/SslMqttClientTest.java index 57777970..e994c4dc 100644 --- a/example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/SslMqttClientTest.java +++ b/example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/ssl/SslMqttClientTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.mica.mqtt; +package org.dromara.mica.mqtt.ssl; import org.dromara.mica.mqtt.core.client.MqttClient; import org.slf4j.Logger; diff --git a/example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/SslMqttServerTest.java b/example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/ssl/SslMqttServerTest.java similarity index 98% rename from example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/SslMqttServerTest.java rename to example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/ssl/SslMqttServerTest.java index 2dab3aea..d0576fa6 100644 --- a/example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/SslMqttServerTest.java +++ b/example/mica-mqtt-example/src/main/java/org/dromara/mica/mqtt/ssl/SslMqttServerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.mica.mqtt; +package org.dromara.mica.mqtt.ssl; import org.dromara.mica.mqtt.core.server.MqttServer; import org.dromara.mica.mqtt.server.MqttConnectStatusListener; diff --git a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/MqttServerApplication.java b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/MqttServerApplication.java similarity index 88% rename from example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/MqttServerApplication.java rename to example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/MqttServerApplication.java index f34967e8..e5ced682 100644 --- a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/MqttServerApplication.java +++ b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/MqttServerApplication.java @@ -1,4 +1,4 @@ -package org.dromara.mica.mqtt.server.noear; +package org.dromara.mica.mqtt.server.solon; import org.noear.solon.Solon; diff --git a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/controller/ServerController.java b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/controller/ServerController.java similarity index 76% rename from example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/controller/ServerController.java rename to example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/controller/ServerController.java index 29f0e88f..f28ff11d 100644 --- a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/controller/ServerController.java +++ b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/controller/ServerController.java @@ -1,7 +1,7 @@ -package org.dromara.mica.mqtt.server.noear.controller; +package org.dromara.mica.mqtt.server.solon.controller; -import org.dromara.mica.mqtt.server.noear.service.ServerService; +import org.dromara.mica.mqtt.server.solon.service.ServerService; import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Mapping; diff --git a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/listener/MqttConnectOfflineListener.java b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/listener/MqttConnectOfflineListener.java similarity index 96% rename from example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/listener/MqttConnectOfflineListener.java rename to example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/listener/MqttConnectOfflineListener.java index 9d276050..dcb04815 100644 --- a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/listener/MqttConnectOfflineListener.java +++ b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/listener/MqttConnectOfflineListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.mica.mqtt.server.noear.listener; +package org.dromara.mica.mqtt.server.solon.listener; import org.dromara.mica.mqtt.server.solon.event.MqttClientOfflineEvent; import org.noear.solon.annotation.Component; diff --git a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/listener/MqttConnectOnlineListener.java b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/listener/MqttConnectOnlineListener.java similarity index 96% rename from example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/listener/MqttConnectOnlineListener.java rename to example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/listener/MqttConnectOnlineListener.java index 17d841cd..bc84be6a 100644 --- a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/listener/MqttConnectOnlineListener.java +++ b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/listener/MqttConnectOnlineListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.mica.mqtt.server.noear.listener; +package org.dromara.mica.mqtt.server.solon.listener; import org.dromara.mica.mqtt.server.solon.event.MqttClientOnlineEvent; import org.noear.solon.annotation.Component; diff --git a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/service/ServerService.java b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/service/ServerService.java similarity index 93% rename from example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/service/ServerService.java rename to example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/service/ServerService.java index a572d121..e1a5341b 100644 --- a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/service/ServerService.java +++ b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/service/ServerService.java @@ -1,4 +1,4 @@ -package org.dromara.mica.mqtt.server.noear.service; +package org.dromara.mica.mqtt.server.solon.service; import org.dromara.mica.mqtt.server.solon.MqttServerTemplate; import org.noear.solon.annotation.Component; diff --git a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/task/PublishTask.java b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/task/PublishTask.java similarity index 91% rename from example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/task/PublishTask.java rename to example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/task/PublishTask.java index 89ffe1df..76fee932 100644 --- a/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/noear/task/PublishTask.java +++ b/example/mica-mqtt-server-solon-plugin-example/src/main/java/org/dromara/mica/mqtt/server/solon/task/PublishTask.java @@ -1,4 +1,4 @@ -package org.dromara.mica.mqtt.server.noear.task; +package org.dromara.mica.mqtt.server.solon.task; import org.dromara.mica.mqtt.server.solon.MqttServerTemplate; import org.noear.solon.annotation.Component; diff --git a/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientConnectListener.java b/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientConnectListener.java similarity index 96% rename from starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientConnectListener.java rename to starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientConnectListener.java index d0b8108c..cfa723a1 100644 --- a/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientConnectListener.java +++ b/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientConnectListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.mica.mqtt.client.noear.listener; +package org.dromara.mica.mqtt.client.solon.listener; import org.dromara.mica.mqtt.client.solon.event.MqttConnectedEvent; import org.dromara.mica.mqtt.core.client.MqttClientCreator; diff --git a/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientDisConnectListener.java b/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientDisConnectListener.java similarity index 96% rename from starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientDisConnectListener.java rename to starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientDisConnectListener.java index a06c4ca9..e5bcf3ab 100644 --- a/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientDisConnectListener.java +++ b/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientDisConnectListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.mica.mqtt.client.noear.listener; +package org.dromara.mica.mqtt.client.solon.listener; import org.dromara.mica.mqtt.client.solon.event.MqttDisconnectEvent; import org.dromara.mica.mqtt.core.client.MqttClientCreator; diff --git a/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientMessageListener.java b/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientMessageListener.java similarity index 93% rename from starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientMessageListener.java rename to starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientMessageListener.java index 22ecd12f..854432a9 100644 --- a/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientMessageListener.java +++ b/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientMessageListener.java @@ -1,4 +1,4 @@ -package org.dromara.mica.mqtt.client.noear.listener; +package org.dromara.mica.mqtt.client.solon.listener; import org.dromara.mica.mqtt.client.solon.MqttClientSubscribe; import org.dromara.mica.mqtt.codec.MqttPublishMessage; diff --git a/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientSubscribeListener.java b/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientSubscribeListener.java similarity index 96% rename from starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientSubscribeListener.java rename to starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientSubscribeListener.java index e6e3ab8a..dac07276 100644 --- a/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/noear/listener/MqttClientSubscribeListener.java +++ b/starter/mica-mqtt-client-solon-plugin/src/test/java/org/dromara/mica/mqtt/client/solon/listener/MqttClientSubscribeListener.java @@ -1,4 +1,4 @@ -package org.dromara.mica.mqtt.client.noear.listener; +package org.dromara.mica.mqtt.client.solon.listener; import org.dromara.mica.mqtt.client.solon.MqttClientSubscribe; import org.dromara.mica.mqtt.codec.MqttQoS;