android-record: Adapt generic types returned by Android reflection to…

… follow Java behavior.
FasterXML · Sep 3, 2024 · fb007fd · fb007fd
1 parent 032b52e
commit fb007fd
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...-record/src/main/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordModule.java b/...-record/src/main/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordModule.java
@@ -154,20 +154,21 @@ static Class<?> arrayTypeCompat(Class<?> componentType) {
 
   static Type fixAndroidGenericType(Type type) {
     if (type instanceof GenericArrayType) {
-      //recurse into component type
       Type componentType = fixAndroidGenericType(((GenericArrayType) type).getGenericComponentType());
-      if (componentType instanceof Class<?>) { //if it isn't generic, return the raw array type
+      if (componentType instanceof Class<?>) {
         return arrayTypeCompat((Class<?>) componentType);
       }
     }
     else if (type instanceof ParameterizedType) {
       //if the parameterized type is not actually parameterized, deduce the raw type
       ParameterizedType parameterizedType = (ParameterizedType) type;
-      Type rawType = parameterizedType.getRawType();
-      if (rawType instanceof Class<?>) {
-        Class<?> rawComponentClass = (Class<?>) rawType;
-        if (rawComponentClass.getTypeParameters().length == 0) {
-          return rawComponentClass;
+      if (parameterizedType.getOwnerType() == null) {
+        Type rawType = parameterizedType.getRawType();
+        if (rawType instanceof Class<?>) {
+          Class<?> rawComponentClass = (Class<?>) rawType;
+          if (rawComponentClass.getTypeParameters().length == 0) {
+            return rawComponentClass;
+          }
         }
       }
     }