Skip to content

Commit 4131bb5

Browse files
JavaSaBrJavaSaBr
committed
move classes
1 parent f30a643 commit 4131bb5

37 files changed

Lines changed: 93 additions & 88 deletions

‎application/src/main/java/javasabr/mqtt/broker/application/config/MqttBrokerSpringConfig.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,17 @@
1616
import javasabr.mqtt.service.AuthorizationService;
1717
import javasabr.mqtt.service.ClientIdRegistry;
1818
import javasabr.mqtt.service.ConnectionService;
19-
import javasabr.mqtt.service.IncomingPublishRouter;
2019
import javasabr.mqtt.service.MessageOutFactoryService;
21-
import javasabr.mqtt.service.PublishDataStorage;
22-
import javasabr.mqtt.service.PublishDispatcher;
23-
import javasabr.mqtt.service.RetainPublishService;
2420
import javasabr.mqtt.service.SubscriptionService;
2521
import javasabr.mqtt.service.TopicService;
2622
import javasabr.mqtt.service.handler.client.ExternalNetworkMqttUserReleaseHandler;
2723
import javasabr.mqtt.service.impl.DefaultConnectionService;
28-
import javasabr.mqtt.service.impl.DefaultIncomingPublishRouter;
2924
import javasabr.mqtt.service.impl.DefaultMessageOutFactoryService;
3025
import javasabr.mqtt.service.impl.DefaultMqttConnectionFactory;
31-
import javasabr.mqtt.service.impl.DefaultPublishDispatcher;
3226
import javasabr.mqtt.service.impl.DefaultTopicService;
3327
import javasabr.mqtt.service.impl.DisabledAuthorizationService;
3428
import javasabr.mqtt.service.impl.ExternalNetworkMqttUserFactory;
3529
import javasabr.mqtt.service.impl.InMemoryClientIdRegistry;
36-
import javasabr.mqtt.service.impl.InMemoryRetainPublishService;
3730
import javasabr.mqtt.service.impl.InMemorySubscriptionService;
3831
import javasabr.mqtt.service.message.handler.MqttInMessageHandler;
3932
import javasabr.mqtt.service.message.handler.impl.ConnectInMqttInMessageHandler;
@@ -48,15 +41,22 @@
4841
import javasabr.mqtt.service.message.out.factory.Mqtt311MessageOutFactory;
4942
import javasabr.mqtt.service.message.out.factory.Mqtt5MessageOutFactory;
5043
import javasabr.mqtt.service.message.out.factory.MqttMessageOutFactory;
51-
import javasabr.mqtt.service.publish.handler.IncomingPublishProcessor;
52-
import javasabr.mqtt.service.publish.handler.SubscriberPublishSender;
53-
import javasabr.mqtt.service.publish.handler.impl.Qos0IncomingPublishProcessor;
54-
import javasabr.mqtt.service.publish.handler.impl.Qos0SubscriberPublishSender;
55-
import javasabr.mqtt.service.publish.handler.impl.Qos1IncomingPublishProcessor;
56-
import javasabr.mqtt.service.publish.handler.impl.Qos1SubscriberPublishSender;
57-
import javasabr.mqtt.service.publish.handler.impl.Qos2IncomingPublishProcessor;
58-
import javasabr.mqtt.service.publish.handler.impl.Qos2SubscriberPublishSender;
44+
import javasabr.mqtt.service.publish.IncomingPublishRouter;
45+
import javasabr.mqtt.service.publish.PublishDataStorage;
46+
import javasabr.mqtt.service.publish.PublishDispatcher;
47+
import javasabr.mqtt.service.publish.RetainPublishService;
48+
import javasabr.mqtt.service.publish.impl.DefaultIncomingPublishRouter;
49+
import javasabr.mqtt.service.publish.impl.DefaultPublishDispatcher;
5950
import javasabr.mqtt.service.publish.impl.InMemoryPublishDataStorage;
51+
import javasabr.mqtt.service.publish.impl.InMemoryRetainPublishService;
52+
import javasabr.mqtt.service.publish.processor.IncomingPublishProcessor;
53+
import javasabr.mqtt.service.publish.processor.Qos0IncomingPublishProcessor;
54+
import javasabr.mqtt.service.publish.processor.Qos1IncomingPublishProcessor;
55+
import javasabr.mqtt.service.publish.processor.Qos2IncomingPublishProcessor;
56+
import javasabr.mqtt.service.publish.sender.Qos0SubscriberPublishSender;
57+
import javasabr.mqtt.service.publish.sender.Qos1SubscriberPublishSender;
58+
import javasabr.mqtt.service.publish.sender.Qos2SubscriberPublishSender;
59+
import javasabr.mqtt.service.publish.sender.SubscriberPublishSender;
6060
import javasabr.mqtt.service.session.MqttSessionService;
6161
import javasabr.mqtt.service.session.impl.InMemoryMqttSessionService;
6262
import javasabr.rlib.network.NetworkFactory;

