Moved serialization 'stuff' to it's own serialization package
This commit is contained in:
parent
a474da5c68
commit
0395f62ac0
@ -18,8 +18,8 @@ package dorkbox.network;
|
|||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
|
|
||||||
import dorkbox.network.connection.EndPointBase;
|
import dorkbox.network.connection.EndPointBase;
|
||||||
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.network.store.SettingsStore;
|
import dorkbox.network.store.SettingsStore;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
|
||||||
|
|
||||||
public
|
public
|
||||||
class Configuration {
|
class Configuration {
|
||||||
|
@ -43,7 +43,7 @@ import dorkbox.network.rmi.RemoteObjectCallback;
|
|||||||
import dorkbox.network.rmi.Rmi;
|
import dorkbox.network.rmi.Rmi;
|
||||||
import dorkbox.network.rmi.RmiBridge;
|
import dorkbox.network.rmi.RmiBridge;
|
||||||
import dorkbox.network.rmi.RmiRegistration;
|
import dorkbox.network.rmi.RmiRegistration;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.util.collections.IntMap;
|
import dorkbox.util.collections.IntMap;
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
import io.netty.channel.ChannelHandler.Sharable;
|
import io.netty.channel.ChannelHandler.Sharable;
|
||||||
|
@ -37,6 +37,7 @@ import dorkbox.network.connection.wrapper.ChannelWrapper;
|
|||||||
import dorkbox.network.pipeline.KryoEncoder;
|
import dorkbox.network.pipeline.KryoEncoder;
|
||||||
import dorkbox.network.pipeline.KryoEncoderCrypto;
|
import dorkbox.network.pipeline.KryoEncoderCrypto;
|
||||||
import dorkbox.network.rmi.RmiBridge;
|
import dorkbox.network.rmi.RmiBridge;
|
||||||
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.network.store.NullSettingsStore;
|
import dorkbox.network.store.NullSettingsStore;
|
||||||
import dorkbox.network.store.SettingsStore;
|
import dorkbox.network.store.SettingsStore;
|
||||||
import dorkbox.util.Property;
|
import dorkbox.util.Property;
|
||||||
@ -90,7 +91,7 @@ class EndPointBase<C extends Connection> extends EndPoint {
|
|||||||
public static int udpMaxSize = 508;
|
public static int udpMaxSize = 508;
|
||||||
|
|
||||||
protected final ConnectionManager<C> connectionManager;
|
protected final ConnectionManager<C> connectionManager;
|
||||||
protected final dorkbox.network.util.CryptoSerializationManager serializationManager;
|
protected final dorkbox.network.serialization.CryptoSerializationManager serializationManager;
|
||||||
protected final RegistrationWrapper<C> registrationWrapper;
|
protected final RegistrationWrapper<C> registrationWrapper;
|
||||||
|
|
||||||
final ECPrivateKeyParameters privateKey;
|
final ECPrivateKeyParameters privateKey;
|
||||||
@ -135,7 +136,7 @@ class EndPointBase<C extends Connection> extends EndPoint {
|
|||||||
if (config.serialization != null) {
|
if (config.serialization != null) {
|
||||||
serializationManager = config.serialization;
|
serializationManager = config.serialization;
|
||||||
} else {
|
} else {
|
||||||
serializationManager = CryptoSerializationManager.DEFAULT();
|
serializationManager = SerializationManager.DEFAULT();
|
||||||
}
|
}
|
||||||
|
|
||||||
// setup our RMI serialization managers. Can only be called once
|
// setup our RMI serialization managers. Can only be called once
|
||||||
@ -293,7 +294,7 @@ class EndPointBase<C extends Connection> extends EndPoint {
|
|||||||
* Returns the serialization wrapper if there is an object type that needs to be added outside of the basics.
|
* Returns the serialization wrapper if there is an object type that needs to be added outside of the basics.
|
||||||
*/
|
*/
|
||||||
public
|
public
|
||||||
dorkbox.network.util.CryptoSerializationManager getSerialization() {
|
dorkbox.network.serialization.CryptoSerializationManager getSerialization() {
|
||||||
return serializationManager;
|
return serializationManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@ import com.esotericsoftware.kryo.Kryo;
|
|||||||
|
|
||||||
import dorkbox.network.pipeline.ByteBufInput;
|
import dorkbox.network.pipeline.ByteBufInput;
|
||||||
import dorkbox.network.pipeline.ByteBufOutput;
|
import dorkbox.network.pipeline.ByteBufOutput;
|
||||||
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.util.bytes.BigEndian;
|
import dorkbox.util.bytes.BigEndian;
|
||||||
import dorkbox.util.bytes.OptimizeUtilsByteArray;
|
import dorkbox.util.bytes.OptimizeUtilsByteArray;
|
||||||
import dorkbox.util.bytes.OptimizeUtilsByteBuf;
|
import dorkbox.util.bytes.OptimizeUtilsByteBuf;
|
||||||
@ -97,10 +98,10 @@ class KryoExtra<C extends ICryptoConnection> extends Kryo {
|
|||||||
private byte[] decompressOutput;
|
private byte[] decompressOutput;
|
||||||
private ByteBuf decompressBuf;
|
private ByteBuf decompressBuf;
|
||||||
|
|
||||||
private dorkbox.network.util.CryptoSerializationManager serializationManager;
|
private CryptoSerializationManager serializationManager;
|
||||||
|
|
||||||
public
|
public
|
||||||
KryoExtra(final dorkbox.network.util.CryptoSerializationManager serializationManager) {
|
KryoExtra(final CryptoSerializationManager serializationManager) {
|
||||||
this.serializationManager = serializationManager;
|
this.serializationManager = serializationManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -599,7 +600,7 @@ class KryoExtra<C extends ICryptoConnection> extends Kryo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public
|
public
|
||||||
dorkbox.network.util.CryptoSerializationManager getSerializationManager() {
|
CryptoSerializationManager getSerializationManager() {
|
||||||
return serializationManager;
|
return serializationManager;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -36,7 +36,7 @@ import dorkbox.network.pipeline.KryoDecoder;
|
|||||||
import dorkbox.network.pipeline.KryoDecoderCrypto;
|
import dorkbox.network.pipeline.KryoDecoderCrypto;
|
||||||
import dorkbox.network.pipeline.udp.KryoDecoderUdpCrypto;
|
import dorkbox.network.pipeline.udp.KryoDecoderUdpCrypto;
|
||||||
import dorkbox.network.pipeline.udp.KryoEncoderUdpCrypto;
|
import dorkbox.network.pipeline.udp.KryoEncoderUdpCrypto;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.util.FastThreadLocal;
|
import dorkbox.util.FastThreadLocal;
|
||||||
import dorkbox.util.crypto.CryptoECC;
|
import dorkbox.util.crypto.CryptoECC;
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
|
@ -17,7 +17,7 @@ package dorkbox.network.connection.registration.remote;
|
|||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.RegistrationWrapper;
|
import dorkbox.network.connection.RegistrationWrapper;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
|
|
||||||
public
|
public
|
||||||
class RegistrationRemoteHandlerClient<C extends Connection> extends RegistrationRemoteHandler<C> {
|
class RegistrationRemoteHandlerClient<C extends Connection> extends RegistrationRemoteHandler<C> {
|
||||||
|
@ -38,7 +38,7 @@ import dorkbox.network.connection.Connection;
|
|||||||
import dorkbox.network.connection.RegistrationWrapper;
|
import dorkbox.network.connection.RegistrationWrapper;
|
||||||
import dorkbox.network.connection.registration.MetaChannel;
|
import dorkbox.network.connection.registration.MetaChannel;
|
||||||
import dorkbox.network.connection.registration.Registration;
|
import dorkbox.network.connection.registration.Registration;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.util.bytes.OptimizeUtilsByteArray;
|
import dorkbox.util.bytes.OptimizeUtilsByteArray;
|
||||||
import dorkbox.util.crypto.CryptoAES;
|
import dorkbox.util.crypto.CryptoAES;
|
||||||
import dorkbox.util.crypto.CryptoECC;
|
import dorkbox.util.crypto.CryptoECC;
|
||||||
|
@ -28,7 +28,7 @@ import dorkbox.network.connection.registration.MetaChannel;
|
|||||||
import dorkbox.network.connection.registration.Registration;
|
import dorkbox.network.connection.registration.Registration;
|
||||||
import dorkbox.network.pipeline.udp.KryoDecoderUdp;
|
import dorkbox.network.pipeline.udp.KryoDecoderUdp;
|
||||||
import dorkbox.network.pipeline.udp.KryoEncoderUdp;
|
import dorkbox.network.pipeline.udp.KryoEncoderUdp;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.util.bytes.OptimizeUtilsByteArray;
|
import dorkbox.util.bytes.OptimizeUtilsByteArray;
|
||||||
import dorkbox.util.crypto.CryptoAES;
|
import dorkbox.util.crypto.CryptoAES;
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
|
@ -18,7 +18,7 @@ package dorkbox.network.connection.registration.remote;
|
|||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.RegistrationWrapper;
|
import dorkbox.network.connection.RegistrationWrapper;
|
||||||
import dorkbox.network.connection.registration.MetaChannel;
|
import dorkbox.network.connection.registration.MetaChannel;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
|
|
||||||
public
|
public
|
||||||
class RegistrationRemoteHandlerServer<C extends Connection> extends RegistrationRemoteHandler<C> {
|
class RegistrationRemoteHandlerServer<C extends Connection> extends RegistrationRemoteHandler<C> {
|
||||||
|
@ -39,7 +39,7 @@ import dorkbox.network.connection.Connection;
|
|||||||
import dorkbox.network.connection.RegistrationWrapper;
|
import dorkbox.network.connection.RegistrationWrapper;
|
||||||
import dorkbox.network.connection.registration.MetaChannel;
|
import dorkbox.network.connection.registration.MetaChannel;
|
||||||
import dorkbox.network.connection.registration.Registration;
|
import dorkbox.network.connection.registration.Registration;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.util.bytes.OptimizeUtilsByteArray;
|
import dorkbox.util.bytes.OptimizeUtilsByteArray;
|
||||||
import dorkbox.util.crypto.CryptoAES;
|
import dorkbox.util.crypto.CryptoAES;
|
||||||
import dorkbox.util.crypto.CryptoECC;
|
import dorkbox.util.crypto.CryptoECC;
|
||||||
|
@ -31,6 +31,7 @@ import dorkbox.network.connection.RegistrationWrapper;
|
|||||||
import dorkbox.network.connection.registration.MetaChannel;
|
import dorkbox.network.connection.registration.MetaChannel;
|
||||||
import dorkbox.network.connection.registration.Registration;
|
import dorkbox.network.connection.registration.Registration;
|
||||||
import dorkbox.network.connection.wrapper.UdpWrapper;
|
import dorkbox.network.connection.wrapper.UdpWrapper;
|
||||||
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.util.bytes.OptimizeUtilsByteArray;
|
import dorkbox.util.bytes.OptimizeUtilsByteArray;
|
||||||
import dorkbox.util.crypto.CryptoAES;
|
import dorkbox.util.crypto.CryptoAES;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
@ -51,13 +52,13 @@ class RegistrationRemoteHandlerServerUDP<C extends Connection> extends MessageTo
|
|||||||
private final org.slf4j.Logger logger;
|
private final org.slf4j.Logger logger;
|
||||||
private final ByteBuf discoverResponseBuffer;
|
private final ByteBuf discoverResponseBuffer;
|
||||||
private final RegistrationWrapper<C> registrationWrapper;
|
private final RegistrationWrapper<C> registrationWrapper;
|
||||||
private final dorkbox.network.util.CryptoSerializationManager serializationManager;
|
private final CryptoSerializationManager serializationManager;
|
||||||
|
|
||||||
|
|
||||||
public
|
public
|
||||||
RegistrationRemoteHandlerServerUDP(final String name,
|
RegistrationRemoteHandlerServerUDP(final String name,
|
||||||
final RegistrationWrapper<C> registrationWrapper,
|
final RegistrationWrapper<C> registrationWrapper,
|
||||||
final dorkbox.network.util.CryptoSerializationManager serializationManager) {
|
final CryptoSerializationManager serializationManager) {
|
||||||
final String name1 = name + " Registration-UDP-Server";
|
final String name1 = name + " Registration-UDP-Server";
|
||||||
this.logger = org.slf4j.LoggerFactory.getLogger(name1);
|
this.logger = org.slf4j.LoggerFactory.getLogger(name1);
|
||||||
this.registrationWrapper = registrationWrapper;
|
this.registrationWrapper = registrationWrapper;
|
||||||
@ -176,7 +177,7 @@ class RegistrationRemoteHandlerServerUDP<C extends Connection> extends MessageTo
|
|||||||
// registration is the ONLY thing NOT encrypted
|
// registration is the ONLY thing NOT encrypted
|
||||||
Logger logger2 = this.logger;
|
Logger logger2 = this.logger;
|
||||||
RegistrationWrapper<C> registrationWrapper2 = this.registrationWrapper;
|
RegistrationWrapper<C> registrationWrapper2 = this.registrationWrapper;
|
||||||
dorkbox.network.util.CryptoSerializationManager serializationManager2 = this.serializationManager;
|
CryptoSerializationManager serializationManager2 = this.serializationManager;
|
||||||
|
|
||||||
if (KryoExtra.isEncrypted(message)) {
|
if (KryoExtra.isEncrypted(message)) {
|
||||||
// we need to FORWARD this message "down the pipeline".
|
// we need to FORWARD this message "down the pipeline".
|
||||||
|
@ -15,15 +15,15 @@
|
|||||||
*/
|
*/
|
||||||
package dorkbox.network.pipeline;
|
package dorkbox.network.pipeline;
|
||||||
|
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import java.io.IOException;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.util.bytes.OptimizeUtilsByteBuf;
|
import dorkbox.util.bytes.OptimizeUtilsByteBuf;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
import io.netty.handler.codec.ByteToMessageDecoder;
|
import io.netty.handler.codec.ByteToMessageDecoder;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public
|
public
|
||||||
class KryoDecoder extends ByteToMessageDecoder {
|
class KryoDecoder extends ByteToMessageDecoder {
|
||||||
private final CryptoSerializationManager serializationManager;
|
private final CryptoSerializationManager serializationManager;
|
||||||
|
@ -15,13 +15,13 @@
|
|||||||
*/
|
*/
|
||||||
package dorkbox.network.pipeline;
|
package dorkbox.network.pipeline;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
import dorkbox.network.connection.ConnectionImpl;
|
import dorkbox.network.connection.ConnectionImpl;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
// on client this is MessageToMessage (because of the UdpDecoder in the pipeline!)
|
// on client this is MessageToMessage (because of the UdpDecoder in the pipeline!)
|
||||||
|
|
||||||
public
|
public
|
||||||
|
@ -15,15 +15,15 @@
|
|||||||
*/
|
*/
|
||||||
package dorkbox.network.pipeline;
|
package dorkbox.network.pipeline;
|
||||||
|
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.util.bytes.OptimizeUtilsByteBuf;
|
import dorkbox.util.bytes.OptimizeUtilsByteBuf;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandler.Sharable;
|
import io.netty.channel.ChannelHandler.Sharable;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
import io.netty.handler.codec.MessageToByteEncoder;
|
import io.netty.handler.codec.MessageToByteEncoder;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
@Sharable
|
@Sharable
|
||||||
public
|
public
|
||||||
class KryoEncoder extends MessageToByteEncoder<Object> {
|
class KryoEncoder extends MessageToByteEncoder<Object> {
|
||||||
|
@ -15,14 +15,14 @@
|
|||||||
*/
|
*/
|
||||||
package dorkbox.network.pipeline;
|
package dorkbox.network.pipeline;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
import dorkbox.network.connection.ConnectionImpl;
|
import dorkbox.network.connection.ConnectionImpl;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandler.Sharable;
|
import io.netty.channel.ChannelHandler.Sharable;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
@Sharable
|
@Sharable
|
||||||
public
|
public
|
||||||
class KryoEncoderCrypto extends KryoEncoder {
|
class KryoEncoderCrypto extends KryoEncoder {
|
||||||
|
@ -21,6 +21,7 @@ import java.util.List;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import dorkbox.network.connection.KryoExtra;
|
import dorkbox.network.connection.KryoExtra;
|
||||||
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandler.Sharable;
|
import io.netty.channel.ChannelHandler.Sharable;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
@ -31,10 +32,10 @@ import io.netty.handler.codec.MessageToMessageDecoder;
|
|||||||
public
|
public
|
||||||
class KryoDecoderUdp extends MessageToMessageDecoder<DatagramPacket> {
|
class KryoDecoderUdp extends MessageToMessageDecoder<DatagramPacket> {
|
||||||
|
|
||||||
private final dorkbox.network.util.CryptoSerializationManager serializationManager;
|
private final CryptoSerializationManager serializationManager;
|
||||||
|
|
||||||
public
|
public
|
||||||
KryoDecoderUdp(dorkbox.network.util.CryptoSerializationManager serializationManager) {
|
KryoDecoderUdp(CryptoSerializationManager serializationManager) {
|
||||||
this.serializationManager = serializationManager;
|
this.serializationManager = serializationManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,18 +15,19 @@
|
|||||||
*/
|
*/
|
||||||
package dorkbox.network.pipeline.udp;
|
package dorkbox.network.pipeline.udp;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import dorkbox.network.connection.ConnectionImpl;
|
import dorkbox.network.connection.ConnectionImpl;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandler;
|
import io.netty.channel.ChannelHandler;
|
||||||
import io.netty.channel.ChannelHandler.Sharable;
|
import io.netty.channel.ChannelHandler.Sharable;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
import io.netty.channel.socket.DatagramPacket;
|
import io.netty.channel.socket.DatagramPacket;
|
||||||
import io.netty.handler.codec.MessageToMessageDecoder;
|
import io.netty.handler.codec.MessageToMessageDecoder;
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Sharable
|
@Sharable
|
||||||
public
|
public
|
||||||
|
@ -22,7 +22,7 @@ import java.util.List;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import dorkbox.network.connection.EndPointBase;
|
import dorkbox.network.connection.EndPointBase;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.buffer.Unpooled;
|
import io.netty.buffer.Unpooled;
|
||||||
import io.netty.channel.ChannelHandler.Sharable;
|
import io.netty.channel.ChannelHandler.Sharable;
|
||||||
|
@ -15,15 +15,15 @@
|
|||||||
*/
|
*/
|
||||||
package dorkbox.network.pipeline.udp;
|
package dorkbox.network.pipeline.udp;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
import dorkbox.network.connection.ConnectionImpl;
|
import dorkbox.network.connection.ConnectionImpl;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandler;
|
import io.netty.channel.ChannelHandler;
|
||||||
import io.netty.channel.ChannelHandler.Sharable;
|
import io.netty.channel.ChannelHandler.Sharable;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
@Sharable
|
@Sharable
|
||||||
public
|
public
|
||||||
class KryoEncoderUdpCrypto extends KryoEncoderUdp {
|
class KryoEncoderUdpCrypto extends KryoEncoderUdp {
|
||||||
|
@ -55,8 +55,8 @@ import com.esotericsoftware.reflectasm.MethodAccess;
|
|||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.EndPointBase;
|
import dorkbox.network.connection.EndPointBase;
|
||||||
import dorkbox.network.connection.KryoExtra;
|
import dorkbox.network.connection.KryoExtra;
|
||||||
import dorkbox.network.util.CryptoSerializationManager;
|
import dorkbox.network.serialization.CryptoSerializationManager;
|
||||||
import dorkbox.network.util.RmiSerializationManager;
|
import dorkbox.network.serialization.RmiSerializationManager;
|
||||||
import dorkbox.util.ClassHelper;
|
import dorkbox.util.ClassHelper;
|
||||||
|
|
||||||
public
|
public
|
||||||
|
@ -51,7 +51,7 @@ import dorkbox.network.connection.Connection;
|
|||||||
import dorkbox.network.connection.ConnectionImpl;
|
import dorkbox.network.connection.ConnectionImpl;
|
||||||
import dorkbox.network.connection.EndPointBase;
|
import dorkbox.network.connection.EndPointBase;
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.RmiSerializationManager;
|
import dorkbox.network.serialization.RmiSerializationManager;
|
||||||
import dorkbox.util.collections.ObjectIntMap;
|
import dorkbox.util.collections.ObjectIntMap;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
|
|||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.EndPointBase;
|
import dorkbox.network.connection.EndPointBase;
|
||||||
import dorkbox.network.util.RmiSerializationManager;
|
import dorkbox.network.serialization.RmiSerializationManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles network communication when methods are invoked on a proxy.
|
* Handles network communication when methods are invoked on a proxy.
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package dorkbox.network.util;
|
package dorkbox.network.serialization;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package dorkbox.network.util;
|
package dorkbox.network.serialization;
|
||||||
|
|
||||||
import com.esotericsoftware.kryo.Kryo;
|
import com.esotericsoftware.kryo.Kryo;
|
||||||
import com.esotericsoftware.kryo.KryoException;
|
import com.esotericsoftware.kryo.KryoException;
|
@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package dorkbox.network.connection;
|
package dorkbox.network.serialization;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.annotation.Annotation;
|
import java.lang.annotation.Annotation;
|
||||||
@ -42,6 +42,8 @@ import com.esotericsoftware.kryo.util.IdentityMap;
|
|||||||
import com.esotericsoftware.kryo.util.IntMap;
|
import com.esotericsoftware.kryo.util.IntMap;
|
||||||
import com.esotericsoftware.kryo.util.MapReferenceResolver;
|
import com.esotericsoftware.kryo.util.MapReferenceResolver;
|
||||||
|
|
||||||
|
import dorkbox.network.connection.ConnectionImpl;
|
||||||
|
import dorkbox.network.connection.KryoExtra;
|
||||||
import dorkbox.network.connection.ping.PingMessage;
|
import dorkbox.network.connection.ping.PingMessage;
|
||||||
import dorkbox.network.rmi.InvocationHandlerSerializer;
|
import dorkbox.network.rmi.InvocationHandlerSerializer;
|
||||||
import dorkbox.network.rmi.InvocationResultSerializer;
|
import dorkbox.network.rmi.InvocationResultSerializer;
|
||||||
@ -50,7 +52,6 @@ import dorkbox.network.rmi.InvokeMethodResult;
|
|||||||
import dorkbox.network.rmi.InvokeMethodSerializer;
|
import dorkbox.network.rmi.InvokeMethodSerializer;
|
||||||
import dorkbox.network.rmi.RemoteObjectSerializer;
|
import dorkbox.network.rmi.RemoteObjectSerializer;
|
||||||
import dorkbox.network.rmi.RmiRegistration;
|
import dorkbox.network.rmi.RmiRegistration;
|
||||||
import dorkbox.network.util.RmiSerializationManager;
|
|
||||||
import dorkbox.objectPool.ObjectPool;
|
import dorkbox.objectPool.ObjectPool;
|
||||||
import dorkbox.objectPool.PoolableObject;
|
import dorkbox.objectPool.PoolableObject;
|
||||||
import dorkbox.util.Property;
|
import dorkbox.util.Property;
|
||||||
@ -70,9 +71,9 @@ import io.netty.buffer.ByteBuf;
|
|||||||
*/
|
*/
|
||||||
@SuppressWarnings({"unused", "StaticNonFinalField"})
|
@SuppressWarnings({"unused", "StaticNonFinalField"})
|
||||||
public
|
public
|
||||||
class CryptoSerializationManager implements dorkbox.network.util.CryptoSerializationManager, RmiSerializationManager {
|
class SerializationManager implements CryptoSerializationManager, RmiSerializationManager {
|
||||||
|
|
||||||
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CryptoSerializationManager.class);
|
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SerializationManager.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Specify if we want KRYO to use unsafe memory for serialization, or to use the ASM backend. Unsafe memory use is WAY faster, but is
|
* Specify if we want KRYO to use unsafe memory for serialization, or to use the ASM backend. Unsafe memory use is WAY faster, but is
|
||||||
@ -82,18 +83,18 @@ class CryptoSerializationManager implements dorkbox.network.util.CryptoSerializa
|
|||||||
public static boolean useUnsafeMemory = false;
|
public static boolean useUnsafeMemory = false;
|
||||||
|
|
||||||
public static
|
public static
|
||||||
CryptoSerializationManager DEFAULT() {
|
SerializationManager DEFAULT() {
|
||||||
return DEFAULT(true, true);
|
return DEFAULT(true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
CryptoSerializationManager DEFAULT(final boolean references, final boolean registrationRequired) {
|
SerializationManager DEFAULT(final boolean references, final boolean registrationRequired) {
|
||||||
// ignore fields that have the "@IgnoreSerialization" annotation.
|
// ignore fields that have the "@IgnoreSerialization" annotation.
|
||||||
Collection<Class<? extends Annotation>> marks = new ArrayList<Class<? extends Annotation>>();
|
Collection<Class<? extends Annotation>> marks = new ArrayList<Class<? extends Annotation>>();
|
||||||
marks.add(IgnoreSerialization.class);
|
marks.add(IgnoreSerialization.class);
|
||||||
SerializerFactory disregardingFactory = new FieldAnnotationAwareSerializer.Factory(marks, true);
|
SerializerFactory disregardingFactory = new FieldAnnotationAwareSerializer.Factory(marks, true);
|
||||||
|
|
||||||
final CryptoSerializationManager serializationManager = new CryptoSerializationManager(references,
|
final SerializationManager serializationManager = new SerializationManager(references,
|
||||||
registrationRequired,
|
registrationRequired,
|
||||||
disregardingFactory);
|
disregardingFactory);
|
||||||
|
|
||||||
@ -213,13 +214,13 @@ class CryptoSerializationManager implements dorkbox.network.util.CryptoSerializa
|
|||||||
* <p>
|
* <p>
|
||||||
*/
|
*/
|
||||||
public
|
public
|
||||||
CryptoSerializationManager(final boolean references, final boolean registrationRequired, final SerializerFactory factory) {
|
SerializationManager(final boolean references, final boolean registrationRequired, final SerializerFactory factory) {
|
||||||
kryoPool = ObjectPool.NonBlockingSoftReference(new PoolableObject<KryoExtra>() {
|
kryoPool = ObjectPool.NonBlockingSoftReference(new PoolableObject<KryoExtra>() {
|
||||||
@Override
|
@Override
|
||||||
public
|
public
|
||||||
KryoExtra create() {
|
KryoExtra create() {
|
||||||
synchronized (CryptoSerializationManager.this) {
|
synchronized (SerializationManager.this) {
|
||||||
KryoExtra kryo = new KryoExtra(CryptoSerializationManager.this);
|
KryoExtra kryo = new KryoExtra(SerializationManager.this);
|
||||||
|
|
||||||
// we HAVE to pre-allocate the KRYOs
|
// we HAVE to pre-allocate the KRYOs
|
||||||
boolean useAsm = !useUnsafeMemory;
|
boolean useAsm = !useUnsafeMemory;
|
@ -29,10 +29,9 @@ import org.junit.Test;
|
|||||||
|
|
||||||
import dorkbox.network.PingPongTest.TYPE;
|
import dorkbox.network.PingPongTest.TYPE;
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.connection.idle.IdleBridge;
|
import dorkbox.network.connection.idle.IdleBridge;
|
||||||
import dorkbox.util.SerializationManager;
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -55,7 +54,7 @@ public class ChunkedDataIdleTest extends BaseTest {
|
|||||||
Configuration configuration = new Configuration();
|
Configuration configuration = new Configuration();
|
||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
sendObject(mainData, configuration, ConnectionType.TCP);
|
sendObject(mainData, configuration, ConnectionType.TCP);
|
||||||
@ -66,7 +65,7 @@ public class ChunkedDataIdleTest extends BaseTest {
|
|||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
sendObject(mainData, configuration, ConnectionType.UDP);
|
sendObject(mainData, configuration, ConnectionType.UDP);
|
||||||
@ -151,7 +150,7 @@ public class ChunkedDataIdleTest extends BaseTest {
|
|||||||
data.Booleans = new Boolean[] {true, false};
|
data.Booleans = new Boolean[] {true, false};
|
||||||
}
|
}
|
||||||
|
|
||||||
private void register (SerializationManager manager) {
|
private void register (dorkbox.util.SerializationManager manager) {
|
||||||
manager.register(int[].class);
|
manager.register(int[].class);
|
||||||
manager.register(short[].class);
|
manager.register(short[].class);
|
||||||
manager.register(float[].class);
|
manager.register(float[].class);
|
||||||
|
@ -27,9 +27,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.util.SerializationManager;
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -44,7 +43,7 @@ class ClientSendTest extends BaseTest {
|
|||||||
Configuration configuration = new Configuration();
|
Configuration configuration = new Configuration();
|
||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
Server server = new Server(configuration);
|
Server server = new Server(configuration);
|
||||||
@ -87,7 +86,7 @@ class ClientSendTest extends BaseTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static
|
private static
|
||||||
void register(SerializationManager manager) {
|
void register(dorkbox.util.SerializationManager manager) {
|
||||||
manager.register(AMessage.class);
|
manager.register(AMessage.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,10 +26,9 @@ import java.util.TimerTask;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.EndPointBase;
|
import dorkbox.network.connection.EndPointBase;
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.util.SerializationManager;
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -43,7 +42,7 @@ class ConnectionTest extends BaseTest {
|
|||||||
|
|
||||||
Configuration configuration = new Configuration();
|
Configuration configuration = new Configuration();
|
||||||
configuration.localChannelName = EndPointBase.LOCAL_CHANNEL;
|
configuration.localChannelName = EndPointBase.LOCAL_CHANNEL;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
startServer(configuration);
|
startServer(configuration);
|
||||||
@ -59,7 +58,7 @@ class ConnectionTest extends BaseTest {
|
|||||||
|
|
||||||
Configuration configuration = new Configuration();
|
Configuration configuration = new Configuration();
|
||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
startServer(configuration);
|
startServer(configuration);
|
||||||
@ -78,7 +77,7 @@ class ConnectionTest extends BaseTest {
|
|||||||
Configuration configuration = new Configuration();
|
Configuration configuration = new Configuration();
|
||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
startServer(configuration);
|
startServer(configuration);
|
||||||
@ -154,7 +153,7 @@ class ConnectionTest extends BaseTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private
|
private
|
||||||
void register(SerializationManager manager) {
|
void register(dorkbox.util.SerializationManager manager) {
|
||||||
manager.register(BMessage.class);
|
manager.register(BMessage.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,14 +30,13 @@ import org.junit.Test;
|
|||||||
|
|
||||||
import dorkbox.network.PingPongTest.TYPE;
|
import dorkbox.network.PingPongTest.TYPE;
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.connection.idle.IdleBridge;
|
import dorkbox.network.connection.idle.IdleBridge;
|
||||||
import dorkbox.network.connection.idle.IdleListener;
|
import dorkbox.network.connection.idle.IdleListener;
|
||||||
import dorkbox.network.connection.idle.IdleListenerTCP;
|
import dorkbox.network.connection.idle.IdleListenerTCP;
|
||||||
import dorkbox.network.connection.idle.IdleListenerUDP;
|
import dorkbox.network.connection.idle.IdleListenerUDP;
|
||||||
import dorkbox.network.connection.idle.InputStreamSender;
|
import dorkbox.network.connection.idle.InputStreamSender;
|
||||||
import dorkbox.util.SerializationManager;
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -61,7 +60,7 @@ class IdleTest extends BaseTest {
|
|||||||
Configuration configuration = new Configuration();
|
Configuration configuration = new Configuration();
|
||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT(false, false);
|
configuration.serialization = SerializationManager.DEFAULT(false, false);
|
||||||
|
|
||||||
streamSpecificType(largeDataSize, configuration, ConnectionType.TCP);
|
streamSpecificType(largeDataSize, configuration, ConnectionType.TCP);
|
||||||
|
|
||||||
@ -71,7 +70,7 @@ class IdleTest extends BaseTest {
|
|||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT(false, false);
|
configuration.serialization = SerializationManager.DEFAULT(false, false);
|
||||||
|
|
||||||
streamSpecificType(largeDataSize, configuration, ConnectionType.UDP);
|
streamSpecificType(largeDataSize, configuration, ConnectionType.UDP);
|
||||||
}
|
}
|
||||||
@ -90,7 +89,7 @@ class IdleTest extends BaseTest {
|
|||||||
Configuration configuration = new Configuration();
|
Configuration configuration = new Configuration();
|
||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
sendObject(mainData, configuration, ConnectionType.TCP);
|
sendObject(mainData, configuration, ConnectionType.TCP);
|
||||||
@ -101,7 +100,7 @@ class IdleTest extends BaseTest {
|
|||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
sendObject(mainData, configuration, ConnectionType.TCP);
|
sendObject(mainData, configuration, ConnectionType.TCP);
|
||||||
@ -284,7 +283,7 @@ class IdleTest extends BaseTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static
|
private static
|
||||||
void register(SerializationManager manager) {
|
void register(dorkbox.util.SerializationManager manager) {
|
||||||
manager.register(int[].class);
|
manager.register(int[].class);
|
||||||
manager.register(short[].class);
|
manager.register(short[].class);
|
||||||
manager.register(float[].class);
|
manager.register(float[].class);
|
||||||
|
@ -28,9 +28,8 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.util.SerializationManager;
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -51,7 +50,7 @@ class LargeResizeBufferTest extends BaseTest {
|
|||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
Server server = new Server(configuration);
|
Server server = new Server(configuration);
|
||||||
@ -141,7 +140,7 @@ class LargeResizeBufferTest extends BaseTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private
|
private
|
||||||
void register(SerializationManager manager) {
|
void register(dorkbox.util.SerializationManager manager) {
|
||||||
manager.register(byte[].class);
|
manager.register(byte[].class);
|
||||||
manager.register(LargeMessage.class);
|
manager.register(LargeMessage.class);
|
||||||
}
|
}
|
||||||
|
@ -27,8 +27,8 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -43,7 +43,7 @@ class MultipleServerTest extends BaseTest {
|
|||||||
configuration1.tcpPort = tcpPort;
|
configuration1.tcpPort = tcpPort;
|
||||||
configuration1.udpPort = udpPort;
|
configuration1.udpPort = udpPort;
|
||||||
configuration1.localChannelName = "chan1";
|
configuration1.localChannelName = "chan1";
|
||||||
configuration1.serialization = CryptoSerializationManager.DEFAULT();
|
configuration1.serialization = SerializationManager.DEFAULT();
|
||||||
configuration1.serialization.register(String[].class);
|
configuration1.serialization.register(String[].class);
|
||||||
|
|
||||||
Server server1 = new Server(configuration1);
|
Server server1 = new Server(configuration1);
|
||||||
@ -68,7 +68,7 @@ class MultipleServerTest extends BaseTest {
|
|||||||
configuration2.tcpPort = tcpPort + 1;
|
configuration2.tcpPort = tcpPort + 1;
|
||||||
configuration2.udpPort = udpPort + 1;
|
configuration2.udpPort = udpPort + 1;
|
||||||
configuration2.localChannelName = "chan2";
|
configuration2.localChannelName = "chan2";
|
||||||
configuration2.serialization = CryptoSerializationManager.DEFAULT();
|
configuration2.serialization = SerializationManager.DEFAULT();
|
||||||
configuration2.serialization.register(String[].class);
|
configuration2.serialization.register(String[].class);
|
||||||
|
|
||||||
Server server2 = new Server(configuration2);
|
Server server2 = new Server(configuration2);
|
||||||
|
@ -31,9 +31,9 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.connection.Listeners;
|
import dorkbox.network.connection.Listeners;
|
||||||
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ class MultipleThreadTest extends BaseTest {
|
|||||||
Configuration configuration = new Configuration();
|
Configuration configuration = new Configuration();
|
||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
configuration.serialization.register(String[].class);
|
configuration.serialization.register(String[].class);
|
||||||
configuration.serialization.register(DataClass.class);
|
configuration.serialization.register(DataClass.class);
|
||||||
|
|
||||||
|
@ -28,10 +28,9 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.connection.Listeners;
|
import dorkbox.network.connection.Listeners;
|
||||||
import dorkbox.util.SerializationManager;
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -48,7 +47,7 @@ class PingPongLocalTest extends BaseTest {
|
|||||||
populateData(dataLOCAL);
|
populateData(dataLOCAL);
|
||||||
|
|
||||||
Configuration configuration = Configuration.localOnly();
|
Configuration configuration = Configuration.localOnly();
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
|
|
||||||
@ -169,7 +168,7 @@ class PingPongLocalTest extends BaseTest {
|
|||||||
data.Booleans = new Boolean[] {true,false};
|
data.Booleans = new Boolean[] {true,false};
|
||||||
}
|
}
|
||||||
|
|
||||||
private void register(SerializationManager manager) {
|
private void register(dorkbox.util.SerializationManager manager) {
|
||||||
manager.register(int[].class);
|
manager.register(int[].class);
|
||||||
manager.register(short[].class);
|
manager.register(short[].class);
|
||||||
manager.register(float[].class);
|
manager.register(float[].class);
|
||||||
|
@ -29,11 +29,10 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.EndPointBase;
|
import dorkbox.network.connection.EndPointBase;
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.connection.Listeners;
|
import dorkbox.network.connection.Listeners;
|
||||||
import dorkbox.util.SerializationManager;
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -61,7 +60,7 @@ class PingPongTest extends BaseTest {
|
|||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
|
|
||||||
@ -261,7 +260,7 @@ class PingPongTest extends BaseTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private
|
private
|
||||||
void register(SerializationManager manager) {
|
void register(dorkbox.util.SerializationManager manager) {
|
||||||
manager.register(int[].class);
|
manager.register(int[].class);
|
||||||
manager.register(short[].class);
|
manager.register(short[].class);
|
||||||
manager.register(float[].class);
|
manager.register(float[].class);
|
||||||
|
@ -29,10 +29,10 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.EndPointBase;
|
import dorkbox.network.connection.EndPointBase;
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.connection.Listeners;
|
import dorkbox.network.connection.Listeners;
|
||||||
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -54,7 +54,7 @@ class UnregisteredClassTest extends BaseTest {
|
|||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT(false, false);
|
configuration.serialization = SerializationManager.DEFAULT(false, false);
|
||||||
|
|
||||||
|
|
||||||
System.err.println("Running test " + this.tries + " times, please wait for it to finish.");
|
System.err.println("Running test " + this.tries + " times, please wait for it to finish.");
|
||||||
|
@ -49,8 +49,8 @@ import dorkbox.network.Configuration;
|
|||||||
import dorkbox.network.Server;
|
import dorkbox.network.Server;
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.ConnectionImpl;
|
import dorkbox.network.connection.ConnectionImpl;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -181,7 +181,7 @@ class RmiGlobalTest extends BaseTest {
|
|||||||
|
|
||||||
|
|
||||||
public static
|
public static
|
||||||
void register(dorkbox.network.util.CryptoSerializationManager manager) {
|
void register(dorkbox.network.serialization.CryptoSerializationManager manager) {
|
||||||
manager.register(Object.class); // Needed for Object#toString, hashCode, etc.
|
manager.register(Object.class); // Needed for Object#toString, hashCode, etc.
|
||||||
manager.register(MessageWithTestCow.class);
|
manager.register(MessageWithTestCow.class);
|
||||||
manager.register(UnsupportedOperationException.class);
|
manager.register(UnsupportedOperationException.class);
|
||||||
@ -195,7 +195,7 @@ class RmiGlobalTest extends BaseTest {
|
|||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
|
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
// for Server -> Client RMI (ID: CLIENT_GLOBAL_OBJECT_ID)
|
// for Server -> Client RMI (ID: CLIENT_GLOBAL_OBJECT_ID)
|
||||||
@ -267,7 +267,7 @@ class RmiGlobalTest extends BaseTest {
|
|||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
|
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
// for Server -> Client RMI (ID: CLIENT_GLOBAL_OBJECT_ID)
|
// for Server -> Client RMI (ID: CLIENT_GLOBAL_OBJECT_ID)
|
||||||
|
@ -28,8 +28,8 @@ import dorkbox.network.Client;
|
|||||||
import dorkbox.network.Configuration;
|
import dorkbox.network.Configuration;
|
||||||
import dorkbox.network.Server;
|
import dorkbox.network.Server;
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
import dorkbox.util.serialization.IgnoreSerialization;
|
import dorkbox.util.serialization.IgnoreSerialization;
|
||||||
@ -71,7 +71,7 @@ class RmiSendObjectOverrideMethodTest extends BaseTest {
|
|||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
|
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
configuration.serialization.registerRmiImplementation(TestObject.class, TestObjectImpl.class);
|
configuration.serialization.registerRmiImplementation(TestObject.class, TestObjectImpl.class);
|
||||||
configuration.serialization.registerRmiImplementation(OtherObject.class, OtherObjectImpl.class);
|
configuration.serialization.registerRmiImplementation(OtherObject.class, OtherObjectImpl.class);
|
||||||
|
|
||||||
@ -105,7 +105,7 @@ class RmiSendObjectOverrideMethodTest extends BaseTest {
|
|||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
|
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
configuration.serialization.registerRmiInterface(TestObject.class);
|
configuration.serialization.registerRmiInterface(TestObject.class);
|
||||||
configuration.serialization.registerRmiInterface(OtherObject.class);
|
configuration.serialization.registerRmiInterface(OtherObject.class);
|
||||||
|
|
||||||
|
@ -47,8 +47,8 @@ import dorkbox.network.Client;
|
|||||||
import dorkbox.network.Configuration;
|
import dorkbox.network.Configuration;
|
||||||
import dorkbox.network.Server;
|
import dorkbox.network.Server;
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
import dorkbox.util.serialization.IgnoreSerialization;
|
import dorkbox.util.serialization.IgnoreSerialization;
|
||||||
@ -68,7 +68,7 @@ class RmiSendObjectTest extends BaseTest {
|
|||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
|
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
configuration.serialization.registerRmiImplementation(TestObject.class, TestObjectImpl.class);
|
configuration.serialization.registerRmiImplementation(TestObject.class, TestObjectImpl.class);
|
||||||
configuration.serialization.registerRmiImplementation(OtherObject.class, OtherObjectImpl.class);
|
configuration.serialization.registerRmiImplementation(OtherObject.class, OtherObjectImpl.class);
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ class RmiSendObjectTest extends BaseTest {
|
|||||||
configuration.tcpPort = tcpPort;
|
configuration.tcpPort = tcpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
|
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
configuration.serialization.registerRmiInterface(TestObject.class);
|
configuration.serialization.registerRmiInterface(TestObject.class);
|
||||||
configuration.serialization.registerRmiInterface(OtherObject.class);
|
configuration.serialization.registerRmiInterface(OtherObject.class);
|
||||||
|
|
||||||
|
@ -48,9 +48,9 @@ import dorkbox.network.Client;
|
|||||||
import dorkbox.network.Configuration;
|
import dorkbox.network.Configuration;
|
||||||
import dorkbox.network.Server;
|
import dorkbox.network.Server;
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.connection.Listener;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.connection.Listeners;
|
import dorkbox.network.connection.Listeners;
|
||||||
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -170,7 +170,7 @@ class RmiTest extends BaseTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
void register(dorkbox.network.util.CryptoSerializationManager manager) {
|
void register(dorkbox.network.serialization.CryptoSerializationManager manager) {
|
||||||
manager.register(Object.class); // Needed for Object#toString, hashCode, etc.
|
manager.register(Object.class); // Needed for Object#toString, hashCode, etc.
|
||||||
manager.register(MessageWithTestCow.class);
|
manager.register(MessageWithTestCow.class);
|
||||||
manager.register(UnsupportedOperationException.class);
|
manager.register(UnsupportedOperationException.class);
|
||||||
@ -184,7 +184,7 @@ class RmiTest extends BaseTest {
|
|||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
|
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
// for Client -> Server RMI (ID 1)
|
// for Client -> Server RMI (ID 1)
|
||||||
@ -248,7 +248,7 @@ class RmiTest extends BaseTest {
|
|||||||
configuration.udpPort = udpPort;
|
configuration.udpPort = udpPort;
|
||||||
configuration.host = host;
|
configuration.host = host;
|
||||||
|
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
register(configuration.serialization);
|
register(configuration.serialization);
|
||||||
|
|
||||||
// for Client -> Server RMI (ID 1)
|
// for Client -> Server RMI (ID 1)
|
||||||
|
@ -16,10 +16,10 @@ import ch.qos.logback.core.ConsoleAppender;
|
|||||||
import dorkbox.network.Client;
|
import dorkbox.network.Client;
|
||||||
import dorkbox.network.Configuration;
|
import dorkbox.network.Configuration;
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.rmi.RemoteObjectCallback;
|
import dorkbox.network.rmi.RemoteObjectCallback;
|
||||||
import dorkbox.network.rmi.RmiTest;
|
import dorkbox.network.rmi.RmiTest;
|
||||||
import dorkbox.network.rmi.TestCow;
|
import dorkbox.network.rmi.TestCow;
|
||||||
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import io.netty.util.ResourceLeakDetector;
|
import io.netty.util.ResourceLeakDetector;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -82,7 +82,7 @@ class TestClient
|
|||||||
configuration.udpPort = 2001;
|
configuration.udpPort = 2001;
|
||||||
configuration.host = "localhost";
|
configuration.host = "localhost";
|
||||||
|
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
RmiTest.register(configuration.serialization);
|
RmiTest.register(configuration.serialization);
|
||||||
configuration.serialization.registerRmiInterface(TestCow.class);
|
configuration.serialization.registerRmiInterface(TestCow.class);
|
||||||
|
|
||||||
|
@ -3,10 +3,10 @@ package dorkbox.network.rmi.multiJVM;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import dorkbox.network.Server;
|
import dorkbox.network.Server;
|
||||||
import dorkbox.network.connection.CryptoSerializationManager;
|
|
||||||
import dorkbox.network.rmi.RmiTest;
|
import dorkbox.network.rmi.RmiTest;
|
||||||
import dorkbox.network.rmi.TestCow;
|
import dorkbox.network.rmi.TestCow;
|
||||||
import dorkbox.network.rmi.TestCowImpl;
|
import dorkbox.network.rmi.TestCowImpl;
|
||||||
|
import dorkbox.network.serialization.SerializationManager;
|
||||||
import dorkbox.util.exceptions.InitializationException;
|
import dorkbox.util.exceptions.InitializationException;
|
||||||
import dorkbox.util.exceptions.SecurityException;
|
import dorkbox.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -24,7 +24,7 @@ class TestServer
|
|||||||
configuration.tcpPort = 2000;
|
configuration.tcpPort = 2000;
|
||||||
configuration.udpPort = 2001;
|
configuration.udpPort = 2001;
|
||||||
|
|
||||||
configuration.serialization = CryptoSerializationManager.DEFAULT();
|
configuration.serialization = SerializationManager.DEFAULT();
|
||||||
RmiTest.register(configuration.serialization);
|
RmiTest.register(configuration.serialization);
|
||||||
configuration.serialization.registerRmiImplementation(TestCow.class, TestCowImpl.class);
|
configuration.serialization.registerRmiImplementation(TestCow.class, TestCowImpl.class);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user