From c2d6f6603047404063dd6f5378fbe0f1cad0304e Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 17 Jan 2018 21:26:07 +0100 Subject: [PATCH] Moved pipeline RMI files into rmi package --- .../local/RegistrationLocalHandler.java | 4 ++-- .../pipeline/{ => rmi}/LocalRmiClassEncoder.java | 9 ++++++++- .../pipeline/{ => rmi}/LocalRmiDecoder.java | 14 ++++++++++---- .../pipeline/{ => rmi}/LocalRmiEncoder.java | 5 ++++- .../network/pipeline/{ => rmi}/RmiFieldCache.java | 5 ++++- 5 files changed, 28 insertions(+), 9 deletions(-) rename src/dorkbox/network/pipeline/{ => rmi}/LocalRmiClassEncoder.java (84%) rename src/dorkbox/network/pipeline/{ => rmi}/LocalRmiDecoder.java (86%) rename src/dorkbox/network/pipeline/{ => rmi}/LocalRmiEncoder.java (98%) rename src/dorkbox/network/pipeline/{ => rmi}/RmiFieldCache.java (96%) diff --git a/src/dorkbox/network/connection/registration/local/RegistrationLocalHandler.java b/src/dorkbox/network/connection/registration/local/RegistrationLocalHandler.java index 3058ec08..7abae3b7 100644 --- a/src/dorkbox/network/connection/registration/local/RegistrationLocalHandler.java +++ b/src/dorkbox/network/connection/registration/local/RegistrationLocalHandler.java @@ -21,8 +21,8 @@ import dorkbox.network.connection.Connection; import dorkbox.network.connection.RegistrationWrapper; import dorkbox.network.connection.registration.MetaChannel; import dorkbox.network.connection.registration.RegistrationHandler; -import dorkbox.network.pipeline.LocalRmiDecoder; -import dorkbox.network.pipeline.LocalRmiEncoder; +import dorkbox.network.pipeline.rmi.LocalRmiDecoder; +import dorkbox.network.pipeline.rmi.LocalRmiEncoder; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/src/dorkbox/network/pipeline/LocalRmiClassEncoder.java b/src/dorkbox/network/pipeline/rmi/LocalRmiClassEncoder.java similarity index 84% rename from src/dorkbox/network/pipeline/LocalRmiClassEncoder.java rename to src/dorkbox/network/pipeline/rmi/LocalRmiClassEncoder.java index 7014f429..23b97e44 100644 --- a/src/dorkbox/network/pipeline/LocalRmiClassEncoder.java +++ b/src/dorkbox/network/pipeline/rmi/LocalRmiClassEncoder.java @@ -13,11 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.network.pipeline; +package dorkbox.network.pipeline.rmi; +/** + * This is for a LOCAL connection (same-JVM) + */ class LocalRmiClassEncoder { public Object rmiObject; // these are the "in order" rmi ID's for the fields of 'rmiObject' public int[] rmiFieldIds; + + public + LocalRmiClassEncoder() { + } } diff --git a/src/dorkbox/network/pipeline/LocalRmiDecoder.java b/src/dorkbox/network/pipeline/rmi/LocalRmiDecoder.java similarity index 86% rename from src/dorkbox/network/pipeline/LocalRmiDecoder.java rename to src/dorkbox/network/pipeline/rmi/LocalRmiDecoder.java index 3fe2dcee..905a00cf 100644 --- a/src/dorkbox/network/pipeline/LocalRmiDecoder.java +++ b/src/dorkbox/network/pipeline/rmi/LocalRmiDecoder.java @@ -13,16 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.network.pipeline; +package dorkbox.network.pipeline.rmi; import java.lang.reflect.Field; import java.util.List; import dorkbox.network.connection.ConnectionImpl; import dorkbox.network.rmi.RemoteObject; +import dorkbox.network.serialization.CryptoSerializationManager; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; +/** + * This is for a LOCAL connection (same-JVM) + */ public class LocalRmiDecoder extends MessageToMessageDecoder { @@ -69,9 +73,11 @@ class LocalRmiDecoder extends MessageToMessageDecoder { } - final Class iface = connection.getEndPoint() - .getSerialization() - .getRmiIface(localRmiObject.getClass()); + CryptoSerializationManager serialization = connection.getEndPoint() + .getSerialization(); + + // TODO: see what's up with this. + final Class iface = serialization.getRmiIface(localRmiObject.getClass()); if (iface == null) { throw new RuntimeException("Unable to get interface for RMI implementation"); } diff --git a/src/dorkbox/network/pipeline/LocalRmiEncoder.java b/src/dorkbox/network/pipeline/rmi/LocalRmiEncoder.java similarity index 98% rename from src/dorkbox/network/pipeline/LocalRmiEncoder.java rename to src/dorkbox/network/pipeline/rmi/LocalRmiEncoder.java index c970e221..de6c77c0 100644 --- a/src/dorkbox/network/pipeline/LocalRmiEncoder.java +++ b/src/dorkbox/network/pipeline/rmi/LocalRmiEncoder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.network.pipeline; +package dorkbox.network.pipeline.rmi; import java.lang.reflect.Field; import java.util.List; @@ -29,6 +29,9 @@ import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageEncoder; +/** + * This is for a LOCAL connection (same-JVM) + */ @Sharable public class LocalRmiEncoder extends MessageToMessageEncoder { diff --git a/src/dorkbox/network/pipeline/RmiFieldCache.java b/src/dorkbox/network/pipeline/rmi/RmiFieldCache.java similarity index 96% rename from src/dorkbox/network/pipeline/RmiFieldCache.java rename to src/dorkbox/network/pipeline/rmi/RmiFieldCache.java index 937cb33c..cbd72d78 100644 --- a/src/dorkbox/network/pipeline/RmiFieldCache.java +++ b/src/dorkbox/network/pipeline/rmi/RmiFieldCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dorkbox.network.pipeline; +package dorkbox.network.pipeline.rmi; import java.lang.reflect.Field; import java.util.ArrayList; @@ -25,6 +25,9 @@ import dorkbox.network.rmi.Rmi; /** * Uses the "single writer principle" for fast access, but disregards 'single writer', because duplicates are OK + * + * This is for a LOCAL connection (same-JVM) + * */ class RmiFieldCache { private volatile IdentityMap, Field[]> fieldCache = new IdentityMap, Field[]>();