connections are now created via a unit function instead of overriding the method.
This commit is contained in:
parent
388e4bda60
commit
d482d3e43d
@ -93,7 +93,7 @@ Maven Info
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.dorkbox</groupId>
|
<groupId>com.dorkbox</groupId>
|
||||||
<artifactId>Network</artifactId>
|
<artifactId>Network</artifactId>
|
||||||
<version>5.2</version>
|
<version>5.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
```
|
```
|
||||||
@ -103,7 +103,7 @@ Gradle Info
|
|||||||
```
|
```
|
||||||
dependencies {
|
dependencies {
|
||||||
...
|
...
|
||||||
implementation("com.dorkbox:Network:5.2")
|
implementation("com.dorkbox:Network:5.3")
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ object Extras {
|
|||||||
// set for the project
|
// set for the project
|
||||||
const val description = "Encrypted, high-performance, and event-driven/reactive network stack for Java 8+"
|
const val description = "Encrypted, high-performance, and event-driven/reactive network stack for Java 8+"
|
||||||
const val group = "com.dorkbox"
|
const val group = "com.dorkbox"
|
||||||
const val version = "5.2"
|
const val version = "5.3"
|
||||||
|
|
||||||
// set as project.ext
|
// set as project.ext
|
||||||
const val name = "Network"
|
const val name = "Network"
|
||||||
@ -74,10 +74,8 @@ GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8) {
|
|||||||
//GradleUtils.jpms(JavaVersion.VERSION_1_9)
|
//GradleUtils.jpms(JavaVersion.VERSION_1_9)
|
||||||
|
|
||||||
|
|
||||||
// TODO: ping! (still WIP)
|
|
||||||
|
|
||||||
// ratelimiter, "other" package
|
// ratelimiter, "other" package
|
||||||
// ping, rest of unit tests
|
// rest of unit tests
|
||||||
// getConnectionUpgradeType
|
// getConnectionUpgradeType
|
||||||
// ability to send with a function callback (using RMI waiter type stuff for callbacks)
|
// ability to send with a function callback (using RMI waiter type stuff for callbacks)
|
||||||
// use conscrypt?!
|
// use conscrypt?!
|
||||||
|
@ -72,11 +72,8 @@ class ListenerTest : BaseTest() {
|
|||||||
@Test
|
@Test
|
||||||
@Throws(SecurityException::class, InitializationException::class, IOException::class, InterruptedException::class)
|
@Throws(SecurityException::class, InitializationException::class, IOException::class, InterruptedException::class)
|
||||||
fun listener() {
|
fun listener() {
|
||||||
val server: Server<TestConnectionA> = object : Server<TestConnectionA>(
|
val server: Server<TestConnectionA> = Server(serverConfig()) {
|
||||||
serverConfig()) {
|
TestConnectionA(it)
|
||||||
override fun newConnection(connectionParameters: ConnectionParams<TestConnectionA>): TestConnectionA {
|
|
||||||
return TestConnectionA(connectionParameters)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
addEndPoint(server)
|
addEndPoint(server)
|
||||||
|
|
||||||
@ -117,11 +114,8 @@ class ListenerTest : BaseTest() {
|
|||||||
|
|
||||||
|
|
||||||
// ----
|
// ----
|
||||||
val client: Client<TestConnectionA> = object : Client<TestConnectionA>(
|
val client: Client<TestConnectionA> = Client(clientConfig()) {
|
||||||
clientConfig()) {
|
TestConnectionA(it)
|
||||||
override fun newConnection(connectionParameters: ConnectionParams<TestConnectionA>): TestConnectionA {
|
|
||||||
return TestConnectionA(connectionParameters)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
addEndPoint(client)
|
addEndPoint(client)
|
||||||
|
|
||||||
|
@ -120,7 +120,7 @@ class PingPongTest : BaseTest() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun register(manager: Serialization<Connection>) {
|
private fun register(manager: Serialization<*>) {
|
||||||
manager.register(Data::class.java)
|
manager.register(Data::class.java)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ class SerializationValidationTest : BaseTest() {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun checkTakeKryo() {
|
fun checkTakeKryo() {
|
||||||
val serialization = serverConfig().serialization
|
val serialization = serverConfig().serialization as Serialization<Connection>
|
||||||
|
|
||||||
val kryos = mutableListOf<KryoExtra<Connection>>()
|
val kryos = mutableListOf<KryoExtra<Connection>>()
|
||||||
for (i in 0 until 17) {
|
for (i in 0 until 17) {
|
||||||
@ -163,7 +163,7 @@ class SerializationValidationTest : BaseTest() {
|
|||||||
waitForThreads()
|
waitForThreads()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun register(serialization: Serialization<Connection>) {
|
private fun register(serialization: Serialization<*>) {
|
||||||
serialization.register(Command1::class.java)
|
serialization.register(Command1::class.java)
|
||||||
serialization.register(Command2::class.java)
|
serialization.register(Command2::class.java)
|
||||||
serialization.register(Command3::class.java)
|
serialization.register(Command3::class.java)
|
||||||
|
@ -21,6 +21,7 @@ import dorkbox.network.Server
|
|||||||
import dorkbox.network.connection.Connection
|
import dorkbox.network.connection.Connection
|
||||||
import dorkbox.network.rmi.RemoteObject
|
import dorkbox.network.rmi.RemoteObject
|
||||||
import dorkbox.network.serialization.KryoExtra
|
import dorkbox.network.serialization.KryoExtra
|
||||||
|
import dorkbox.network.serialization.Serialization
|
||||||
import dorkboxTest.network.BaseTest
|
import dorkboxTest.network.BaseTest
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import org.junit.Ignore
|
import org.junit.Ignore
|
||||||
@ -154,7 +155,7 @@ class MemoryTest : BaseTest() {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun runForeverTestKryoPool() {
|
fun runForeverTestKryoPool() {
|
||||||
val serialization = serverConfig().serialization
|
val serialization = serverConfig().serialization as Serialization<Connection>
|
||||||
|
|
||||||
// 17 to force a pool size change
|
// 17 to force a pool size change
|
||||||
var kryo1: KryoExtra<Connection>
|
var kryo1: KryoExtra<Connection>
|
||||||
|
@ -41,7 +41,7 @@ class RmiDelayedInvocationTest : BaseTest() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun register(serialization: Serialization<Connection>) {
|
fun register(serialization: Serialization<*>) {
|
||||||
serialization.rmi.register(TestObject::class.java, TestObjectImpl::class.java)
|
serialization.rmi.register(TestObject::class.java, TestObjectImpl::class.java)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user