Skip to content

[JavaTypeSystem] Enable resolving generic types on declaring types. #916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2021
Merged

[JavaTypeSystem] Enable resolving generic types on declaring types. #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaTypeModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
2 changes: 1 addition & 1 deletion tests/Java.Interop.Tools.JavaTypeSystem-Tests/Java.Interop.Tools.JavaTypeSystem-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
49 changes: 49 additions & 0 deletions tests/Java.Interop.Tools.JavaTypeSystem-Tests/JavaTypeCollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
}