Skip to content

Commit 4124492

Browse files
JavaSaBrJavaSaBr
committed
reformat and cleanup
1 parent ba64d6b commit 4124492

File tree

188 files changed

+9135
-9537
lines changed

Some content is hidden

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

188 files changed

+9135
-9537
lines changed

‎build.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ allprojects {
3737
implementation libs.project.reactor.core
3838
implementation libs.gson
3939

40-
compileOnly libs.jetbrains.annotations
4140
compileOnly libs.jspecify
4241
compileOnly libs.lombok
4342
annotationProcessor libs.lombok
@@ -52,8 +51,6 @@ allprojects {
5251
testImplementation libs.groovy.all
5352
testImplementation libs.byte.buddy.dep
5453
testImplementation libs.objenesis
55-
testCompileOnly libs.jetbrains.annotations
56-
testCompileOnly libs.jspecify
5754
}
5855

5956
test {

‎src/main/java/com/ss/mqtt/broker/MqttBrokerApplication.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.ss.mqtt.broker.config.MqttBrokerConfig;
44
import com.ss.mqtt.broker.config.MqttNetworkConfig;
55
import lombok.RequiredArgsConstructor;
6-
import org.jetbrains.annotations.NotNull;
76
import org.springframework.boot.SpringApplication;
87
import org.springframework.context.annotation.Configuration;
98
import org.springframework.context.annotation.Import;
@@ -15,8 +14,7 @@
1514
MqttNetworkConfig.class
1615
})
1716
public class MqttBrokerApplication {
18-
19-
public static void main(@NotNull String[] args) {
20-
SpringApplication.run(MqttBrokerApplication.class, args);
21-
}
17+
static void main(String[] args) {
18+
SpringApplication.run(MqttBrokerApplication.class, args);
19+
}
2220
}

‎src/main/java/com/ss/mqtt/broker/config/MqttBrokerConfig.java‎

Lines changed: 101 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@
22

