Skip to content

Commit dd1861e

Browse files
committed
[broker-23] fix build according dependency changes
1 parent e5b2ab1 commit dd1861e

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

src/main/java/com/ss/mqtt/broker/network/MqttConnection.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
package com.ss.mqtt.broker.network;
22

33
import com.ss.mqtt.broker.config.MqttConnectionConfig;
4+
import com.ss.mqtt.broker.handler.packet.in.PacketInHandler;
45
import com.ss.mqtt.broker.model.MqttSession;
56
import com.ss.mqtt.broker.model.MqttVersion;
6-
import com.ss.mqtt.broker.network.client.MqttClient;
77
import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
88
import com.ss.mqtt.broker.network.packet.MqttPacketReader;
99
import com.ss.mqtt.broker.network.packet.MqttPacketWriter;
1010
import com.ss.mqtt.broker.network.packet.in.MqttReadablePacket;
11-
import com.ss.mqtt.broker.handler.packet.in.PacketInHandler;
1211
import com.ss.mqtt.broker.network.packet.out.MqttWritablePacket;
1312
import com.ss.rlib.network.BufferAllocator;
1413
import com.ss.rlib.network.Connection;
1514
import com.ss.rlib.network.Network;
16-
import com.ss.rlib.network.NetworkCryptor;
1715
import com.ss.rlib.network.impl.AbstractConnection;
1816
import com.ss.rlib.network.packet.PacketReader;
1917
import com.ss.rlib.network.packet.PacketWriter;
@@ -53,7 +51,7 @@ public MqttConnection(
5351
@NotNull MqttConnectionConfig config,
5452
@NotNull Function<MqttConnection, UnsafeMqttClient> clientFactory
5553
) {
56-
super(network, channel, NetworkCryptor.NULL, bufferAllocator, maxPacketsByRead);
54+
super(network, channel, bufferAllocator, maxPacketsByRead);
5755
this.packetHandlers = packetHandlers;
5856
this.config = config;
5957
this.mqttVersion = MqttVersion.MQTT_3_1_1;
@@ -72,7 +70,7 @@ public boolean isSupported(@NotNull MqttVersion mqttVersion) {
7270
channel,
7371
bufferAllocator,
7472
this::updateLastActivity,
75-
this::handleReadPacket,
73+
this::handleReceivedPacket,
7674
maxPacketsByRead
7775
);
7876
}

src/main/java/com/ss/mqtt/broker/network/packet/MqttPacketReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.ss.mqtt.broker.network.packet.in.*;
55
import com.ss.mqtt.broker.util.MqttDataUtils;
66
import com.ss.rlib.common.function.ByteFunction;
7+
import com.ss.rlib.common.function.NotNullConsumer;
78
import com.ss.rlib.common.util.NumberUtils;
89
import com.ss.rlib.common.util.array.ArrayFactory;
910
import com.ss.rlib.network.BufferAllocator;
@@ -13,7 +14,6 @@
1314

1415
import java.nio.ByteBuffer;
1516
import java.nio.channels.AsynchronousSocketChannel;
16-
import java.util.function.Consumer;
1717

1818
public class MqttPacketReader extends AbstractPacketReader<MqttReadablePacket, MqttConnection> {
1919

@@ -43,7 +43,7 @@ public MqttPacketReader(
4343
@NotNull AsynchronousSocketChannel channel,
4444
@NotNull BufferAllocator bufferAllocator,
4545
@NotNull Runnable updateActivityFunction,
46-
@NotNull Consumer<MqttReadablePacket> readPacketHandler,
46+
@NotNull NotNullConsumer<MqttReadablePacket> readPacketHandler,
4747
int maxPacketsByRead
4848
) {
4949
super(

src/main/java/com/ss/mqtt/broker/network/packet/MqttPacketWriter.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import com.ss.mqtt.broker.network.MqttConnection;
44
import com.ss.mqtt.broker.network.packet.out.MqttWritablePacket;
55
import com.ss.mqtt.broker.util.MqttDataUtils;
6+
import com.ss.rlib.common.function.NotNullBiConsumer;
7+
import com.ss.rlib.common.function.NotNullConsumer;
8+
import com.ss.rlib.common.function.NullableSupplier;
69
import com.ss.rlib.network.BufferAllocator;
710
import com.ss.rlib.network.packet.WritablePacket;
811
import com.ss.rlib.network.packet.impl.AbstractPacketWriter;
@@ -21,9 +24,9 @@ public MqttPacketWriter(
2124
@NotNull AsynchronousSocketChannel channel,
2225
@NotNull BufferAllocator bufferAllocator,
2326
@NotNull Runnable updateActivityFunction,
24-
@NotNull Supplier<@NotNull WritablePacket> nextWritePacketSupplier,
25-
@NotNull Consumer<@NotNull WritablePacket> writtenPacketHandler,
26-
@NotNull BiConsumer<@NotNull WritablePacket, Boolean> sentPacketHandler
27+
@NotNull NullableSupplier<@NotNull WritablePacket> nextWritePacketSupplier,
28+
@NotNull NotNullConsumer<@NotNull WritablePacket> writtenPacketHandler,
29+
@NotNull NotNullBiConsumer<@NotNull WritablePacket, Boolean> sentPacketHandler
2730
) {
2831
super(
2932
connection,

0 commit comments

Comments
 (0)