openrewrite-remote 0.2.3__tar.gz → 0.2.5__tar.gz

{openrewrite_remote-0.2.3 → openrewrite_remote-0.2.5}/PKG-INFO

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

{openrewrite_remote-0.2.3 → openrewrite_remote-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openrewrite-remote"
-version = "0.2.3"  # This will be replaced by the GitHub Actions workflow
+version = "0.2.5"  # 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.3 → openrewrite_remote-0.2.5}/rewrite/remote/remoting.py

@@ -23,7 +23,7 @@ class RemotingContext:
     _recipe_factories: Dict[str, Callable[[str, Dict[str, Any]], Recipe]] = {}
     _value_serializers: Dict[Type, ValueSerializer] = {}
     _value_deserializers: List[Tuple[Type, ValueDeserializer]] = []
-    _object_to_id_map: Dict[Any, int] = {}
+    _object_to_id_map: Dict[int, int] = {}
     _id_to_object_map: Dict[int, Any] = {}
 
     def __init__(self):
@@ -52,17 +52,17 @@ class RemotingContext:
         self._client.close()
 
     def try_get_id(self, key: Any) -> Optional[int]:
-        return self._object_to_id_map.get(key)
+        return self._object_to_id_map.get(id(key))
 
     def add(self, value: Any) -> int:
         object_id = len(self._object_to_id_map)
-        self._object_to_id_map[value] = object_id
+        self._object_to_id_map[id(value)] = object_id
         self._id_to_object_map[object_id] = value
         return object_id
 
     def add_by_id(self, key: int, value: Any) -> None:
         self._id_to_object_map[key] = value
-        self._object_to_id_map[value] = key
+        self._object_to_id_map[id(value)] = key
 
     def get_object(self, key: int) -> Optional[Any]:
         return self._id_to_object_map.get(key)

{openrewrite_remote-0.2.3 → openrewrite_remote-0.2.5}/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
+from rewrite.remote.type_utils import to_java_type_name, to_java_field_name
 from rewrite.visitor import TreeVisitor
 
 from . import remote_utils
@@ -336,7 +336,7 @@ class ValueSerializer(ABC):
 
         for field in fields(value):
             if field.name[0] == '_' and not hasattr(field.type, '__origin__') or field.type.__origin__ is not ClassVar:
-                encoder.encode_string(field.name[1:])
+                encoder.encode_string(to_java_field_name(field))
                 context.serialize(getattr(value, field.name), None, encoder)
         encoder.write(BREAK_MARKER)
 
@@ -384,7 +384,7 @@ class DefaultValueSerializer(ValueSerializer):
                 for field in fields(value):
                     if field.name[0] == '_' and not hasattr(field.type,
                                                             '__origin__') or field.type.__origin__ is not ClassVar:
-                        encoder.encode_string(field.name[1:])
+                        encoder.encode_string(to_java_field_name(field))
                         context.serialize(getattr(value, field.name), None, encoder)
                 encoder.write(BREAK_MARKER)
         else:

{openrewrite_remote-0.2.3 → openrewrite_remote-0.2.5}/rewrite/remote/type_utils.py

@@ -1,4 +1,5 @@
 import typing
+from dataclasses import Field
 from functools import lru_cache
 from typing import Type
 
@@ -41,6 +42,8 @@ def to_java_type_name(t: typing.Type) -> str:
             return 'org.openrewrite.python.tree.PyRightPadded'
         if t.__name__ == 'PyContainer':
             return 'org.openrewrite.python.tree.PyContainer'
+    if t.__module__.startswith('rewrite.python.markers'):
+        return 'org.openrewrite.python.marker.' + t.__qualname__
     if t.__module__.startswith('rewrite.python.tree'):
         return 'org.openrewrite.python.tree.Py$' + t.__qualname__.replace('.', '$')
     if t.__module__.startswith('rewrite.marker'):
@@ -56,5 +59,20 @@ def to_java_type_name(t: typing.Type) -> str:
     # raise NotImplementedError("to_java_type_name: " + str(o))
 
 
+@lru_cache(maxsize=None)
+def to_java_field_name(field: Field) -> str:
+    return __convert_snake_to_camel(field.name[1:])
+
+
+def __convert_snake_to_camel(field_name: str) -> str:
+    # Remove leading underscore
+    if field_name.startswith('_'):
+        field_name = field_name[1:]
+
+    # Convert snake case to camel case
+    components = field_name.split('_')
+    return components[0] + ''.join(x.capitalize() for x in components[1:])
+
+
 def get_type(type_name: str) -> Type:
     raise NotImplementedError("get_type for: " + type_name)