33
import com.ss.mqtt.broker.handler.client.DefaultMqttClientReleaseHandler;
44
import com.ss.mqtt.broker.handler.client.MqttClientReleaseHandler;
5-
import com.ss.mqtt.broker.handler.packet.in.*;
5+
import com.ss.mqtt.broker.handler.packet.in.ConnectInPacketHandler;
6+
import com.ss.mqtt.broker.handler.packet.in.DisconnetInPacketHandler;
7+
import com.ss.mqtt.broker.handler.packet.in.PacketInHandler;
8+
import com.ss.mqtt.broker.handler.packet.in.PublishAckInPacketHandler;
9+
import com.ss.mqtt.broker.handler.packet.in.PublishCompleteInPacketHandler;
10+
import com.ss.mqtt.broker.handler.packet.in.PublishInPacketHandler;
11+
import com.ss.mqtt.broker.handler.packet.in.PublishReceiveInPacketHandler;
12+
import com.ss.mqtt.broker.handler.packet.in.PublishReleaseInPacketHandler;
13+
import com.ss.mqtt.broker.handler.packet.in.SubscribeInPacketHandler;
14+
import com.ss.mqtt.broker.handler.packet.in.UnsubscribeInPacketHandler;
615
import com.ss.mqtt.broker.handler.publish.in.PublishInHandler;
716
import com.ss.mqtt.broker.handler.publish.in.Qos0PublishInHandler;
817
import com.ss.mqtt.broker.handler.publish.in.Qos1PublishInHandler;
@@ -12,11 +21,20 @@
1221
import com.ss.mqtt.broker.handler.publish.out.Qos1PublishOutHandler;
1322
import com.ss.mqtt.broker.handler.publish.out.Qos2PublishOutHandler;
1423
import com.ss.mqtt.broker.network.packet.PacketType;
15-
import com.ss.mqtt.broker.service.*;
16-
import com.ss.mqtt.broker.service.impl.*;
24+
import com.ss.mqtt.broker.service.AuthenticationService;
25+
import com.ss.mqtt.broker.service.ClientIdRegistry;
26+
import com.ss.mqtt.broker.service.CredentialSource;
27+
import com.ss.mqtt.broker.service.MqttSessionService;
28+
import com.ss.mqtt.broker.service.PublishingService;
29+
import com.ss.mqtt.broker.service.SubscriptionService;
30+
import com.ss.mqtt.broker.service.impl.DefaultPublishingService;
31+
import com.ss.mqtt.broker.service.impl.FileCredentialsSource;
32+
import com.ss.mqtt.broker.service.impl.InMemoryClientIdRegistry;
33+
import com.ss.mqtt.broker.service.impl.InMemoryMqttSessionService;
34+
import com.ss.mqtt.broker.service.impl.SimpleAuthenticationService;
35+
import com.ss.mqtt.broker.service.impl.SimpleSubscriptionService;
1736
import lombok.RequiredArgsConstructor;
1837
import lombok.extern.log4j.Log4j2;
19-
import org.jetbrains.annotations.NotNull;
2038
import org.springframework.context.annotation.Bean;
2139
import org.springframework.context.annotation.Configuration;
2240
import org.springframework.core.env.Environment;
@@ -26,108 +44,95 @@
2644
@RequiredArgsConstructor
2745
public class MqttBrokerConfig {
2846

29-
private final Environment env;
47+
private final Environment env;
3048

31-
@Bean
32-
@NotNull ClientIdRegistry clientIdRegistry() {
33-
return new InMemoryClientIdRegistry(
34-
env.getProperty(
35-
"client.id.available.chars",
36-
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"
37-
),
38-
env.getProperty("client.id.max.length", int.class, 36)
39-
);
40-
}
49+
@Bean
50+
ClientIdRegistry clientIdRegistry() {
51+
return new InMemoryClientIdRegistry(
52+
env.getProperty(
53+
"client.id.available.chars",
54+
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"),
55+
env.getProperty("client.id.max.length", int.class, 36));
56+
}
4157

42-
@Bean
43-
@NotNull MqttSessionService mqttSessionService() {
44-
return new InMemoryMqttSessionService(
45-
env.getProperty("sessions.clean.thread.interval", int.class, 60000)
46-
);
47-
}
58+
@Bean
59+
MqttSessionService mqttSessionService() {
60+
return new InMemoryMqttSessionService(env.getProperty("sessions.clean.thread.interval", int.class, 60000));
61+
}
4862

49-
@Bean
50-
@NotNull CredentialSource credentialSource() {
51-
return new FileCredentialsSource(env.getProperty("credentials.source.file.name", "credentials"));
52-
}
63+
@Bean
64+
CredentialSource credentialSource() {
65+
return new FileCredentialsSource(env.getProperty("credentials.source.file.name", "credentials"));
66+
}
5367

54-
@Bean
55-
@NotNull AuthenticationService authenticationService(@NotNull CredentialSource credentialSource) {
56-
return new SimpleAuthenticationService(
57-
credentialSource,
58-
env.getProperty("authentication.allow.anonymous", boolean.class, false)
59-
);
60-
}
68+
@Bean
69+
AuthenticationService authenticationService(CredentialSource credentialSource) {
70+
return new SimpleAuthenticationService(
71+
credentialSource,
72+
env.getProperty("authentication.allow.anonymous", boolean.class, false));
73+
}
6174

62-
@Bean
63-
PacketInHandler @NotNull [] packetHandlers(
64-
@NotNull AuthenticationService authenticationService,
65-
@NotNull ClientIdRegistry clientIdRegistry,
66-
@NotNull SubscriptionService subscriptionService,
67-
@NotNull PublishingService publishingService,
68-
@NotNull MqttSessionService mqttSessionService
69-
) {
75+
@Bean
76+
PacketInHandler[] packetHandlers(
77+
AuthenticationService authenticationService,
78+
ClientIdRegistry clientIdRegistry,
79+
SubscriptionService subscriptionService,
80+
PublishingService publishingService,
81+
MqttSessionService mqttSessionService) {
7082

71-
var handlers = new PacketInHandler[PacketType.INVALID.ordinal()];
72-
handlers[PacketType.CONNECT.ordinal()] = new ConnectInPacketHandler(
73-
clientIdRegistry,
74-
authenticationService,
75-
mqttSessionService,
76-
subscriptionService
77-
);
78-
handlers[PacketType.SUBSCRIBE.ordinal()] = new SubscribeInPacketHandler(subscriptionService);
79-
handlers[PacketType.UNSUBSCRIBE.ordinal()] = new UnsubscribeInPacketHandler(subscriptionService);
80-
handlers[PacketType.PUBLISH.ordinal()] = new PublishInPacketHandler(publishingService);
81-
handlers[PacketType.DISCONNECT.ordinal()] = new DisconnetInPacketHandler();
82-
handlers[PacketType.PUBLISH_ACK.ordinal()] = new PublishAckInPacketHandler();
83-
handlers[PacketType.PUBLISH_RECEIVED.ordinal()] = new PublishReceiveInPacketHandler();
84-
handlers[PacketType.PUBLISH_RELEASED.ordinal()] = new PublishReleaseInPacketHandler();
85-
handlers[PacketType.PUBLISH_COMPLETED.ordinal()] = new PublishCompleteInPacketHandler();
83+
var handlers = new PacketInHandler[PacketType.INVALID.ordinal()];
84+
handlers[PacketType.CONNECT.ordinal()] = new ConnectInPacketHandler(
85+
clientIdRegistry,
86+
authenticationService,
87+
mqttSessionService,
88+
subscriptionService);
89+
handlers[PacketType.SUBSCRIBE.ordinal()] = new SubscribeInPacketHandler(subscriptionService);
90+
handlers[PacketType.UNSUBSCRIBE.ordinal()] = new UnsubscribeInPacketHandler(subscriptionService);
91+
handlers[PacketType.PUBLISH.ordinal()] = new PublishInPacketHandler(publishingService);
92+
handlers[PacketType.DISCONNECT.ordinal()] = new DisconnetInPacketHandler();
93+
handlers[PacketType.PUBLISH_ACK.ordinal()] = new PublishAckInPacketHandler();
94+
handlers[PacketType.PUBLISH_RECEIVED.ordinal()] = new PublishReceiveInPacketHandler();
95+
handlers[PacketType.PUBLISH_RELEASED.ordinal()] = new PublishReleaseInPacketHandler();
96+
handlers[PacketType.PUBLISH_COMPLETED.ordinal()] = new PublishCompleteInPacketHandler();
8697

87-
return handlers;
88-
}
98+
return handlers;
99+
}
89100

90-
@Bean
91-
@NotNull MqttClientReleaseHandler mqttClientReleaseHandler(
92-
@NotNull ClientIdRegistry clientIdRegistry,
93-
@NotNull MqttSessionService mqttSessionService,
94-
@NotNull SubscriptionService subscriptionService
95-
) {
96-
return new DefaultMqttClientReleaseHandler(
97-
clientIdRegistry,
98-
mqttSessionService,
99-
subscriptionService
100-
);
101-
}
101+
@Bean
102+
MqttClientReleaseHandler mqttClientReleaseHandler(
103+
ClientIdRegistry clientIdRegistry,
104+
MqttSessionService mqttSessionService,
105+
SubscriptionService subscriptionService) {
106+
return new DefaultMqttClientReleaseHandler(clientIdRegistry, mqttSessionService, subscriptionService);
107+
}
102108

103-
@Bean
104-
@NotNull SubscriptionService subscriptionService() {
105-
return new SimpleSubscriptionService();
106-
}
109+
@Bean
110+
SubscriptionService subscriptionService() {
111+
return new SimpleSubscriptionService();
112+
}
107113

108-
@Bean
109-
@NotNull PublishOutHandler[] publishOutHandlers() {
110-
return new PublishOutHandler[] {
111-
new Qos0PublishOutHandler(),
112-
new Qos1PublishOutHandler(),
113-
new Qos2PublishOutHandler(),
114-
};
115-
}
114+
@Bean
115+
PublishOutHandler[] publishOutHandlers() {
116+
return new PublishOutHandler[]{
117+
new Qos0PublishOutHandler(),
118+
new Qos1PublishOutHandler(),
119+
new Qos2PublishOutHandler()
120+
};
121+
}
116122

117-
@Bean
118-
@NotNull PublishInHandler[] publishInHandlers(
119-
@NotNull SubscriptionService subscriptionService,
120-
@NotNull PublishOutHandler[] publishOutHandlers
121-
) {
122-
return new PublishInHandler[] {
123-
new Qos0PublishInHandler(subscriptionService, publishOutHandlers),
124-
new Qos1PublishInHandler(subscriptionService, publishOutHandlers),
125-
new Qos2PublishInHandler(subscriptionService, publishOutHandlers),
126-
};
127-
}
123+
@Bean
124+
PublishInHandler[] publishInHandlers(
125+
SubscriptionService subscriptionService,
126+
PublishOutHandler[] publishOutHandlers) {
127+
return new PublishInHandler[]{
128+
new Qos0PublishInHandler(subscriptionService, publishOutHandlers),
129+
new Qos1PublishInHandler(subscriptionService, publishOutHandlers),
130+
new Qos2PublishInHandler(subscriptionService, publishOutHandlers)
131+
};
132+
}
128133

129-
@Bean
130-
@NotNull PublishingService publishingService(@NotNull PublishInHandler[] publishInHandlers) {
131-
return new DefaultPublishingService(publishInHandlers);
132-
}
134+
@Bean
135+
PublishingService publishingService(PublishInHandler[] publishInHandlers) {
136+
return new DefaultPublishingService(publishInHandlers);
137+
}
133138
}

‎src/main/java/com/ss/mqtt/broker/config/MqttConnectionConfig.java‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
package com.ss.mqtt.broker.config;
22

33
import com.ss.mqtt.broker.model.QoS;
4-
import lombok.Data;
54
import lombok.Getter;
6-
import lombok.NoArgsConstructor;
75
import lombok.RequiredArgsConstructor;
8-
import org.jetbrains.annotations.NotNull;
96

107
@Getter
118
@RequiredArgsConstructor
129
public class MqttConnectionConfig {
1310

14-
private final QoS maxQos;
11+
private final QoS maxQos;
1512

16-
private final int maximumPacketSize;
17-
private final int minKeepAliveTime;
18-
private final int receiveMaximum;
19-
private final int topicAliasMaximum;
13+
private final int maximumPacketSize;
14+
private final int minKeepAliveTime;
15+
private final int receiveMaximum;
16+
private final int topicAliasMaximum;
2017

21-
private final long defaultSessionExpiryInterval;
18+
private final long defaultSessionExpiryInterval;
2219

23-
private final boolean keepAliveEnabled;
24-
private final boolean sessionsEnabled;
25-
private final boolean retainAvailable;
26-
private final boolean wildcardSubscriptionAvailable;
27-
private final boolean subscriptionIdAvailable;
28-
private final boolean sharedSubscriptionAvailable;
20+
private final boolean keepAliveEnabled;
21+
private final boolean sessionsEnabled;
22+
private final boolean retainAvailable;
23+
private final boolean wildcardSubscriptionAvailable;
24+
private final boolean subscriptionIdAvailable;
25+
private final boolean sharedSubscriptionAvailable;
2926
}

0 commit comments

Comments
 (0)