Second pass on typing + fixes

Author: tcalmant

javaobj/v2/api.py

@@ -62,7 +62,7 @@ def create_instance(self, classdesc):
         """
         return None
 
-    def load_array(self, reader, field_type, size):
+    def load_array(self, reader, type_code, size):
         # type: (DataStreamReader, TypeCode, int) -> Optional[list]
         """
         Loads and returns the content of a Java array, if possible.
@@ -74,7 +74,7 @@ def load_array(self, reader, field_type, size):
         This method must return None if it can't handle the array.
 
         :param reader: The data stream reader
-        :param field_type: Type of the elements of the array
+        :param type_code: Type of the elements of the array
         :param size: Number of elements in the array
         """
         return None

javaobj/v2/beans.py

@@ -97,6 +97,9 @@ class FieldType(IntEnum):
     ARRAY = TypeCode.TYPE_ARRAY.value
     OBJECT = TypeCode.TYPE_OBJECT.value
 
+    def type_code(self) -> TypeCode:
+        return TypeCode(self.value)
+
 
 class ParsedJavaContent(object):
     """

javaobj/v2/core.py

@@ -100,7 +100,7 @@ def __init__(self, fd, transformers):
         self.__handles = {}  # type: Dict[int, ParsedJavaContent]
 
         # Initial handle value
-        self.__current_handle = StreamConstants.BASE_REFERENCE_IDX
+        self.__current_handle = StreamConstants.BASE_REFERENCE_IDX.value
 
         # Definition of the type code handlers
         # Each takes the type code as argument
@@ -663,7 +663,7 @@ def _do_array(self, type_code):
 
         # Array content
         for transformer in self.__transformers:
-            content = transformer.load_array(self.__reader, field_type, size)
+            content = transformer.load_array(self.__reader, field_type.type_code(), size)
             if content is not None:
                 break
         else:

javaobj/v2/transformers.py

@@ -25,7 +25,7 @@
 """
 
 # Standard library
-from typing import List, Optional, Tuple
+from typing import List, Optional, Tuple, Union
 import functools
 
 # Numpy (optional)
@@ -37,7 +37,7 @@
 
 # Javaobj
 from .api import ObjectTransformer
-from .beans import JavaInstance, JavaClassDesc
+from .beans import JavaInstance, JavaClassDesc, FieldType
 from ..constants import TerminalCode, TypeCode
 from ..utils import to_bytes, log_error, log_debug, read_struct, read_string
 
@@ -238,7 +238,7 @@ def load_from_instance(self, indent=0):
         """
         # Lists have their content in there annotations
         for cd, annotations in self.annotations.items():
-            if cd.name == self.HANDLED_CLASSES:
+            if cd.name in self.HANDLED_CLASSES:
                 # Annotation[1] == size of the set
                 self.update(x for x in annotations[2:])
                 return True
@@ -254,7 +254,7 @@ class JavaTime(JavaInstance):
     parsed
     """
 
-    HANDLED_CLASSES = "java.time.Ser"
+    HANDLED_CLASSES = ("java.time.Ser",)  # type: Tuple[str, ...]
 
     DURATION_TYPE = 1
     INSTANT_TYPE = 2
@@ -322,7 +322,7 @@ def load_from_instance(self, indent=0):
         """
         # Lists have their content in there annotations
         for cd, annotations in self.annotations.items():
-            if cd.name == self.HANDLED_CLASSES:
+            if cd.name in self.HANDLED_CLASSES:
                 # Convert back annotations to bytes
                 # latin-1 is used to ensure that bytes are kept as is
                 content = to_bytes(annotations[0].data, "latin1")
@@ -495,14 +495,14 @@ class NumpyArrayTransformer(ObjectTransformer):
         TypeCode.TYPE_BOOLEAN: ">B",
     }
 
-    def load_array(self, reader, field_type, size):
+    def load_array(self, reader, type_code, size):
         # type: (DataStreamReader, TypeCode, int) -> Optional[list]
         """
         Loads a Java array, if possible
         """
         if numpy is not None:
             try:
-                dtype = self.NUMPY_TYPE_MAP[field_type]
+                dtype = self.NUMPY_TYPE_MAP[type_code]
             except KeyError:
                 # Unhandled data type
                 return None