Native deserializer manages both native type and Java type (#250)

masesgroup · Oct 5, 2023 · 1cd6321 · 1cd6321
1 parent 71641b5
commit 1cd6321
Showing 1 changed file with 30 additions and 5 deletions.
diff --git a/src/net/KNet/Specific/Serialization/KNetSerialization.cs b/src/net/KNet/Specific/Serialization/KNetSerialization.cs
@@ -272,7 +272,12 @@ public static Bytes DeserializeBytes(string topic, byte[] data)
         /// </summary>
         public static double DeserializeDouble(string topic, byte[] data)
         {
-            return JVMBridgeBase.Wraps<Java.Lang.Double>(_DoubleDeserializer.Deserialize(topic, data) as IJavaObject);
+            var result = _DoubleDeserializer.Deserialize(topic, data);
+            if (result is IJavaObject ijo)
+            {
+                return JVMBridgeBase.Wraps<Java.Lang.Double>(ijo);
+            }
+            return (double)result;
         }
 
         static readonly FloatDeserializer _FloatDeserializer = new FloatDeserializer();
@@ -281,7 +286,12 @@ public static double DeserializeDouble(string topic, byte[] data)
         /// </summary>
         public static float DeserializeFloat(string topic, byte[] data)
         {
-            return JVMBridgeBase.Wraps<Java.Lang.Float>(_FloatDeserializer.Deserialize(topic, data) as IJavaObject);
+            var result = _FloatDeserializer.Deserialize(topic, data);
+            if (result is IJavaObject ijo)
+            {
+                return JVMBridgeBase.Wraps<Java.Lang.Float>(ijo);
+            }
+            return (float)result;
         }
 
         static readonly IntegerDeserializer _IntDeserializer = new IntegerDeserializer();
@@ -290,7 +300,12 @@ public static float DeserializeFloat(string topic, byte[] data)
         /// </summary>
         public static int DeserializeInt(string topic, byte[] data)
         {
-            return JVMBridgeBase.Wraps<Java.Lang.Integer>(_IntDeserializer.Deserialize(topic, data) as IJavaObject);
+            var result = _IntDeserializer.Deserialize(topic, data);
+            if (result is IJavaObject ijo)
+            {
+                return JVMBridgeBase.Wraps<Java.Lang.Integer>(ijo);
+            }
+            return (int)result;
 
             //if (data == null)
             //{
@@ -324,7 +339,12 @@ public static int DeserializeInt(string topic, byte[] data)
         /// </summary>
         public static long DeserializeLong(string topic, byte[] data)
         {
-            return JVMBridgeBase.Wraps<Java.Lang.Long>(_LongDeserializer.Deserialize(topic, data) as IJavaObject);
+            var result = _LongDeserializer.Deserialize(topic, data);
+            if (result is IJavaObject ijo)
+            {
+                return JVMBridgeBase.Wraps<Java.Lang.Long>(ijo);
+            }
+            return (long)result;
 
             //if (data == null)
             //{
@@ -358,7 +378,12 @@ public static long DeserializeLong(string topic, byte[] data)
         /// </summary>
         public static short DeserializeShort(string topic, byte[] data)
         {
-            return JVMBridgeBase.Wraps<Java.Lang.Short>(_ShortDeserializer.Deserialize(topic, data) as IJavaObject);
+            var result = _ShortDeserializer.Deserialize(topic, data);
+            if (result is IJavaObject ijo)
+            {
+                return JVMBridgeBase.Wraps<Java.Lang.Short>(ijo);
+            }
+            return (short)result;
 
             //if (data == null)
             //{