Skip to content

Commit 6148464

Browse files
JavaSaBrJavaSaBr
committed
extract services
1 parent 258f387 commit 6148464

File tree

54 files changed

+141
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+141
-135
lines changed

‎base/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apply from: "$rootDir/gradle/configure-java.gradle"
33

44
dependencies {
55
api libs.gson
6+
api libs.project.reactor.core
67
api libs.rlib.collections
78
testImplementation projects.testSupport
89
}

‎legacy/src/main/java/javasabr/mqtt/legacy/util/ReactorUtils.java‎ renamed to ‎base/src/main/java/javasabr/mqtt/base/utils/ReactorUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package javasabr.mqtt.legacy.util;
1+
package javasabr.mqtt.base.utils;
22

33
import java.util.function.BiFunction;
44
import java.util.function.Consumer;

‎legacy/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ plugins {
77
apply from: "$rootDir/gradle/configure-java.gradle"
88

99
dependencies {
10-
implementation projects.model
11-
implementation projects.base
12-
implementation projects.network
10+
implementation projects.service
1311

1412
implementation libs.rlib.network
1513
implementation libs.rlib.logger.slf4j

‎legacy/src/main/java/javasabr/mqtt/legacy/config/MqttBrokerConfig.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
package javasabr.mqtt.legacy.config;
22

3-
import javasabr.mqtt.legacy.handler.client.DefaultMqttClientReleaseHandler;
3+
import javasabr.mqtt.service.handler.client.DefaultMqttClientReleaseHandler;
44
import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
5-
import javasabr.mqtt.legacy.handler.packet.in.ConnectInPacketHandler;
6-
import javasabr.mqtt.legacy.handler.packet.in.DisconnetInPacketHandler;
5+
import javasabr.mqtt.service.handler.in.ConnectInPacketHandler;
6+
import javasabr.mqtt.service.handler.in.DisconnetInPacketHandler;
77
import javasabr.mqtt.network.handler.packet.in.PacketInHandler;
8-
import javasabr.mqtt.legacy.handler.packet.in.PublishAckInPacketHandler;
9-
import javasabr.mqtt.legacy.handler.packet.in.PublishCompleteInPacketHandler;
10-
import javasabr.mqtt.legacy.handler.packet.in.PublishInPacketHandler;
11-
import javasabr.mqtt.legacy.handler.packet.in.PublishReceiveInPacketHandler;
12-
import javasabr.mqtt.legacy.handler.packet.in.PublishReleaseInPacketHandler;
13-
import javasabr.mqtt.legacy.handler.packet.in.SubscribeInPacketHandler;
14-
import javasabr.mqtt.legacy.handler.packet.in.UnsubscribeInPacketHandler;
15-
import javasabr.mqtt.legacy.handler.publish.in.PublishInHandler;
16-
import javasabr.mqtt.legacy.handler.publish.in.Qos0PublishInHandler;
17-
import javasabr.mqtt.legacy.handler.publish.in.Qos1PublishInHandler;
18-
import javasabr.mqtt.legacy.handler.publish.in.Qos2PublishInHandler;
19-
import javasabr.mqtt.legacy.handler.publish.out.PublishOutHandler;
20-
import javasabr.mqtt.legacy.handler.publish.out.Qos0PublishOutHandler;
21-
import javasabr.mqtt.legacy.handler.publish.out.Qos1PublishOutHandler;
22-
import javasabr.mqtt.legacy.handler.publish.out.Qos2PublishOutHandler;
8+
import javasabr.mqtt.service.handler.in.PublishAckInPacketHandler;
9+
import javasabr.mqtt.service.handler.in.PublishCompleteInPacketHandler;
10+
import javasabr.mqtt.service.handler.in.PublishInPacketHandler;
11+
import javasabr.mqtt.service.handler.in.PublishReceiveInPacketHandler;
12+
import javasabr.mqtt.service.handler.in.PublishReleaseInPacketHandler;
13+
import javasabr.mqtt.service.handler.in.SubscribeInPacketHandler;
14+
import javasabr.mqtt.service.handler.in.UnsubscribeInPacketHandler;
15+
import javasabr.mqtt.network.handler.publish.PublishInHandler;
16+
import javasabr.mqtt.service.handler.publish.in.Qos0PublishInHandler;
17+
import javasabr.mqtt.service.handler.publish.in.Qos1PublishInHandler;
18+
import javasabr.mqtt.service.handler.publish.in.Qos2PublishInHandler;
19+
import javasabr.mqtt.service.handler.publish.out.PublishOutHandler;
20+
import javasabr.mqtt.service.handler.publish.out.Qos0PublishOutHandler;
21+
import javasabr.mqtt.service.handler.publish.out.Qos1PublishOutHandler;
22+
import javasabr.mqtt.service.handler.publish.out.Qos2PublishOutHandler;
2323
import javasabr.mqtt.network.packet.PacketType;
24-
import javasabr.mqtt.legacy.service.AuthenticationService;
25-
import javasabr.mqtt.legacy.service.ClientIdRegistry;
26-
import javasabr.mqtt.legacy.service.CredentialSource;
27-
import javasabr.mqtt.legacy.service.MqttSessionService;
28-
import javasabr.mqtt.legacy.service.PublishingService;
29-
import javasabr.mqtt.legacy.service.SubscriptionService;
30-
import javasabr.mqtt.legacy.service.impl.DefaultPublishingService;
31-
import javasabr.mqtt.legacy.service.impl.FileCredentialsSource;
32-
import javasabr.mqtt.legacy.service.impl.InMemoryClientIdRegistry;
33-
import javasabr.mqtt.legacy.service.impl.InMemoryMqttSessionService;
34-
import javasabr.mqtt.legacy.service.impl.SimpleAuthenticationService;
35-
import javasabr.mqtt.legacy.service.impl.SimpleSubscriptionService;
24+
import javasabr.mqtt.service.AuthenticationService;
25+
import javasabr.mqtt.service.ClientIdRegistry;
26+
import javasabr.mqtt.service.CredentialSource;
27+
import javasabr.mqtt.service.MqttSessionService;
28+
import javasabr.mqtt.service.PublishingService;
29+
import javasabr.mqtt.service.SubscriptionService;
30+
import javasabr.mqtt.service.impl.DefaultPublishingService;
31+
import javasabr.mqtt.service.impl.FileCredentialsSource;
32+
import javasabr.mqtt.service.impl.InMemoryClientIdRegistry;
33+
import javasabr.mqtt.service.impl.InMemoryMqttSessionService;
34+
import javasabr.mqtt.service.impl.SimpleAuthenticationService;
35+
import javasabr.mqtt.service.impl.SimpleSubscriptionService;
3636
import lombok.RequiredArgsConstructor;
3737
import lombok.extern.log4j.Log4j2;
3838
import org.springframework.context.annotation.Bean;

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/package-info.java‎

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

‎legacy/src/test/groovy/javasabr/mqtt/legacy/integration/PublishRetryTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import javasabr.mqtt.network.packet.out.PublishReceived311OutPacket
1313
import javasabr.mqtt.network.packet.out.PublishReceived5OutPacket
1414
import javasabr.mqtt.network.packet.out.Subscribe311OutPacket
1515
import javasabr.mqtt.network.packet.out.Subscribe5OutPacket
16-
import javasabr.mqtt.legacy.service.MqttSessionService
16+
import javasabr.mqtt.service.MqttSessionService
1717
import javasabr.mqtt.model.QoS
1818
import javasabr.mqtt.model.reason.code.ConnectAckReasonCode
1919
import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode

‎legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/ClientIdRegistryTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package javasabr.mqtt.legacy.integration.service
22

33
import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode
4-
import javasabr.mqtt.legacy.service.ClientIdRegistry
4+
import javasabr.mqtt.service.ClientIdRegistry
55
import javasabr.mqtt.legacy.integration.IntegrationSpecification
66
import javasabr.rlib.common.util.StringUtils
77
import org.springframework.beans.factory.annotation.Autowired

‎legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/MqttSessionServiceTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package javasabr.mqtt.legacy.integration.service
22

33
import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode
4-
import javasabr.mqtt.legacy.service.ClientIdRegistry
5-
import javasabr.mqtt.legacy.service.MqttSessionService
4+
import javasabr.mqtt.service.ClientIdRegistry
5+
import javasabr.mqtt.service.MqttSessionService
66
import javasabr.mqtt.legacy.integration.IntegrationSpecification
77
import org.springframework.beans.factory.annotation.Autowired
88

‎legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/SubscribtionServiceTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package javasabr.mqtt.legacy.integration.service
22

33
import com.hivemq.client.mqtt.datatypes.MqttQos
44
import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException
5-
import javasabr.mqtt.legacy.service.ClientIdRegistry
6-
import javasabr.mqtt.legacy.service.impl.SimpleSubscriptionService
5+
import javasabr.mqtt.service.ClientIdRegistry
6+
import javasabr.mqtt.service.impl.SimpleSubscriptionService
77
import javasabr.mqtt.legacy.integration.IntegrationSpecification
88
import javasabr.mqtt.model.ActionResult
99
import javasabr.mqtt.model.subscriber.SingleSubscriber

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/PublishInHandler.java‎ renamed to ‎network/src/main/java/javasabr/mqtt/network/handler/publish/PublishInHandler.java‎

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

33
import javasabr.mqtt.network.MqttClient;
44
import javasabr.mqtt.network.packet.in.PublishInPacket;

0 commit comments

Comments
 (0)