Skip to content

Commit c964240

Browse files
JavaSaBrJavaSaBr
authored
feature: [issues-40] upgrade java stack part3 (#43)
Finished restructuring the project
1 parent 8215ba5 commit c964240

File tree

205 files changed

+677
-670
lines changed

Some content is hidden

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

205 files changed

+677
-670
lines changed

‎application/build.gradle‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,25 @@
11
plugins {
2-
id "java-library"
2+
id "java"
3+
id "groovy"
4+
id "org.springframework.boot"
35
}
46

7+
apply from: "$rootDir/gradle/configure-java.gradle"
8+
59
dependencies {
10+
implementation projects.service
11+
implementation libs.rlib.logger.slf4j
12+
implementation libs.springboot.starter.core
13+
implementation libs.springboot.starter.log4j2
614

715
testImplementation projects.testSupport
16+
}
17+
18+
tasks.withType(GroovyCompile).configureEach {
19+
options.forkOptions.jvmArgs += "--enable-preview"
20+
}
21+
22+
configurations.each {
23+
it.exclude group: "org.slf4j", module: "slf4j-log4j12"
24+
it.exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
825
}

‎legacy/src/main/java/javasabr/mqtt/legacy/MqttBrokerApplication.java‎ renamed to ‎application/src/main/java/javasabr/mqtt/application/MqttBrokerApplication.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package javasabr.mqtt.legacy;
1+
package javasabr.mqtt.application;
22

3-
import javasabr.mqtt.legacy.config.MqttBrokerConfig;
4-
import javasabr.mqtt.legacy.config.MqttNetworkConfig;
3+
import javasabr.mqtt.application.config.MqttBrokerConfig;
4+
import javasabr.mqtt.application.config.MqttNetworkConfig;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.boot.SpringApplication;
77
import org.springframework.context.annotation.Configuration;

‎legacy/src/main/java/javasabr/mqtt/legacy/config/MqttBrokerConfig.java‎ renamed to ‎application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java‎

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

3-
import javasabr.mqtt.legacy.handler.client.DefaultMqttClientReleaseHandler;
4-
import javasabr.mqtt.legacy.handler.client.MqttClientReleaseHandler;
5-
import javasabr.mqtt.legacy.handler.packet.in.ConnectInPacketHandler;
6-
import javasabr.mqtt.legacy.handler.packet.in.DisconnetInPacketHandler;
7-
import javasabr.mqtt.legacy.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;
23-
import javasabr.mqtt.legacy.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;
3+
import javasabr.mqtt.service.handler.client.DefaultMqttClientReleaseHandler;
4+
import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
5+
import javasabr.mqtt.service.handler.in.ConnectInPacketHandler;
6+
import javasabr.mqtt.service.handler.in.DisconnetInPacketHandler;
7+
import javasabr.mqtt.network.handler.packet.in.PacketInHandler;
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;
23+
import javasabr.mqtt.network.packet.PacketType;
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/config/MqttNetworkConfig.java‎ renamed to ‎application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java‎

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

3-
import javasabr.mqtt.legacy.handler.client.MqttClientReleaseHandler;
4-
import javasabr.mqtt.legacy.handler.packet.in.PacketInHandler;
3+
import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
4+
import javasabr.mqtt.network.handler.packet.in.PacketInHandler;
55
import javasabr.mqtt.model.MqttProperties;
66
import javasabr.mqtt.model.QoS;
7-
import javasabr.mqtt.legacy.network.MqttConnection;
8-
import javasabr.mqtt.legacy.network.client.ExternalMqttClient;
9-
import javasabr.mqtt.legacy.network.client.InternalMqttClient;
10-
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
7+
import javasabr.mqtt.network.MqttConnection;
8+
import javasabr.mqtt.network.client.ExternalMqttClient;
9+
import javasabr.mqtt.network.client.InternalMqttClient;
10+
import javasabr.mqtt.network.MqttClient.UnsafeMqttClient;
1111
import java.net.InetSocketAddress;
1212
import java.nio.channels.AsynchronousSocketChannel;
1313
import java.util.function.BiFunction;

‎application/src/main/java/javasabr/mqtt/application/config/package-info.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@NullMarked
2+
package javasabr.mqtt.application.config;
3+
4+
import org.jspecify.annotations.NullMarked;

‎legacy/src/main/resources/application.properties‎ renamed to ‎application/src/main/resources/application.properties‎

File renamed without changes.

‎legacy/src/main/resources/credentials‎ renamed to ‎application/src/main/resources/credentials‎

File renamed without changes.

‎legacy/src/main/resources/log4j2.xml‎ renamed to ‎application/src/main/resources/log4j2.xml‎

File renamed without changes.

‎legacy/src/test/groovy/javasabr/mqtt/legacy/UnitSpecification.groovy‎ renamed to ‎application/src/test/groovy/javasabr/mqtt/application/UnitSpecification.groovy‎

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

33
import spock.lang.Specification
44

‎legacy/src/test/groovy/javasabr/mqtt/legacy/extension/SpecificationExtensions.groovy‎ renamed to ‎application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package javasabr.mqtt.legacy.extension
1+
package javasabr.mqtt.application.extension
22

3-
import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket
4-
import javasabr.mqtt.legacy.util.MqttDataUtils
3+
import javasabr.mqtt.network.packet.out.MqttWritablePacket
4+
import javasabr.mqtt.network.utils.MqttDataUtils
55
import javasabr.mqtt.model.PacketProperty
66
import javasabr.mqtt.model.data.type.PacketDataType
77
import javasabr.mqtt.model.data.type.StringPair

0 commit comments

Comments
 (0)