‎application/src/test/resources/log4j2-test.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
<Logger name="javasabr.mqtt.model.network.impl.DefaultMqttSession" level="DEBUG" additivity="false">
1616
<AppenderRef ref="BrokerConsoleTest"/>
1717
</Logger>
18-
<Logger name="javasabr.mqtt.service.impl.DefaultIncomingPublishRouter" level="DEBUG" additivity="false">
18+
<Logger name="javasabr.mqtt.service.publish.impl.DefaultIncomingPublishRouter" level="DEBUG" additivity="false">
1919
<AppenderRef ref="BrokerConsoleTest"/>
2020
</Logger>
21-
<Logger name="javasabr.mqtt.service.publish.handler.impl.AbstractIncomingPublishProcessor" level="DEBUG" additivity="false">
21+
<Logger name="javasabr.mqtt.service.publish.processor.AbstractIncomingPublishProcessor" level="DEBUG" additivity="false">
2222
<AppenderRef ref="BrokerConsoleTest"/>
2323
</Logger>
24-
<Logger name="javasabr.mqtt.service.publish.handler.impl.Qos1IncomingPublishProcessor" level="DEBUG" additivity="false">
24+
<Logger name="javasabr.mqtt.service.publish.processor.Qos1IncomingPublishProcessor" level="DEBUG" additivity="false">
2525
<AppenderRef ref="BrokerConsoleTest"/>
2626
</Logger>
2727
<Logger name="javasabr.mqtt.service.session.impl.InMemoryMqttSessionService" level="DEBUG" additivity="false">

‎core-service/src/main/java/javasabr/mqtt/service/message/handler/impl/PublishMqttInMessageHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
import javasabr.mqtt.network.message.in.PublishMqttInMessage;
1616
import javasabr.mqtt.network.session.NetworkMqttSession;
1717
import javasabr.mqtt.service.AuthorizationService;
18-
import javasabr.mqtt.service.IncomingPublishRouter;
1918
import javasabr.mqtt.service.MessageOutFactoryService;
20-
import javasabr.mqtt.service.PublishDataStorage;
2119
import javasabr.mqtt.service.TopicService;
2220
import javasabr.mqtt.service.message.validator.PublishMessageExpiryIntervalMqttInMessageFieldValidator;
2321
import javasabr.mqtt.service.message.validator.PublishPayloadMqttInMessageFieldValidator;
2422
import javasabr.mqtt.service.message.validator.PublishQosMqttInMessageFieldValidator;
2523
import javasabr.mqtt.service.message.validator.PublishResponseTopicMqttInMessageFieldValidator;
2624
import javasabr.mqtt.service.message.validator.PublishRetainMqttInMessageFieldValidator;
2725
import javasabr.mqtt.service.message.validator.PublishTopicAliasMqttInMessageFieldValidator;
26+
import javasabr.mqtt.service.publish.IncomingPublishRouter;
27+
import javasabr.mqtt.service.publish.PublishDataStorage;
2828
import javasabr.rlib.common.util.StringUtils;
2929
import lombok.AccessLevel;
3030
import lombok.CustomLog;

‎core-service/src/main/java/javasabr/mqtt/service/message/handler/impl/SubscribeMqttInMessageHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
import javasabr.mqtt.network.message.out.MqttOutMessage;
2929
import javasabr.mqtt.network.session.NetworkMqttSession;
3030
import javasabr.mqtt.service.MessageOutFactoryService;
31-
import javasabr.mqtt.service.PublishDispatcher;
32-
import javasabr.mqtt.service.RetainPublishService;
3331
import javasabr.mqtt.service.SubscriptionService;
3432
import javasabr.mqtt.service.TopicService;
33+
import javasabr.mqtt.service.publish.PublishDispatcher;
34+
import javasabr.mqtt.service.publish.RetainPublishService;
3535
import javasabr.rlib.collections.array.Array;
3636
import javasabr.rlib.collections.array.ArrayCollectors;
3737
import javasabr.rlib.collections.array.ArrayFactory;

core-service/src/main/java/javasabr/mqtt/service/IncomingPublishRouter.java renamed to core-service/src/main/java/javasabr/mqtt/service/publish/IncomingPublishRouter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package javasabr.mqtt.service;
1+
package javasabr.mqtt.service.publish;
22

33
import javasabr.mqtt.model.publish.Publish;
44
import javasabr.mqtt.network.user.NetworkMqttUser;

core-service/src/main/java/javasabr/mqtt/service/PublishDataStorage.java renamed to core-service/src/main/java/javasabr/mqtt/service/publish/PublishDataStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package javasabr.mqtt.service;
1+
package javasabr.mqtt.service.publish;
22

33
import java.util.UUID;
44
import javasabr.mqtt.model.PayloadFormat;

core-service/src/main/java/javasabr/mqtt/service/PublishDispatcher.java renamed to core-service/src/main/java/javasabr/mqtt/service/publish/PublishDispatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package javasabr.mqtt.service;
1+
package javasabr.mqtt.service.publish;
22

33
import javasabr.mqtt.model.MqttUser;
44
import javasabr.mqtt.model.publish.Publish;

core-service/src/main/java/javasabr/mqtt/service/RetainPublishService.java renamed to core-service/src/main/java/javasabr/mqtt/service/publish/RetainPublishService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package javasabr.mqtt.service;
1+
package javasabr.mqtt.service.publish;
22

33
import javasabr.mqtt.model.publish.Publish;
44
import javasabr.mqtt.model.topic.TopicFilter;

‎core-service/src/main/java/javasabr/mqtt/service/publish/handler/impl/package-info.java‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎core-service/src/main/java/javasabr/mqtt/service/publish/handler/package-info.java‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)