From b9393d2edd17d2a920b06cdd8ba6894c6d272ecd Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Mon, 15 Nov 2021 15:49:49 -0600
Subject: [PATCH] [JavaTypeSystem] Enable resolving generic types on declaring
 types.

---
 .../JavaModels/JavaTypeModel.cs               | 10 ++--
 ....Interop.Tools.JavaTypeSystem-Tests.csproj |  2 +-
 .../JavaTypeCollectionTests.cs                | 49 +++++++++++++++++++
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaTypeModel.cs b/src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaTypeModel.cs
index ce4eba975..2049742c2 100644
--- a/src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaTypeModel.cs
+++ b/src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaTypeModel.cs
@@ -106,13 +106,9 @@ public IEnumerable<JavaTypeParameter> GetApplicableTypeParameters ()
 			foreach (var jtp in TypeParameters)
 				yield return jtp;
 
-			yield break;
-
-			// TODO, this is more correct, but disabled for ApiXmlAdjuster compatibility.
-			// https://github.com/xamarin/java.interop/issues/815
-			//if (DeclaringType != null)
-			//	foreach (var jtp in DeclaringType.GetApplicableTypeParameters ())
-			//		yield return jtp;
+			if (DeclaringType != null)
+				foreach (var jtp in DeclaringType.GetApplicableTypeParameters ())
+					yield return jtp;
 		}
 	}
 }
diff --git a/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj b/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj
index 016f5d578..f9b6b103f 100644
--- a/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj
+++ b/tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <RootNamespace>Java.Interop.Tools.JavaTypeSystem.Tests</RootNamespace>
   </PropertyGroup>
diff --git a/tests/Java.Interop.Tools.JavaTypeSystem-Tests/JavaTypeCollectionTests.cs b/tests/Java.Interop.Tools.JavaTypeSystem-Tests/JavaTypeCollectionTests.cs
index bb190e3af..913aae904 100644
--- a/tests/Java.Interop.Tools.JavaTypeSystem-Tests/JavaTypeCollectionTests.cs
+++ b/tests/Java.Interop.Tools.JavaTypeSystem-Tests/JavaTypeCollectionTests.cs
@@ -73,5 +73,54 @@ public void IntentServiceHack ()
 			Assert.AreSame (new_intent_service, api.FindType ("mono.android.app.IntentService"));
 			Assert.AreSame (new_intent_service, api.FindType ("android.app.IntentService"));
 		}
+
+		[Test]
+		public void InheritedGenericTypeParameters ()
+		{
+			// Ensure we can resolve generic type parameters from parent types:
+			// public class MyClass<T>
+			// {
+			//     public class MyNestedClass<U>
+			//     {
+			//       public void DoT (T value) { }
+			//       public void DoU (U value) { }
+			//     }
+			// }
+			var xml = @"
+<api api-source='class-parse'>
+   <package name='example' jni-name='example'>
+      <class abstract='false' deprecated='not deprecated' jni-extends='Ljava/lang/Object;' extends='java.lang.Object' extends-generic-aware='java.lang.Object' final='false' name='MyClass' jni-signature='Lexample/MyClass;' source-file-name='MyClass.java' static='false' visibility='public'>
+         <typeParameters>
+            <typeParameter name='T' jni-classBound='Ljava/lang/Object;' classBound='java.lang.Object' interfaceBounds='' jni-interfaceBounds='' />
+         </typeParameters>
+         <constructor deprecated='not deprecated' final='false' name='MyClass' static='false' visibility='public' bridge='false' synthetic='false' jni-signature='()V' />
+      </class>
+      <class abstract='false' deprecated='not deprecated' jni-extends='Ljava/lang/Object;' extends='java.lang.Object' extends-generic-aware='java.lang.Object' final='false' name='MyClass.MyNestedClass' jni-signature='Lexample/MyClass$MyNestedClass;' source-file-name='MyClass.java' static='false' visibility='public'>
+         <typeParameters>
+            <typeParameter name='U' jni-classBound='Ljava/lang/Object;' classBound='java.lang.Object' interfaceBounds='' jni-interfaceBounds='' />
+         </typeParameters>
+         <constructor deprecated='not deprecated' final='false' name='MyClass.MyNestedClass' static='false' visibility='public' bridge='false' synthetic='false' jni-signature='(Lexample/MyClass;)V' />
+         <method abstract='false' deprecated='not deprecated' final='false' name='DoT' native='false' return='void' jni-return='V' static='false' synchronized='false' visibility='public' bridge='false' synthetic='false' jni-signature='(Ljava/lang/Object;)V'>
+            <parameter name='p0' type='T' jni-type='TT;' />
+         </method>
+         <method abstract='false' deprecated='not deprecated' final='false' name='DoU' native='false' return='void' jni-return='V' static='false' synchronized='false' visibility='public' bridge='false' synthetic='false' jni-signature='(Ljava/lang/Object;)V'>
+            <parameter name='p0' type='U' jni-type='TU;' />
+         </method>
+      </class>
+   </package>
+</api>";
+
+			var xapi = JavaApiTestHelper.GetLoadedApi ();
+			JavaXmlApiImporter.ParseString (xml, xapi);
+
+			var results = xapi.ResolveCollection ();
+
+			var t = xapi.Packages ["example"].Types.First (_ => _.Name == "MyClass").NestedTypes.First (_ => _.Name == "MyNestedClass") as JavaClassModel;
+
+			Assert.AreEqual (2, t.Methods.Count);
+
+			Assert.IsNotNull (t.Methods.SingleOrDefault (m => m.Name == "DoT"), "Method with generic T not found");
+			Assert.IsNotNull (t.Methods.SingleOrDefault (m => m.Name == "DoU"), "Method with generic U not found");
+		}
 	}
 }