Skip to content

Commit e993c63

Browse files
committed
finished working on id based packets part
1 parent 7c725c6 commit e993c63

35 files changed

Lines changed: 253 additions & 984 deletions

build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55
dependencies {
66
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
7-
classpath 'net.ltgt.gradle:gradle-apt-plugin:0.19'
7+
classpath 'net.ltgt.gradle:gradle-apt-plugin:0.21'
88
}
99
}
1010

@@ -46,12 +46,14 @@ allprojects {
4646

4747
dependencies {
4848
compileOnly "org.jetbrains:annotations:$jetbrainsAnnotation"
49+
compileOnly "org.projectlombok:lombok:$lombokVersion"
50+
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
51+
4952
testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
53+
testCompileOnly "org.projectlombok:lombok:$lombokVersion"
5054
testCompileOnly "org.jetbrains:annotations:$jetbrainsAnnotation"
5155
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
52-
compileOnly "org.projectlombok:lombok:$lombokVersion"
53-
testCompileOnly "org.projectlombok:lombok:$lombokVersion"
54-
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
56+
testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
5557
}
5658

5759
/*compileJava {

rlib-common/src/main/java/com/ss/rlib/common/util/Utils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ public static short getShort(final byte[] bytes, final int offset) {
229229
* @param size the size
230230
* @return строка с дампом.
231231
*/
232+
@Deprecated(forRemoval = true)
232233
public static @NotNull String hexdump(final byte[] array, final int size) {
233234
return hexdump(array, 0, size);
234235
}
@@ -241,6 +242,7 @@ public static short getShort(final byte[] bytes, final int offset) {
241242
* @param size the size
242243
* @return the string dump.
243244
*/
245+
@Deprecated(forRemoval = true)
244246
public static @NotNull String hexdump(@NotNull final byte[] array, final int offset, final int size) {
245247

246248
final StringBuilder builder = new StringBuilder();

rlib-network/src/main/java/com/ss/rlib/network/NetworkFactory.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public final class NetworkFactory {
7979
/**
8080
* Create id based packet default asynchronous client network.
8181
*
82-
* @param packetRegistry the readable packet registry.
82+
* @param packetRegistry the readable packet registry.
8383
* @return the server network.
8484
*/
8585
public static @NotNull ClientNetwork<DefaultConnection> newDefaultClientNetwork(
@@ -91,6 +91,7 @@ public final class NetworkFactory {
9191
packetRegistry
9292
);
9393
}
94+
9495
/**
9596
* Create id based packet default asynchronous client network.
9697
*
@@ -159,7 +160,7 @@ public final class NetworkFactory {
159160
/**
160161
* Create id based packet default asynchronous server network.
161162
*
162-
* @param packetRegistry the readable packet registry.
163+
* @param packetRegistry the readable packet registry.
163164
* @return the server network.
164165
*/
165166
public static @NotNull ServerNetwork<DefaultConnection> newDefaultServerNetwork(
@@ -171,6 +172,7 @@ public final class NetworkFactory {
171172
packetRegistry
172173
);
173174
}
175+
174176
/**
175177
* Create id based packet default asynchronous server network.
176178
*

rlib-network/src/main/java/com/ss/rlib/network/client/impl/DefaultClientNetwork.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import static com.ss.rlib.common.util.Utils.uncheckedGet;
55
import com.ss.rlib.common.concurrent.GroupThreadFactory;
66
import com.ss.rlib.common.concurrent.atomic.AtomicReference;
7-
import com.ss.rlib.network.BufferAllocator;
87
import com.ss.rlib.network.Connection;
98
import com.ss.rlib.network.Network;
109
import com.ss.rlib.network.NetworkConfig;
@@ -22,7 +21,6 @@
2221
import java.util.concurrent.CompletableFuture;
2322
import java.util.concurrent.Executors;
2423
import java.util.function.BiFunction;
25-
import java.util.function.Function;
2624

2725
/**
2826
* The default implementation of a client network.
@@ -100,7 +98,8 @@ public void failed(Throwable exc, Void attachment) {
10098

10199
@Override
102100
public void shutdown() {
103-
Optional.ofNullable(getCurrentConnection())
101+
Optional
102+
.ofNullable(getCurrentConnection())
104103
.ifPresent(connection -> {
105104
unchecked(connection, C::close);
106105
unchecked(group, AsynchronousChannelGroup::shutdown);

rlib-network/src/main/java/com/ss/rlib/network/impl/AbstractConnection.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@
55
import static com.ss.rlib.network.util.NetworkUtils.getSocketAddress;
66
import com.ss.rlib.common.util.array.Array;
77
import com.ss.rlib.common.util.array.ArrayFactory;
8-
import com.ss.rlib.logger.api.Logger;
9-
import com.ss.rlib.logger.api.LoggerManager;
10-
import com.ss.rlib.network.*;
11-
import com.ss.rlib.network.packet.*;
128
import com.ss.rlib.common.util.linkedlist.LinkedList;
139
import com.ss.rlib.common.util.linkedlist.LinkedListFactory;
10+
import com.ss.rlib.logger.api.Logger;
11+
import com.ss.rlib.logger.api.LoggerManager;
12+
import com.ss.rlib.network.BufferAllocator;
13+
import com.ss.rlib.network.Connection;
14+
import com.ss.rlib.network.Network;
15+
import com.ss.rlib.network.NetworkCryptor;
16+
import com.ss.rlib.network.packet.PacketReader;
17+
import com.ss.rlib.network.packet.PacketWriter;
18+
import com.ss.rlib.network.packet.ReadablePacket;
19+
import com.ss.rlib.network.packet.WritablePacket;
1420
import lombok.Getter;
1521
import org.jetbrains.annotations.NotNull;
1622
import org.jetbrains.annotations.Nullable;
@@ -115,8 +121,7 @@ protected void registerFluxOnReceivedEvents(
115121

116122
protected void registerFluxOnReceivedPackets(@NotNull FluxSink<? super R> sink) {
117123

118-
BiConsumer<Connection<R, W>, R> listener =
119-
(connection, packet) -> sink.next(packet);
124+
BiConsumer<Connection<R, W>, R> listener = (connection, packet) -> sink.next(packet);
120125

121126
onReceive(listener);
122127

rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultDataConnection.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ public DefaultDataConnection(
4242
}
4343

4444
protected @NotNull PacketReader createPacketReader() {
45-
return new DefaultPacketReader<>(
46-
this,
45+
return new DefaultPacketReader<>(this,
4746
channel,
4847
bufferAllocator,
4948
this::updateLastActivity,
@@ -55,8 +54,7 @@ public DefaultDataConnection(
5554
}
5655

5756
protected @NotNull PacketWriter createPacketWriter() {
58-
return new DefaultPacketWriter<W, Connection<R, W>>(
59-
this,
57+
return new DefaultPacketWriter<W, Connection<R, W>>(this,
6058
channel,
6159
bufferAllocator,
6260
this::updateLastActivity,

rlib-network/src/main/java/com/ss/rlib/network/impl/IdBasedPacketConnection.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
import com.ss.rlib.network.Connection;
55
import com.ss.rlib.network.Network;
66
import com.ss.rlib.network.NetworkCryptor;
7-
import com.ss.rlib.network.packet.*;
8-
import com.ss.rlib.network.packet.impl.DefaultPacketReader;
9-
import com.ss.rlib.network.packet.impl.DefaultPacketWriter;
7+
import com.ss.rlib.network.packet.IdBasedReadablePacket;
8+
import com.ss.rlib.network.packet.IdBasedWritablePacket;
9+
import com.ss.rlib.network.packet.PacketReader;
10+
import com.ss.rlib.network.packet.PacketWriter;
1011
import com.ss.rlib.network.packet.impl.IdBasedPacketReader;
1112
import com.ss.rlib.network.packet.impl.IdBasedPacketWriter;
1213
import com.ss.rlib.network.packet.registry.ReadablePacketRegistry;

rlib-network/src/main/java/com/ss/rlib/network/impl/StringDataConnection.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
import java.nio.channels.AsynchronousSocketChannel;
1212

13+
/**
14+
* @author JavaSaBr
15+
*/
1316
public class StringDataConnection extends DefaultDataConnection<StringReadablePacket, StringWritablePacket> {
1417

1518
public StringDataConnection(

rlib-network/src/main/java/com/ss/rlib/network/packet/IdBasedReadablePacket.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.ss.rlib.network.packet;
22

33
import com.ss.rlib.common.util.ClassUtils;
4+
import com.ss.rlib.network.Connection;
45
import org.jetbrains.annotations.NotNull;
56

67
/**
@@ -16,4 +17,13 @@ public interface IdBasedReadablePacket<S extends IdBasedReadablePacket<S>> exten
1617
default @NotNull S newInstance() {
1718
return ClassUtils.newInstance(getClass());
1819
}
20+
21+
/**
22+
* Execute a logic of this packet.
23+
*
24+
* @param connection the owner's connection.
25+
*/
26+
default void execute(@NotNull Connection<?, ?> connection) {
27+
28+
}
1929
}

rlib-network/src/main/java/com/ss/rlib/network/packet/PacketReader.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.ss.rlib.network.packet;
22

3+
/**
4+
* @author JavaSaBr
5+
*/
36
public interface PacketReader {
47

58
/**

0 commit comments

Comments
 (0)