Skip to content

Commit e47597e

Browse files
committed
[broker-22] reduce code duplication in packet handlers
1 parent c368552 commit e47597e

File tree

4 files changed

+23
-38
lines changed

4 files changed

+23
-38
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.ss.mqtt.broker.handler.packet.in;
2+
3+
import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
4+
import com.ss.mqtt.broker.network.packet.HasPacketId;
5+
import com.ss.mqtt.broker.network.packet.in.MqttReadablePacket;
6+
import lombok.RequiredArgsConstructor;
7+
import org.jetbrains.annotations.NotNull;
8+
9+
@RequiredArgsConstructor
10+
public class PendingOutResponseInPacketHandler<R extends MqttReadablePacket & HasPacketId> extends
11+
AbstractPacketHandler<UnsafeMqttClient, R> {
12+
13+
@Override
14+
protected void handleImpl(@NotNull UnsafeMqttClient client, @NotNull R packet) {
15+
var session = client.getSession();
16+
if (session != null) {
17+
session.updateOutPendingPacket(client, packet);
18+
}
19+
}
20+
}
Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
package com.ss.mqtt.broker.handler.packet.in;
22

3-
import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
43
import com.ss.mqtt.broker.network.packet.in.PublishAckInPacket;
54
import lombok.RequiredArgsConstructor;
6-
import org.jetbrains.annotations.NotNull;
75

86
@RequiredArgsConstructor
9-
public class PublishAckInPacketHandler extends AbstractPacketHandler<UnsafeMqttClient, PublishAckInPacket> {
10-
11-
@Override
12-
protected void handleImpl(@NotNull UnsafeMqttClient client, @NotNull PublishAckInPacket packet) {
13-
var session = client.getSession();
14-
if (session != null) {
15-
session.updateOutPendingPacket(client, packet);
16-
}
17-
}
18-
}
7+
public class PublishAckInPacketHandler extends PendingOutResponseInPacketHandler<PublishAckInPacket> {}
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
package com.ss.mqtt.broker.handler.packet.in;
22

3-
import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
4-
import com.ss.mqtt.broker.network.packet.in.PublishAckInPacket;
53
import com.ss.mqtt.broker.network.packet.in.PublishCompleteInPacket;
64
import lombok.RequiredArgsConstructor;
7-
import org.jetbrains.annotations.NotNull;
85

96
@RequiredArgsConstructor
10-
public class PublishCompleteInPacketHandler extends AbstractPacketHandler<UnsafeMqttClient, PublishCompleteInPacket> {
11-
12-
@Override
13-
protected void handleImpl(@NotNull UnsafeMqttClient client, @NotNull PublishCompleteInPacket packet) {
14-
var session = client.getSession();
15-
if (session != null) {
16-
session.updateOutPendingPacket(client, packet);
17-
}
18-
}
19-
}
7+
public class PublishCompleteInPacketHandler extends PendingOutResponseInPacketHandler<PublishCompleteInPacket> {}
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
package com.ss.mqtt.broker.handler.packet.in;
22

3-
import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
4-
import com.ss.mqtt.broker.network.packet.in.PublishAckInPacket;
53
import com.ss.mqtt.broker.network.packet.in.PublishReceivedInPacket;
64
import lombok.RequiredArgsConstructor;
7-
import org.jetbrains.annotations.NotNull;
85

96
@RequiredArgsConstructor
10-
public class PublishReceiveInPacketHandler extends AbstractPacketHandler<UnsafeMqttClient, PublishReceivedInPacket> {
11-
12-
@Override
13-
protected void handleImpl(@NotNull UnsafeMqttClient client, @NotNull PublishReceivedInPacket packet) {
14-
var session = client.getSession();
15-
if (session != null) {
16-
session.updateOutPendingPacket(client, packet);
17-
}
18-
}
19-
}
7+
public class PublishReceiveInPacketHandler extends PendingOutResponseInPacketHandler<PublishReceivedInPacket> {}

0 commit comments

Comments
 (0)