Skip to content
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

Jump to bottom

[Java.Interop] Typemap support for JavaObject & [JniTypeSignature] #1181

Merged
merged 7 commits into from
Feb 2, 2024
Merged

[Java.Interop] Typemap support for JavaObject & [JniTypeSignature] #1181

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b9aa5f7
[Java.Interop] Typemap support for JavaObject & `[JniTypeSignature]`
jonpryor Jan 24, 2024
6b3637d
Avoid multiple java/lang/Object bindings.
jonpryor Jan 25, 2024
3e583fe
Merge remote-tracking branch 'origin/main' into dev/jonp/ji-typemap-s…
jonpryor Jan 26, 2024
18a7e02
Add [JniTypeSignature] to `GenericHolder<T>`.
jonpryor Jan 29, 2024
5965317
Update Java package name for consistency.
jonpryor Jan 30, 2024
1af1d9a
Ensure that `Java.Interop-Tests.csproj` builds `jcw-gen.csproj` first.
jonpryor Jan 31, 2024
7a3fd0c
Update JavaObjectTest.cs
jonpryor Feb 2, 2024
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
2 changes: 1 addition & 1 deletion src/Java.Interop.Dynamic/Java.Interop.Dynamic/JavaInstanceProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

namespace Java.Interop.Dynamic {

[JniTypeSignature ("java/lang/Object")]
[JniTypeSignature ("java/lang/Object", GenerateJavaPeer=false)]
class JavaInstanceProxy : JavaObject {

public JavaInstanceProxy (ref JniObjectReference reference, JniObjectReferenceOptions transfer)
Expand Down
19 changes: 19 additions & 0 deletions src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil/TypeDefinitionRocks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,25 @@ public static bool IsSubclassOf (this TypeDefinition type, string typeName, IMet
return false;
}

public static bool HasJavaPeer (this TypeDefinition type, IMetadataResolver resolver)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the idea we'd call this same method from xamarin-android as well?

So we don't have duplicate of this logic running around:

https://github.com/xamarin/xamarin-android/blob/2cbb5c98ebed30283d89e8434210415d4d5e9ded/src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs#L80

{
if (type.IsInterface && type.ImplementsInterface ("Java.Interop.IJavaPeerable", resolver))
return true;

foreach (var t in type.GetTypeAndBaseTypes (resolver)) {
switch (t.FullName) {
case "Java.Lang.Object":
case "Java.Lang.Throwable":
case "Java.Interop.JavaObject":
case "Java.Interop.JavaException":
return true;
default:
break;
}
}
return false;
}

[Obsolete ("Use the TypeDefinitionCache overload for better performance.", error: true)]
public static bool ImplementsInterface (this TypeDefinition type, string interfaceName) => throw new NotSupportedException ();

Expand Down
2 changes: 1 addition & 1 deletion ...aCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ void AddNestedTypes (TypeDefinition type)
}
children = children ?? new List<JavaCallableWrapperGenerator> ();
foreach (TypeDefinition nt in type.NestedTypes) {
if (!nt.IsSubclassOf ("Java.Lang.Object", cache))
if (!nt.HasJavaPeer (cache))
continue;
if (!JavaNativeTypeManager.IsNonStaticInnerClass (nt, cache))
continue;
Expand Down
5 changes: 1 addition & 4 deletions ...rop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ public List<TypeDefinition> GetJavaTypes (AssemblyDefinition assembly)

void AddJavaTypes (List<TypeDefinition> javaTypes, TypeDefinition type)
{
if (type.IsSubclassOf ("Java.Lang.Object", cache) ||
type.IsSubclassOf ("Java.Lang.Throwable", cache) ||
(type.IsInterface && type.ImplementsInterface ("Java.Interop.IJavaPeerable", cache))) {
// For subclasses of e.g. Android.App.Activity.
if (type.HasJavaPeer (cache)) {
javaTypes.Add (type);
} else if (type.IsClass && !type.IsSubclassOf ("System.Exception", cache) && type.ImplementsInterface ("Android.Runtime.IJavaObject", cache)) {
var level = ErrorOnCustomJavaObject ? TraceLevel.Error : TraceLevel.Warning;
Expand Down
2 changes: 1 addition & 1 deletion ...terop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ internal static bool IsNonStaticInnerClass (TypeDefinition? type, IMetadataResol
if (!type.IsNested)
return false;

if (!type.DeclaringType.IsSubclassOf ("Java.Lang.Object", cache))
if (!type.DeclaringType.HasJavaPeer (cache))
return false;

foreach (var baseType in type.GetBaseTypes (cache)) {
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop/Java.Interop/JavaException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Java.Interop
{
[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
unsafe public class JavaException : Exception, IJavaPeerable
{
internal const string JniTypeName = "java/lang/Throwable";
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop/Java.Interop/JavaObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Java.Interop
{
[JniTypeSignature ("java/lang/Object")]
[JniTypeSignature ("java/lang/Object", GenerateJavaPeer=false)]
unsafe public class JavaObject : IJavaPeerable
{
readonly static JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (JavaObject));
Expand Down
16 changes: 8 additions & 8 deletions src/Java.Interop/Java.Interop/JavaPrimitiveArrays.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ protected override unsafe void Synchronize (JniReleaseArrayElementsMode releaseM
}
}

[JniTypeSignature ("Z", ArrayRank=1, IsKeyword=true)]
[JniTypeSignature ("Z", ArrayRank=1, IsKeyword=true, GenerateJavaPeer=false)]
public sealed class JavaBooleanArray : JavaPrimitiveArray<Boolean> {

internal static readonly ValueMarshaler ArrayMarshaler = new ValueMarshaler ();
Expand Down Expand Up @@ -337,7 +337,7 @@ protected override unsafe void Synchronize (JniReleaseArrayElementsMode releaseM
}
}

[JniTypeSignature ("B", ArrayRank=1, IsKeyword=true)]
[JniTypeSignature ("B", ArrayRank=1, IsKeyword=true, GenerateJavaPeer=false)]
public sealed class JavaSByteArray : JavaPrimitiveArray<SByte> {

internal static readonly ValueMarshaler ArrayMarshaler = new ValueMarshaler ();
Expand Down Expand Up @@ -532,7 +532,7 @@ protected override unsafe void Synchronize (JniReleaseArrayElementsMode releaseM
}
}

[JniTypeSignature ("C", ArrayRank=1, IsKeyword=true)]
[JniTypeSignature ("C", ArrayRank=1, IsKeyword=true, GenerateJavaPeer=false)]
public sealed class JavaCharArray : JavaPrimitiveArray<Char> {

internal static readonly ValueMarshaler ArrayMarshaler = new ValueMarshaler ();
Expand Down Expand Up @@ -727,7 +727,7 @@ protected override unsafe void Synchronize (JniReleaseArrayElementsMode releaseM
}
}

[JniTypeSignature ("S", ArrayRank=1, IsKeyword=true)]
[JniTypeSignature ("S", ArrayRank=1, IsKeyword=true, GenerateJavaPeer=false)]
public sealed class JavaInt16Array : JavaPrimitiveArray<Int16> {

internal static readonly ValueMarshaler ArrayMarshaler = new ValueMarshaler ();
Expand Down Expand Up @@ -922,7 +922,7 @@ protected override unsafe void Synchronize (JniReleaseArrayElementsMode releaseM
}
}

[JniTypeSignature ("I", ArrayRank=1, IsKeyword=true)]
[JniTypeSignature ("I", ArrayRank=1, IsKeyword=true, GenerateJavaPeer=false)]
public sealed class JavaInt32Array : JavaPrimitiveArray<Int32> {

internal static readonly ValueMarshaler ArrayMarshaler = new ValueMarshaler ();
Expand Down Expand Up @@ -1117,7 +1117,7 @@ protected override unsafe void Synchronize (JniReleaseArrayElementsMode releaseM
}
}

[JniTypeSignature ("J", ArrayRank=1, IsKeyword=true)]
[JniTypeSignature ("J", ArrayRank=1, IsKeyword=true, GenerateJavaPeer=false)]
public sealed class JavaInt64Array : JavaPrimitiveArray<Int64> {

internal static readonly ValueMarshaler ArrayMarshaler = new ValueMarshaler ();
Expand Down Expand Up @@ -1312,7 +1312,7 @@ protected override unsafe void Synchronize (JniReleaseArrayElementsMode releaseM
}
}

[JniTypeSignature ("F", ArrayRank=1, IsKeyword=true)]
[JniTypeSignature ("F", ArrayRank=1, IsKeyword=true, GenerateJavaPeer=false)]
public sealed class JavaSingleArray : JavaPrimitiveArray<Single> {

internal static readonly ValueMarshaler ArrayMarshaler = new ValueMarshaler ();
Expand Down Expand Up @@ -1507,7 +1507,7 @@ protected override unsafe void Synchronize (JniReleaseArrayElementsMode releaseM
}
}

[JniTypeSignature ("D", ArrayRank=1, IsKeyword=true)]
[JniTypeSignature ("D", ArrayRank=1, IsKeyword=true, GenerateJavaPeer=false)]
public sealed class JavaDoubleArray : JavaPrimitiveArray<Double> {

internal static readonly ValueMarshaler ArrayMarshaler = new ValueMarshaler ();
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop/Java.Interop/JavaPrimitiveArrays.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ namespace Java.Interop {
}
}

[JniTypeSignature ("<#= info.JniType #>", ArrayRank=1, IsKeyword=true)]
[JniTypeSignature ("<#= info.JniType #>", ArrayRank=1, IsKeyword=true, GenerateJavaPeer=false)]
public sealed class Java<#= info.TypeModifier #>Array : JavaPrimitiveArray<<#= info.ManagedType #>> {

internal static readonly ValueMarshaler ArrayMarshaler = new ValueMarshaler ();
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop/Java.Interop/JavaProxyObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Java.Interop {

[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
sealed class JavaProxyObject : JavaObject, IEquatable<JavaProxyObject>
{
internal const string JniTypeName = "net/dot/jni/internal/JavaProxyObject";
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop/Java.Interop/JavaProxyThrowable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Java.Interop {

[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
sealed class JavaProxyThrowable : JavaException
{
new internal const string JniTypeName = "net/dot/jni/internal/JavaProxyThrowable";
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop/Java.Interop/ManagedPeer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

namespace Java.Interop {

[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
/* static */ sealed class ManagedPeer : JavaObject {

internal const string JniTypeName = "net/dot/jni/ManagedPeer";
Expand Down
2 changes: 1 addition & 1 deletion tests/Java.Interop-PerformanceTests/Java.Interop/JavaTiming.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Java.Interop.PerformanceTests
{
[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
public class JavaTiming : JavaObject
{
protected const string JniTypeName = "com/xamarin/interop/performance/JavaTiming";
Expand Down
2 changes: 1 addition & 1 deletion tests/Java.Interop-Tests/Java.Interop/CallNonvirtualBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Java.InteropTests
{
[JniTypeSignature (CallNonvirtualBase.JniTypeName)]
[JniTypeSignature (CallNonvirtualBase.JniTypeName, GenerateJavaPeer=false)]
public class CallNonvirtualBase : JavaObject
{
internal const string JniTypeName = "net/dot/jni/test/CallNonvirtualBase";
Expand Down
2 changes: 1 addition & 1 deletion tests/Java.Interop-Tests/Java.Interop/CallNonvirtualDerived.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Java.InteropTests
{
[JniTypeSignature (CallNonvirtualDerived.JniTypeName)]
[JniTypeSignature (CallNonvirtualDerived.JniTypeName, GenerateJavaPeer=false)]
public class CallNonvirtualDerived : CallNonvirtualBase
{
internal new const string JniTypeName = "net/dot/jni/test/CallNonvirtualDerived";
Expand Down
2 changes: 1 addition & 1 deletion tests/Java.Interop-Tests/Java.Interop/CallNonvirtualDerived2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Java.InteropTests
{
[JniTypeSignature (CallNonvirtualDerived2.JniTypeName)]
[JniTypeSignature (CallNonvirtualDerived2.JniTypeName, GenerateJavaPeer=false)]
public class CallNonvirtualDerived2 : CallNonvirtualDerived
{
internal new const string JniTypeName = "net/dot/jni/test/CallNonvirtualDerived2";
Expand Down
2 changes: 1 addition & 1 deletion tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Java.InteropTests {

[JniTypeSignature (CallVirtualFromConstructorBase.JniTypeName)]
[JniTypeSignature (CallVirtualFromConstructorBase.JniTypeName, GenerateJavaPeer=false)]
public class CallVirtualFromConstructorBase : JavaObject {

internal const string JniTypeName = "net/dot/jni/test/CallVirtualFromConstructorBase";
Expand Down
2 changes: 1 addition & 1 deletion tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Java.InteropTests
{
[JniTypeSignature (CallVirtualFromConstructorDerived.JniTypeName)]
[JniTypeSignature (CallVirtualFromConstructorDerived.JniTypeName, GenerateJavaPeer=false)]
public class CallVirtualFromConstructorDerived : CallVirtualFromConstructorBase {
new internal const string JniTypeName = "net/dot/jni/test/CallVirtualFromConstructorDerived";
static readonly JniPeerMembers _members = new JniPeerMembers (JniTypeName, typeof (CallVirtualFromConstructorDerived));
Expand Down
2 changes: 1 addition & 1 deletion tests/Java.Interop-Tests/Java.Interop/GetThis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Java.InteropTests
{
[JniTypeSignature (GetThis.JniTypeName)]
[JniTypeSignature (GetThis.JniTypeName, GenerateJavaPeer=false)]
public class GetThis : JavaObject
{
internal const string JniTypeName = "net/dot/jni/test/GetThis";
Expand Down
2 changes: 1 addition & 1 deletion tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static void SetupLinks (JavaObjectArray<CrossReferenceBridge> array, out WeakRef
}
}

[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
public class CrossReferenceBridge : JavaObject {
internal const string JniTypeName = "net/dot/jni/test/CrossReferenceBridge";

Expand Down
6 changes: 3 additions & 3 deletions tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,12 +204,12 @@ public void DisposeAccessesThis ()
class JavaObjectWithNoJavaPeer : JavaObject {
}

[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
class JavaObjectWithMissingJavaPeer : JavaObject {
internal const string JniTypeName = "__this__/__type__/__had__/__better__/__not__/__Exist__";
}

[JniTypeSignature ("java/lang/Object")]
[JniTypeSignature ("java/lang/Object", GenerateJavaPeer=false)]
class JavaDisposedObject : JavaObject {

public Action OnDisposed;
Expand All @@ -230,7 +230,7 @@ protected override void Dispose (bool disposing)
}
}

[JniTypeSignature ("java/lang/Object")]
[JniTypeSignature ("java/lang/Object", GenerateJavaPeer=false)]
class MyDisposableObject : JavaObject {
bool _isDisposed;

Expand Down
12 changes: 6 additions & 6 deletions tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void DesugarInterfaceStaticMethod ()
#endif // NET
}

[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
class MyString : JavaObject {
internal const string JniTypeName = "java/lang/String";

Expand All @@ -182,7 +182,7 @@ public unsafe MyString (string value)
}


[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
class JavaLangRemappingTestObject : JavaObject {
internal const string JniTypeName = "java/lang/Object";
static readonly JniPeerMembers _members = new JniPeerMembers (JniTypeName, typeof (JavaLangRemappingTestObject));
Expand Down Expand Up @@ -210,7 +210,7 @@ public unsafe int remappedToStaticHashCode ()
}
}

[JniTypeSignature (JavaLangRemappingTestRuntime.JniTypeName)]
[JniTypeSignature (JavaLangRemappingTestRuntime.JniTypeName, GenerateJavaPeer=false)]
internal class JavaLangRemappingTestRuntime : JavaObject {
internal const string JniTypeName = "java/lang/Runtime";
static readonly JniPeerMembers _members = new JniPeerMembers (JniTypeName, typeof (JavaLangRemappingTestRuntime));
Expand All @@ -228,7 +228,7 @@ public static unsafe void doesNotExist ()
}
}

[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
class RenameClassBase : JavaObject {
internal const string JniTypeName = "net/dot/jni/test/RenameClassBase1";
static readonly JniPeerMembers _members = new JniPeerMembers (JniTypeName, typeof (RenameClassBase));
Expand All @@ -246,7 +246,7 @@ public virtual unsafe int hashCode ()
}
}

[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
class RenameClassDerived : RenameClassBase {
internal new const string JniTypeName = "net/dot/jni/test/RenameClassDerived";
public RenameClassDerived ()
Expand All @@ -260,7 +260,7 @@ public override unsafe int hashCode ()
}

#if NET
[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
interface IAndroidInterface : IJavaPeerable {
internal const string JniTypeName = "net/dot/jni/test/AndroidInterface";

Expand Down
2 changes: 1 addition & 1 deletion tests/Java.Interop-Tests/Java.Interop/TestType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace Java.InteropTests
{
#if !NO_MARSHAL_MEMBER_BUILDER_SUPPORT
[JniTypeSignature (TestType.JniTypeName)]
[JniTypeSignature (TestType.JniTypeName, GenerateJavaPeer=false)]
public partial class TestType : JavaObject
{
internal const string JniTypeName = "net/dot/jni/test/TestType";
Expand Down
2 changes: 1 addition & 1 deletion tests/Java.Interop.Export-Tests/Java.Interop/ExportTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ long p

namespace Java.InteropTests
{
[JniTypeSignature (JniTypeName)]
[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
public class ExportTest : JavaObject
{
internal const string JniTypeName = "net/dot/jni/test/ExportType";
Expand Down