Skip to content

Commit 0d0e0a0

Browse files
JavaSaBrJavaSaBr
committed
[broker-25] remove client field from out packets
1 parent c89868f commit 0d0e0a0

File tree

58 files changed

+707
-367
lines changed

Some content is hidden

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

58 files changed

+707
-367
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ allprojects {
3232

3333
ext {
3434
annotationVersion = "17.0.0"
35-
rlibVersion = "9.7.0"
35+
rlibVersion = "9.8.0"
3636
lombokVersion = '1.18.4'
3737
springbootVersion = '2.2.0.RELEASE'
3838
springVersion = '5.1.6.RELEASE'

‎src/main/java/com/ss/mqtt/broker/factory/packet/out/Mqtt311PacketOutFactory.java‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ public class Mqtt311PacketOutFactory extends MqttPacketOutFactory {
2626
@NotNull byte[] authenticationData,
2727
@NotNull Array<StringPair> userProperties
2828
) {
29-
return new ConnectAck311OutPacket(client, reasonCode, sessionPresent);
29+
return new ConnectAck311OutPacket(reasonCode, sessionPresent);
3030
}
3131

3232
@Override
3333
public @NotNull PublishOutPacket newPublish(
34-
@NotNull MqttClient client,
3534
int packetId,
3635
@NotNull QoS qos,
3736
boolean retained,
@@ -44,40 +43,37 @@ public class Mqtt311PacketOutFactory extends MqttPacketOutFactory {
4443
@NotNull byte[] correlationData,
4544
@NotNull Array<StringPair> userProperties
4645
) {
47-
return newPublish(client, packetId, qos, retained, duplicate, topicName, payload);
46+
return newPublish(packetId, qos, retained, duplicate, topicName, payload);
4847
}
4948

5049
@Override
5150
public @NotNull MqttWritablePacket newPublishAck(
52-
@NotNull MqttClient client,
5351
int packetId,
5452
@NotNull PublishAckReasonCode reasonCode,
5553
@NotNull String reason,
5654
@NotNull Array<StringPair> userProperties
5755
) {
58-
return new PublishAck311OutPacket(client, packetId);
56+
return new PublishAck311OutPacket(packetId);
5957
}
6058

6159
@Override
6260
public @NotNull MqttWritablePacket newSubscribeAck(
63-
@NotNull MqttClient client,
6461
int packetId,
6562
@NotNull Array<SubscribeAckReasonCode> reasonCodes,
6663
@NotNull String reason,
6764
@NotNull Array<StringPair> userProperties
6865
) {
69-
return new SubscribeAck311OutPacket(client, packetId, reasonCodes);
66+
return new SubscribeAck311OutPacket(reasonCodes, packetId);
7067
}
7168

7269
@Override
7370
public @NotNull MqttWritablePacket newUnsubscribeAck(
74-
@NotNull MqttClient client,
7571
int packetId,
7672
@NotNull Array<UnsubscribeAckReasonCode> reasonCodes,
7773
@NotNull Array<StringPair> userProperties,
7874
@NotNull String reason
7975
) {
80-
return new UnsubscribeAck311OutPacket(client, packetId);
76+
return new UnsubscribeAck311OutPacket(packetId);
8177
}
8278

8379
@Override
@@ -88,12 +84,11 @@ public class Mqtt311PacketOutFactory extends MqttPacketOutFactory {
8884
@NotNull String reason,
8985
@NotNull String serverReference
9086
) {
91-
return new Disconnect311OutPacket(client);
87+
return new Disconnect311OutPacket();
9288
}
9389

9490
@Override
9591
public @NotNull MqttWritablePacket newAuthenticate(
96-
@NotNull MqttClient client,
9792
@NotNull AuthenticateReasonCode reasonCode,
9893
@NotNull String authenticateMethod,
9994
@NotNull byte[] authenticateData,
@@ -104,45 +99,42 @@ public class Mqtt311PacketOutFactory extends MqttPacketOutFactory {
10499
}
105100

106101
@Override
107-
public @NotNull MqttWritablePacket newPingRequest(@NotNull MqttClient client) {
108-
return new PingRequest311OutPacket(client);
102+
public @NotNull MqttWritablePacket newPingRequest() {
103+
return new PingRequest311OutPacket();
109104
}
110105

111106
@Override
112-
public @NotNull MqttWritablePacket newPingResponse(@NotNull MqttClient client) {
113-
return new PingResponse311OutPacket(client);
107+
public @NotNull MqttWritablePacket newPingResponse() {
108+
return new PingResponse311OutPacket();
114109
}
115110

116111
@Override
117112
public @NotNull MqttWritablePacket newPublishRelease(
118-
@NotNull MqttClient client,
119113
int packetId,
120114
@NotNull PublishReleaseReasonCode reasonCode,
121115
@NotNull Array<StringPair> userProperties,
122116
@NotNull String reason
123117
) {
124-
return new PublishRelease311OutPacket(client, packetId);
118+
return new PublishRelease311OutPacket(packetId);
125119
}
126120

127121
@Override
128122
public @NotNull MqttWritablePacket newPublishReceived(
129-
@NotNull MqttClient client,
130123
int packetId,
131124
@NotNull PublishReceivedReasonCode reasonCode,
132125
@NotNull Array<StringPair> userProperties,
133126
@NotNull String reason
134127
) {
135-
return new PublishReceived311OutPacket(client, packetId);
128+
return new PublishReceived311OutPacket(packetId);
136129
}
137130

138131
@Override
139132
public @NotNull MqttWritablePacket newPublishCompleted(
140-
@NotNull MqttClient client,
141133
int packetId,
142134
@NotNull PublishCompletedReasonCode reasonCode,
143135
@NotNull Array<StringPair> userProperties,
144136
@NotNull String reason
145137
) {
146-
return new PublishComplete311OutPacket(client, packetId);
138+
return new PublishComplete311OutPacket(packetId);
147139
}
148140
}

‎src/main/java/com/ss/mqtt/broker/factory/packet/out/Mqtt5PacketOutFactory.java‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public class Mqtt5PacketOutFactory extends Mqtt311PacketOutFactory {
2626
@NotNull byte[] authenticationData,
2727
@NotNull Array<StringPair> userProperties
2828
) {
29+
var config = client.getConnectionConfig();
2930
return new ConnectAck5OutPacket(
30-
client,
3131
reasonCode,
3232
sessionPresent,
3333
requestedClientId,
@@ -39,13 +39,23 @@ public class Mqtt5PacketOutFactory extends Mqtt311PacketOutFactory {
3939
responseInformation,
4040
authenticationMethod,
4141
authenticationData,
42-
userProperties
42+
userProperties,
43+
client.getClientId(),
44+
config.getMaxQos(),
45+
client.getSessionExpiryInterval(),
46+
client.getMaximumPacketSize(),
47+
client.getReceiveMax(),
48+
client.getTopicAliasMaximum(),
49+
client.getKeepAlive(),
50+
config.isRetainAvailable(),
51+
config.isWildcardSubscriptionAvailable(),
52+
config.isSubscriptionIdAvailable(),
53+
config.isSharedSubscriptionAvailable()
4354
);
4455
}
4556

4657
@Override
4758
public @NotNull PublishOutPacket newPublish(
48-
@NotNull MqttClient client,
4959
int packetId,
5060
@NotNull QoS qos,
5161
boolean retained,
@@ -59,7 +69,6 @@ public class Mqtt5PacketOutFactory extends Mqtt311PacketOutFactory {
5969
@NotNull Array<StringPair> userProperties
6070
) {
6171
return new Publish5OutPacket(
62-
client,
6372
packetId,
6473
qos,
6574
retained,
@@ -76,35 +85,32 @@ public class Mqtt5PacketOutFactory extends Mqtt311PacketOutFactory {
7685

7786
@Override
7887
public @NotNull MqttWritablePacket newPublishAck(
79-
@NotNull MqttClient client,
8088
int packetId,
8189
@NotNull PublishAckReasonCode reasonCode,
8290
@NotNull String reason,
8391
@NotNull Array<StringPair> userProperties
8492
) {
85-
return new PublishAck5OutPacket(client, packetId, reasonCode, userProperties, reason);
93+
return new PublishAck5OutPacket(packetId, reasonCode, userProperties, reason);
8694
}
8795

8896
@Override
8997
public @NotNull MqttWritablePacket newSubscribeAck(
90-
@NotNull MqttClient client,
9198
int packetId,
9299
@NotNull Array<SubscribeAckReasonCode> reasonCodes,
93100
@NotNull String reason,
94101
@NotNull Array<StringPair> userProperties
95102
) {
96-
return new SubscribeAck5OutPacket(client, packetId, reasonCodes, userProperties, reason);
103+
return new SubscribeAck5OutPacket(packetId, reasonCodes, userProperties, reason);
97104
}
98105

99106
@Override
100107
public @NotNull MqttWritablePacket newUnsubscribeAck(
101-
@NotNull MqttClient client,
102108
int packetId,
103109
@NotNull Array<UnsubscribeAckReasonCode> reasonCodes,
104110
@NotNull Array<StringPair> userProperties,
105111
@NotNull String reason
106112
) {
107-
return new UnsubscribeAck5OutPacket(client, packetId, reasonCodes, userProperties, reason);
113+
return new UnsubscribeAck5OutPacket(packetId, reasonCodes, userProperties, reason);
108114
}
109115

110116
@Override
@@ -115,58 +121,59 @@ public class Mqtt5PacketOutFactory extends Mqtt311PacketOutFactory {
115121
@NotNull String reason,
116122
@NotNull String serverReference
117123
) {
118-
return new Disconnect5OutPacket(client, reasonCode, userProperties, reason, serverReference);
124+
return new Disconnect5OutPacket(
125+
reasonCode,
126+
userProperties,
127+
reason,
128+
serverReference,
129+
client.getSessionExpiryInterval()
130+
);
119131
}
120132

121133
@Override
122134
public @NotNull MqttWritablePacket newAuthenticate(
123-
@NotNull MqttClient client,
124135
@NotNull AuthenticateReasonCode reasonCode,
125136
@NotNull String authenticateMethod,
126137
@NotNull byte[] authenticateData,
127138
@NotNull Array<StringPair> userProperties,
128139
@NotNull String reason
129140
) {
130141
return new Authentication5OutPacket(
131-
client,
142+
userProperties,
132143
reasonCode,
144+
reason,
133145
authenticateMethod,
134-
authenticateData,
135-
userProperties,
136-
reason
146+
authenticateData
137147
);
138148
}
139149

140150
@Override
141151
public @NotNull MqttWritablePacket newPublishRelease(
142-
@NotNull MqttClient client,
143152
int packetId,
144153
@NotNull PublishReleaseReasonCode reasonCode,
145154
@NotNull Array<StringPair> userProperties,
146155
@NotNull String reason
147156
) {
148-
return new PublishRelease5OutPacket(client, packetId, reasonCode, userProperties, reason);
157+
return new PublishRelease5OutPacket(packetId, reasonCode, userProperties, reason);
149158
}
150159

151160
@Override
152161
public @NotNull MqttWritablePacket newPublishReceived(
153-
@NotNull MqttClient client,
154162
int packetId,
155163
@NotNull PublishReceivedReasonCode reasonCode,
156164
@NotNull Array<StringPair> userProperties,
157165
@NotNull String reason
158166
) {
159-
return new PublishReceived5OutPacket(client, packetId, reasonCode, userProperties, reason);
167+
return new PublishReceived5OutPacket(packetId, reasonCode, userProperties, reason);
160168
}
161169

162170
@Override
163171
public @NotNull MqttWritablePacket newPublishCompleted(
164-
@NotNull MqttClient client,
165172
int packetId,
166173
@NotNull PublishCompletedReasonCode reasonCode,
167174
@NotNull Array<StringPair> userProperties,
168175
@NotNull String reason
169176
) {
170-
return new PublishComplete5OutPacket(client, packetId, reasonCode, userProperties, reason);
177+
return new PublishComplete5OutPacket(packetId, reasonCode, userProperties, reason);
171178
}
172179
}

0 commit comments

Comments
 (0)