Skip to content

Commit ee48a46

Browse files
committed
reduce fields for packet reader/writer
1 parent 94b3fab commit ee48a46

4 files changed

Lines changed: 7 additions & 30 deletions

File tree

rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ public WritablePacketWithFeedback(CompletableFuture<Boolean> attachment, Writabl
6060

6161
final Deque<WritableNetworkPacket<C>> pendingPackets;
6262
final StampedLock lock;
63-
64-
final AtomicBoolean isWriting;
6563
final AtomicBoolean closed;
6664

6765
final MutableArray<BiConsumer<C, ? super ReadableNetworkPacket<C>>> subscribers;
@@ -82,7 +80,6 @@ public AbstractConnection(
8280
this.channel = channel;
8381
this.pendingPackets = DequeFactory.arrayBasedBased(WritableNetworkPacket.class);
8482
this.network = network;
85-
this.isWriting = new AtomicBoolean(false);
8683
this.closed = new AtomicBoolean(false);
8784
this.subscribers = ArrayFactory.copyOnModifyArray(BiConsumer.class);
8885
this.remoteAddress = String.valueOf(NetworkUtils.getRemoteAddress(channel));

rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
@Getter(AccessLevel.PROTECTED)
2020
@Accessors(fluent = true, chain = false)
2121
@FieldDefaults(level = AccessLevel.PROTECTED)
22-
public abstract class DefaultDataConnection<C extends DefaultDataConnection<C>> extends AbstractConnection<C> {
22+
public abstract class DefaultDataConnection<C extends DefaultDataConnection<C>>
23+
extends AbstractConnection<C> {
2324

2425
final NetworkPacketReader packetReader;
2526
final NetworkPacketWriter packetWriter;
@@ -39,6 +40,7 @@ public DefaultDataConnection(
3940
}
4041

4142
protected NetworkPacketReader createPacketReader() {
43+
//noinspection unchecked
4244
return new DefaultNetworkPacketReader<>(
4345
(C) this,
4446
this::updateLastActivity,
@@ -49,6 +51,7 @@ protected NetworkPacketReader createPacketReader() {
4951
}
5052

5153
protected NetworkPacketWriter createPacketWriter() {
54+
//noinspection unchecked
5255
return new DefaultNetworkPacketWriter<>(
5356
(C) this,
5457
this::updateLastActivity,

rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public IdBasedPacketConnection(
4646
}
4747

4848
protected NetworkPacketReader createPacketReader() {
49+
//noinspection unchecked
4950
return new IdBasedNetworkPacketReader<>(
5051
(C) this,
5152
this::updateLastActivity,
@@ -57,10 +58,11 @@ protected NetworkPacketReader createPacketReader() {
5758
}
5859

5960
protected NetworkPacketWriter createPacketWriter() {
61+
//noinspection unchecked
6062
return new IdBasedNetworkPacketWriter<>(
6163
(C) this,
6264
this::updateLastActivity,
63-
() -> nextPacketToWrite(),
65+
this::nextPacketToWrite,
6466
this::serializedPacket,
6567
this::handleSentPacket,
6668
packetLengthHeaderSize,

rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)