openrewrite-remote 0.2.7__tar.gz → 0.2.9__tar.gz

{openrewrite_remote-0.2.7 → openrewrite_remote-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openrewrite-remote
-Version: 0.2.7
+Version: 0.2.9
 Summary: Remoting functionality for the OpenRewrite library.
 License: Apache-2.0
 Author: Moderne Inc.

{openrewrite_remote-0.2.7 → openrewrite_remote-0.2.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openrewrite-remote"
-version = "0.2.7"  # This will be replaced by the GitHub Actions workflow
+version = "0.2.9"  # This will be replaced by the GitHub Actions workflow
 description = "Remoting functionality for the OpenRewrite library."
 authors = ["Moderne Inc. <support@moderne.io>"]
 license = "Apache-2.0"

{openrewrite_remote-0.2.7 → openrewrite_remote-0.2.9}/rewrite/remote/sender.py

@@ -10,7 +10,7 @@ from uuid import UUID
 import cbor2
 from cbor2 import CBOREncoder
 from rewrite import Tree, Markers, Marker, ParseErrorVisitor, Cursor
-from rewrite.remote.type_utils import to_java_type_name, to_java_field_name
+from rewrite.remote.type_utils import to_java_type_name, to_java_field_name, to_java_type_name_from_value
 from rewrite.visitor import TreeVisitor
 
 from . import remote_utils
@@ -229,7 +229,7 @@ class SenderContext(Generic[T]):
         if self.before is not None and self.are_equal(after, before):
             evt = DiffEvent(EventType.NoChange, None, None)
         elif self.before is None or before is None:
-            concrete_type = to_java_type_name(type(after)) if after is not None else None
+            concrete_type = to_java_type_name_from_value(after) if after is not None else None
             evt = DiffEvent(EventType.Add, concrete_type, after)
         elif after is None:
             evt = DiffEvent(EventType.Delete, None, None)
@@ -387,6 +387,9 @@ class DefaultValueSerializer(ValueSerializer):
                         encoder.encode_string(to_java_field_name(field))
                         context.serialize(getattr(value, field.name), None, encoder)
                 encoder.write(BREAK_MARKER)
+        elif isinstance(value, bytes):
+            # FIXME verify that this can be deserialized
+            encoder.encode(value)
         else:
             ValueSerializer.write_object_using_reflection(value, type_name, False, encoder, context)
 

{openrewrite_remote-0.2.7 → openrewrite_remote-0.2.9}/rewrite/remote/type_utils.py

@@ -1,11 +1,28 @@
 import typing
 from dataclasses import Field
 from functools import lru_cache
-from typing import Type
+from typing import Any, Type
+
+
+def to_java_type_name_from_value(v: Any) -> str:
+    if isinstance(v, bool):
+        return 'java.lang.Boolean'
+    elif isinstance(v, int):
+        bit_length = v.bit_length()
+        if  -2_147_483_648 <= v <= 2_147_483_647:
+            return 'java.lang.Integer'
+        elif -9223372036854775808 <= v <= 9223372036854775807:
+            return 'java.lang.Long'
+        else:
+            return 'java.lang.BigInteger'
+    return to_java_type_name(type(v))
 
 
 @lru_cache(maxsize=None)
 def to_java_type_name(t: typing.Type) -> str:
+    if t == bytes:
+        # FIXME can we map this somehow?
+        return None
     if t == bool:
         return 'java.lang.Boolean'
     if t == int: