From 05f3272f96e985fa7bced40aabb2a23aec46550a Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 9 Jan 2019 23:41:18 +0100 Subject: [PATCH] Sending a class over the network always requires explicit registration now (previously, RMI message implementations did not require explicit registration) --- .../network/rmi/RmiSendObjectOverrideMethodTest.java | 8 ++++++-- test/dorkbox/network/rmi/RmiSendObjectTest.java | 7 +++++-- test/dorkbox/network/rmi/RmiTest.java | 4 ++-- test/dorkbox/network/rmi/multiJVM/TestClient.java | 4 +--- test/dorkbox/network/rmi/multiJVM/TestServer.java | 3 ++- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/test/dorkbox/network/rmi/RmiSendObjectOverrideMethodTest.java b/test/dorkbox/network/rmi/RmiSendObjectOverrideMethodTest.java index c188512f..25fa0901 100644 --- a/test/dorkbox/network/rmi/RmiSendObjectOverrideMethodTest.java +++ b/test/dorkbox/network/rmi/RmiSendObjectOverrideMethodTest.java @@ -106,9 +106,10 @@ class RmiSendObjectOverrideMethodTest extends BaseTest { final boolean isUDP = configuration.udpPort > 0; - configuration.serialization = Serialization.DEFAULT(true, true, false, null); + configuration.serialization = Serialization.DEFAULT(); configuration.serialization.registerRmi(TestObject.class, TestObjectImpl.class); configuration.serialization.registerRmi(OtherObject.class, OtherObjectImpl.class); + configuration.serialization.register(OtherObjectImpl.class); // registered because this class is sent over the wire Server server = new Server(configuration); server.setIdleTimeout(0); @@ -138,9 +139,12 @@ class RmiSendObjectOverrideMethodTest extends BaseTest { configuration = new Configuration(); config.apply(configuration); - configuration.serialization = Serialization.DEFAULT(true, true, false, null); + configuration.serialization = Serialization.DEFAULT(); configuration.serialization.registerRmi(TestObject.class, TestObjectImpl.class); configuration.serialization.registerRmi(OtherObject.class, OtherObjectImpl.class); + configuration.serialization.register(OtherObjectImpl.class); // registered because this class is sent over the wire + + Client client = new Client(configuration); client.setIdleTimeout(0); diff --git a/test/dorkbox/network/rmi/RmiSendObjectTest.java b/test/dorkbox/network/rmi/RmiSendObjectTest.java index 35043fba..98c0acd4 100644 --- a/test/dorkbox/network/rmi/RmiSendObjectTest.java +++ b/test/dorkbox/network/rmi/RmiSendObjectTest.java @@ -90,9 +90,11 @@ class RmiSendObjectTest extends BaseTest { Configuration configuration = new Configuration(); config.apply(configuration); - configuration.serialization = Serialization.DEFAULT(true, true, false, null); + configuration.serialization = Serialization.DEFAULT(); configuration.serialization.registerRmi(TestObject.class, TestObjectImpl.class); configuration.serialization.registerRmi(OtherObject.class, OtherObjectImpl.class); + configuration.serialization.register(OtherObjectImpl.class); // registered because this class is sent over the wire + @@ -124,9 +126,10 @@ class RmiSendObjectTest extends BaseTest { configuration = new Configuration(); config.apply(configuration); - configuration.serialization = Serialization.DEFAULT(true, true, false, null); + configuration.serialization = Serialization.DEFAULT(); configuration.serialization.registerRmi(TestObject.class, TestObjectImpl.class); configuration.serialization.registerRmi(OtherObject.class, OtherObjectImpl.class); + configuration.serialization.register(OtherObjectImpl.class); // registered because this class is sent over the wire Client client = new Client(configuration); diff --git a/test/dorkbox/network/rmi/RmiTest.java b/test/dorkbox/network/rmi/RmiTest.java index 2cd19927..2d69d902 100644 --- a/test/dorkbox/network/rmi/RmiTest.java +++ b/test/dorkbox/network/rmi/RmiTest.java @@ -218,7 +218,7 @@ class RmiTest extends BaseTest { Configuration configuration = new Configuration(); config.apply(configuration); - configuration.serialization = Serialization.DEFAULT(true, true, false, null); + configuration.serialization = Serialization.DEFAULT(); register(configuration.serialization); // for Client -> Server RMI (ID 1) @@ -275,7 +275,7 @@ class RmiTest extends BaseTest { configuration = new Configuration(); config.apply(configuration); - configuration.serialization = Serialization.DEFAULT(true, true, false, null); + configuration.serialization = Serialization.DEFAULT(); register(configuration.serialization); // for Client -> Server RMI (ID 1) diff --git a/test/dorkbox/network/rmi/multiJVM/TestClient.java b/test/dorkbox/network/rmi/multiJVM/TestClient.java index 46a99553..91e67e94 100644 --- a/test/dorkbox/network/rmi/multiJVM/TestClient.java +++ b/test/dorkbox/network/rmi/multiJVM/TestClient.java @@ -78,10 +78,8 @@ class TestClient configuration.udpPort = 2001; configuration.host = "localhost"; - configuration.serialization = Serialization.DEFAULT(true, true, false, null); + configuration.serialization = Serialization.DEFAULT(); RmiTest.register(configuration.serialization); - configuration.serialization.registerRmi(TestCow.class); - try { final Client client = new Client(configuration); diff --git a/test/dorkbox/network/rmi/multiJVM/TestServer.java b/test/dorkbox/network/rmi/multiJVM/TestServer.java index b9bbf2dd..20e616f8 100644 --- a/test/dorkbox/network/rmi/multiJVM/TestServer.java +++ b/test/dorkbox/network/rmi/multiJVM/TestServer.java @@ -21,8 +21,9 @@ class TestServer configuration.tcpPort = 2000; configuration.udpPort = 2001; - configuration.serialization = Serialization.DEFAULT(true, true, false, null); + configuration.serialization = Serialization.DEFAULT(); RmiTest.register(configuration.serialization); + configuration.serialization.registerRmi(TestCow.class, TestCowImpl.class); Server server = null;