fixes _read_class_data

Author: Fede A

javaobj/v2/beans.py

@@ -254,6 +254,9 @@ def __init__(self, class_desc_type):
         # The super class of this one, if any
         self.super_class = None  # type: Optional[JavaClassDesc]
 
+        # Indicates if it is a super class
+        self.is_super_class = False
+
         # List of the interfaces of the class
         self.interfaces = []  # type: List[str]
 
@@ -387,6 +390,7 @@ def __init__(self):
         self.annotations = (
             {}
         )  # type: Dict[JavaClassDesc, List[ParsedJavaContent]]
+        self.is_external_instance = False
 
     def __str__(self):
         return "[instance 0x{0:x}: type {1}]".format(

javaobj/v2/core.py

@@ -51,6 +51,7 @@
     ClassDataType,
 )
 from .stream import DataStreamReader
+from .transformers import DefaultObjectTransformer
 from ..constants import (
     ClassDescFlags,
     StreamConstants,
@@ -492,6 +493,10 @@ def _do_object(self, type_code=0):
         self._log.debug("Done reading object handle %x", handle)
         return instance
 
+    def _is_default_supported(self, class_name):
+        default_transf = [x for x in self.__transformers if isinstance(x, DefaultObjectTransformer)]
+        return len(default_transf) and class_name in default_transf[0]._type_mapper
+
     def _read_class_data(self, instance):
         # type: (JavaInstance) -> None
         """
@@ -508,12 +513,16 @@ def _read_class_data(self, instance):
             values = {}  # type: Dict[JavaField, Any]
             cd.validate()
             if cd.data_type == ClassDataType.NOWRCLASS or cd.data_type == ClassDataType.WRCLASS:
-                if cd.data_type == ClassDataType.NOWRCLASS:
+                read_custom_data = cd.data_type == ClassDataType.WRCLASS and cd.is_super_class and not self._is_default_supported(cd.name) 
+                if read_custom_data or cd.data_type == ClassDataType.WRCLASS and instance.is_external_instance:
+                    annotations[cd] = self._read_class_annotations(cd)
+                else: 
                     for field in cd.fields:
                         values[field] = self._read_field_value(field.type)
                     all_data[cd] = values
-                else:
-                    annotations[cd] = self._read_class_annotations(cd)
+
+                    if cd.data_type == ClassDataType.WRCLASS:
+                        annotations[cd] = self._read_class_annotations(cd)
             else:
                 if cd.data_type == ClassDataType.OBJECT_ANNOTATION:
                     # Call the transformer if possible

javaobj/v2/transformers.py

@@ -37,9 +37,7 @@
 
 # Javaobj
 from .api import ObjectTransformer
-from .beans import JavaClassDesc, JavaInstance
-from .core import JavaStreamParser
-from .stream import DataStreamReader
+from .beans import JavaInstance
 from ..constants import TerminalCode, TypeCode
 from ..utils import to_bytes, log_error, log_debug, read_struct, read_string