Split reflection-based JniTypeManager and JniValueManager behavior

samples/Hello-NativeAOTFromAndroid/JavaInteropRuntime.cs

@@ -37,11 +37,10 @@ static void init (IntPtr jnienv, IntPtr klass)
 		try {
 			var options = new JreRuntimeOptions {
 				EnvironmentPointer          = jnienv,
-				TypeManager                 = new NativeAotTypeManager (),
 				JniGlobalReferenceLogWriter = new LogcatTextWriter (AndroidLogLevel.Debug, "NativeAot:GREF"),
 				JniLocalReferenceLogWriter  = new LogcatTextWriter (AndroidLogLevel.Debug, "NativeAot:LREF"),
 			};
-			runtime = options.CreateJreVM ();
+			runtime = options.CreateJreVM (new NativeAotTypeManager ());
 		}
 		catch (Exception e) {
 			AndroidLog.Print (AndroidLogLevel.Error, "JavaInteropRuntime", $"JavaInteropRuntime.init: error: {e}");

samples/Hello-NativeAOTFromAndroid/NativeAotTypeManager.cs

@@ -8,6 +8,7 @@ partial class NativeAotTypeManager : JniRuntime.JniTypeManager {
 
 	internal const DynamicallyAccessedMemberTypes Methods = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
 	internal const DynamicallyAccessedMemberTypes MethodsAndPrivateNested = Methods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes;
+	internal const DynamicallyAccessedMemberTypes MethodsConstructors = MethodsAndPrivateNested | DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
 
 	Dictionary<string, Type> typeMappings = new () {
 		["android/app/Activity"]                = typeof (Android.App.Activity),
@@ -25,28 +26,50 @@ public override void RegisterNativeMembers (
 			Type type,
 			ReadOnlySpan<char> methods)
 	{
-		Console.WriteLine ($"# jonp: RegisterNativeMembers: nativeClass={nativeClass} type=`{type}`");
-		base.RegisterNativeMembers (nativeClass, type, methods);
+		if (!methods.IsEmpty)
+			throw new NotSupportedException ($"Could not register native members for type '{type.FullName}'.");
 	}
 
+	[Obsolete ("Use RegisterNativeMembers(JniType, Type, ReadOnlySpan<char>)")]
+	public override void RegisterNativeMembers (
+			JniType nativeClass,
+			[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
+			Type type,
+			string? methods)
+	{
+		RegisterNativeMembers (nativeClass, type, methods.AsSpan ());
+	}
 
 	protected override IEnumerable<Type> GetTypesForSimpleReference (string jniSimpleReference)
 	{
-		Console.WriteLine ($"# jonp: GetTypesForSimpleReference: jniSimpleReference=`{jniSimpleReference}`");
-		if (typeMappings.TryGetValue (jniSimpleReference, out var target)) {
-			Console.WriteLine ($"# jonp:   GetTypesForSimpleReference: jniSimpleReference=`{jniSimpleReference}` -> `{target}`");
+		var target = GetTypeForSimpleReference (jniSimpleReference);
+		if (target != null)
 			yield return target;
-		}
-		foreach (var t in base.GetTypesForSimpleReference (jniSimpleReference)) {
-			Console.WriteLine ($"# jonp:   GetTypesForSimpleReference: jniSimpleReference=`{jniSimpleReference}` -> `{t}`");
-			yield return t;
-		}
+	}
+
+	protected override string? GetSimpleReference (Type type)
+	{
+		return GetSimpleReferences (type).FirstOrDefault ();
+	}
+
+	[return: DynamicallyAccessedMembers (MethodsConstructors)]
+	protected override Type? GetTypeForSimpleReference (string jniSimpleReference)
+	{
+		return jniSimpleReference switch {
+			"android/app/Activity"                => typeof (Android.App.Activity),
+			"android/content/Context"             => typeof (Android.Content.Context),
+			"android/content/ContextWrapper"      => typeof (Android.Content.ContextWrapper),
+			"android/os/BaseBundle"               => typeof (Android.OS.BaseBundle),
+			"android/os/Bundle"                   => typeof (Android.OS.Bundle),
+			"android/view/ContextThemeWrapper"    => typeof (Android.View.ContextThemeWrapper),
+			"my/MainActivity"                     => typeof (MainActivity),
+			_                                     => null,
+		};
 	}
 
 	protected override IEnumerable<string> GetSimpleReferences (Type type)
 	{
-		return base.GetSimpleReferences (type)
-			.Concat (CreateSimpleReferencesEnumerator (type));
+		return CreateSimpleReferencesEnumerator (type);
 	}
 
 	IEnumerable<string> CreateSimpleReferencesEnumerator (Type type)
@@ -58,4 +81,56 @@ IEnumerable<string> CreateSimpleReferencesEnumerator (Type type)
 				yield return e.Key;
 		}
 	}
+
+	public override IEnumerable<Type> GetTypes (JniTypeSignature typeSignature)
+	{
+		if (!typeSignature.IsValid || typeSignature.ArrayRank != 0 || typeSignature.SimpleReference == null)
+			return [];
+		return GetTypesForSimpleReference (typeSignature.SimpleReference);
+	}
+
+	public override IEnumerable<JniRuntime.JniTypeManager.ReflectionConstructibleType> GetReflectionConstructibleTypes (JniTypeSignature typeSignature)
+	{
+		if (!typeSignature.IsValid || typeSignature.ArrayRank != 0 || typeSignature.SimpleReference == null)
+			yield break;
+		var target = GetTypeForSimpleReference (typeSignature.SimpleReference);
+		if (target != null)
+			yield return new JniRuntime.JniTypeManager.ReflectionConstructibleType (target);
+	}
+
+	protected override JniTypeSignature GetTypeSignatureCore (Type type)
+	{
+		var simpleReference = GetSimpleReferences (type).FirstOrDefault ();
+		return simpleReference == null ? default : new JniTypeSignature (simpleReference, 0, false);
+	}
+
+	protected override IEnumerable<JniTypeSignature> GetTypeSignaturesCore (Type type)
+	{
+		var signature = GetTypeSignatureCore (type);
+		if (signature.IsValid)
+			yield return signature;
+	}
+
+	[return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
+	protected override Type? GetInvokerTypeCore (
+			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
+			Type type)
+	{
+		return null;
+	}
+
+	protected override IReadOnlyList<string>? GetStaticMethodFallbackTypesCore (string jniSimpleReference)
+	{
+		return null;
+	}
+
+	protected override string? GetReplacementTypeCore (string jniSimpleReference)
+	{
+		return null;
+	}
+
+	protected override JniRuntime.ReplacementMethodInfo? GetReplacementMethodInfoCore (string jniSourceType, string jniMethodName, string jniMethodSignature)
+	{
+		return null;
+	}
 }

samples/Hello-NativeAOTFromJNI/JavaInteropRuntime.cs

@@ -28,9 +28,8 @@ static void init (IntPtr jnienv, IntPtr klass)
 		try {
 			var options = new JreRuntimeOptions {
 				EnvironmentPointer  = jnienv,
-				TypeManager             = new NativeAotTypeManager (),
 			};
-			runtime = options.CreateJreVM ();
+			runtime = options.CreateJreVM (new NativeAotTypeManager ());
 		}
 		catch (Exception e) {
 			Console.Error.WriteLine ($"JavaInteropRuntime.init: error: {e}");

samples/Hello-NativeAOTFromJNI/ManagedType.cs

@@ -3,6 +3,9 @@ namespace Example;
 using System;
 using Java.Interop;
 
+[System.Runtime.InteropServices.UnmanagedFunctionPointer (System.Runtime.InteropServices.CallingConvention.Winapi)]
+delegate IntPtr _JniMarshal_PP_L (IntPtr jnienv, IntPtr n_self);
+
 [JniTypeSignature (JniTypeName)]
 class ManagedType : Java.Lang.Object {
 	internal const string JniTypeName = "example/ManagedType";
@@ -21,9 +24,6 @@ public Java.Lang.String GetString ()
 		return new Java.Lang.String ($"Hello from C#, via Java.Interop! Value={value}");
 	}
 
-	[System.Runtime.InteropServices.UnmanagedFunctionPointer (System.Runtime.InteropServices.CallingConvention.Winapi)]
-	delegate IntPtr _JniMarshal_PP_L (IntPtr jnienv, IntPtr n_self);
-
 	static IntPtr n_GetString (IntPtr jnienv, IntPtr n_self)
 	{
 		var r_self = new JniObjectReference (n_self);
@@ -38,7 +38,7 @@ static IntPtr n_GetString (IntPtr jnienv, IntPtr n_self)
 	}
 
 	[JniAddNativeMethodRegistration]
-	static void RegisterNativeMembers (JniNativeMethodRegistrationArguments args)
+	internal static void RegisterNativeMembers (JniNativeMethodRegistrationArguments args)
 	{
 		args.AddRegistrations (new [] {
 			new JniNativeMethodRegistration ("n_GetString", "()Ljava/lang/String;", new _JniMarshal_PP_L (n_GetString)),

samples/Hello-NativeAOTFromJNI/NativeAotTypeManager.cs

@@ -1,37 +1,128 @@
 using Java.Interop;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Hello_NativeAOTFromJNI;
 
 class NativeAotTypeManager : JniRuntime.JniTypeManager {
-
-#pragma warning disable IL2026
-	Dictionary<string, Type> typeMappings = new () {
-		[Example.ManagedType.JniTypeName]   = typeof (Example.ManagedType),
-	};
-#pragma warning restore IL2026
-
+	internal const DynamicallyAccessedMemberTypes Methods = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
+	internal const DynamicallyAccessedMemberTypes MethodsAndPrivateNested = Methods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes;
+	internal const DynamicallyAccessedMemberTypes MethodsConstructors = MethodsAndPrivateNested | DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
 
 	protected override IEnumerable<Type> GetTypesForSimpleReference (string jniSimpleReference)
 	{
-		if (typeMappings.TryGetValue (jniSimpleReference, out var target))
+		var target = GetTypeForSimpleReference (jniSimpleReference);
+		if (target != null)
 			yield return target;
-		foreach (var t in base.GetTypesForSimpleReference (jniSimpleReference))
-			yield return t;
+	}
+
+	[return: DynamicallyAccessedMembers (MethodsConstructors)]
+	protected override Type? GetTypeForSimpleReference (string jniSimpleReference)
+	{
+		return jniSimpleReference switch {
+			Example.ManagedType.JniTypeName => typeof (Example.ManagedType),
+			"java/lang/Object"             => typeof (Java.Lang.Object),
+			"java/lang/String"             => typeof (Java.Lang.String),
+			_                              => null,
+		};
+	}
+
+	public override IEnumerable<Type> GetTypes (JniTypeSignature typeSignature)
+	{
+		if (!typeSignature.IsValid || typeSignature.ArrayRank != 0 || typeSignature.SimpleReference == null)
+			return [];
+		return GetTypesForSimpleReference (typeSignature.SimpleReference);
+	}
+
+	public override IEnumerable<JniRuntime.JniTypeManager.ReflectionConstructibleType> GetReflectionConstructibleTypes (JniTypeSignature typeSignature)
+	{
+		if (!typeSignature.IsValid || typeSignature.ArrayRank != 0 || typeSignature.SimpleReference == null)
+			yield break;
+		var target = GetTypeForSimpleReference (typeSignature.SimpleReference);
+		if (target != null)
+			yield return new JniRuntime.JniTypeManager.ReflectionConstructibleType (target);
 	}
 
 	protected override IEnumerable<string> GetSimpleReferences (Type type)
 	{
-		return base.GetSimpleReferences (type)
-			.Concat (CreateSimpleReferencesEnumerator (type));
+		return CreateSimpleReferencesEnumerator (type);
 	}
 
 	IEnumerable<string> CreateSimpleReferencesEnumerator (Type type)
 	{
-		if (typeMappings == null)
-			yield break;
-		foreach (var e in typeMappings) {
-			if (e.Value == type)
-				yield return e.Key;
+		if (type == typeof (Example.ManagedType))
+			yield return Example.ManagedType.JniTypeName;
+		else if (type == typeof (Java.Lang.Object))
+			yield return "java/lang/Object";
+		else if (type == typeof (Java.Lang.String))
+			yield return "java/lang/String";
+	}
+
+	protected override string? GetSimpleReference (Type type)
+	{
+		return GetSimpleReferences (type).FirstOrDefault ();
+	}
+
+	protected override JniTypeSignature GetTypeSignatureCore (Type type)
+	{
+		var simpleReference = GetSimpleReference (type);
+		return simpleReference == null ? default : new JniTypeSignature (simpleReference, 0, false);
+	}
+
+	protected override IEnumerable<JniTypeSignature> GetTypeSignaturesCore (Type type)
+	{
+		var signature = GetTypeSignatureCore (type);
+		if (signature.IsValid)
+			yield return signature;
+	}
+
+	[return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
+	protected override Type? GetInvokerTypeCore (
+			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
+			Type type)
+	{
+		return null;
+	}
+
+	protected override IReadOnlyList<string>? GetStaticMethodFallbackTypesCore (string jniSimpleReference)
+	{
+		return null;
+	}
+
+	protected override string? GetReplacementTypeCore (string jniSimpleReference)
+	{
+		return null;
+	}
+
+	protected override JniRuntime.ReplacementMethodInfo? GetReplacementMethodInfoCore (string jniSourceType, string jniMethodName, string jniMethodSignature)
+	{
+		return null;
+	}
+
+	public override void RegisterNativeMembers (
+			JniType nativeClass,
+			[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
+			Type type,
+			ReadOnlySpan<char> methods)
+	{
+		if (type != typeof (Example.ManagedType)) {
+			if (!methods.IsEmpty)
+				throw new NotSupportedException ($"Could not register native members for type '{type.FullName}'.");
+			return;
 		}
+
+		var registrations = new List<JniNativeMethodRegistration> ();
+		Example.ManagedType.RegisterNativeMembers (new JniNativeMethodRegistrationArguments (registrations, null));
+		if (registrations.Count > 0)
+			nativeClass.RegisterNativeMethods (registrations.ToArray ());
+	}
+
+	[Obsolete ("Use RegisterNativeMembers(JniType, Type, ReadOnlySpan<char>)")]
+	public override void RegisterNativeMembers (
+			JniType nativeClass,
+			[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
+			Type type,
+			string? methods)
+	{
+		RegisterNativeMembers (nativeClass, type, methods.AsSpan ());
 	}
 }

src/Java.Interop/GlobalSuppressions.cs

@@ -25,6 +25,8 @@
 [assembly: SuppressMessage ("Design", "CA1034:Nested types should not be visible", Justification = "Deliberate choice to 'hide' these types from code completion for `Java.Interop.`.", Scope = "type", Target = "~T:Java.Interop.JniRuntime.JniValueManager")]
 [assembly: SuppressMessage ("Design", "CA1034:Nested types should not be visible", Justification = "Deliberate choice to 'hide' these types from code completion for `Java.Interop.`.", Scope = "type", Target = "~T:Java.Interop.JniEnvironment.References")]
 [assembly: SuppressMessage ("Design", "CA1034:Nested types should not be visible", Justification = "Deliberate choice to 'hide' these types from code completion for `Java.Interop.`.", Scope = "type", Target = "~T:Java.Interop.JniRuntime.JniTypeManager")]
+[assembly: SuppressMessage ("Design", "CA1034:Nested types should not be visible", Justification = "Deliberate choice to 'hide' these types from code completion for `Java.Interop.`.", Scope = "type", Target = "~T:Java.Interop.JniRuntime.ReflectionJniTypeManager")]
+[assembly: SuppressMessage ("Design", "CA1034:Nested types should not be visible", Justification = "Deliberate choice to 'hide' these types from code completion for `Java.Interop.`.", Scope = "type", Target = "~T:Java.Interop.JniRuntime.ReflectionJniValueManager")]
 [assembly: SuppressMessage ("Design", "CA1034:Nested types should not be visible", Justification = "Deliberate choice to 'hide' these types from code completion for `Java.Interop.`.", Scope = "type", Target = "~T:Java.Interop.JniPeerMembers.JniInstanceMethods")]
 [assembly: SuppressMessage ("Design", "CA1034:Nested types should not be visible", Justification = "Deliberate choice to 'hide' these types from code completion for `Java.Interop.`.", Scope = "type", Target = "~T:Java.Interop.JniPeerMembers.JniInstanceFields")]
 [assembly: SuppressMessage ("Design", "CA1034:Nested types should not be visible", Justification = "Deliberate choice to 'hide' these types from code completion for `Java.Interop.`.", Scope = "type", Target = "~T:Java.Interop.JniRuntime.CreationOptions")]

src/Java.Interop/Java.Interop/JavaPrimitiveArrays.cs

@@ -13,8 +13,7 @@ namespace Java.Interop {
 
 	partial class JniRuntime {
 
-		partial class JniTypeManager {
-
+		partial class ReflectionJniTypeManager {
 			readonly struct JniPrimitiveArrayInfo {
 				public  readonly    JniTypeSignature    JniTypeSignature;
 				public  readonly    Type                PrimitiveType;

src/Java.Interop/Java.Interop/JavaPrimitiveArrays.tt

@@ -30,7 +30,7 @@ namespace Java.Interop {
 #>
 	partial class JniRuntime {
 
-		partial class JniTypeManager {
+		partial class ReflectionJniTypeManager {
 
 			readonly struct JniPrimitiveArrayInfo {
 				public  readonly    JniTypeSignature    JniTypeSignature;

src/Java.Interop/Java.Interop/JavaProxyObject.cs

@@ -16,7 +16,7 @@ sealed class JavaProxyObject : JavaObject, IEquatable<JavaProxyObject>
 		static  readonly    ConditionalWeakTable<object, JavaProxyObject>   CachedValues    = new ConditionalWeakTable<object, JavaProxyObject> ();
 
 		[JniAddNativeMethodRegistrationAttribute]
-		static void RegisterNativeMembers (JniNativeMethodRegistrationArguments args)
+		internal static void RegisterNativeMembers (JniNativeMethodRegistrationArguments args)
 		{
 			args.Registrations.Add (new JniNativeMethodRegistration ("equals",   "(Ljava/lang/Object;)Z", new EqualsMarshalMethod (Equals)));
 			args.Registrations.Add (new JniNativeMethodRegistration ("hashCode", "()I",                   new GetHashCodeMarshalMethod (GetHashCode)));

src/Java.Interop/Java.Interop/JniObjectReferenceOptions.cs

@@ -20,7 +20,7 @@ partial struct JniObjectReference {
 	}
 
 	partial class JniRuntime {
-		partial class JniValueManager {
+		partial class ReflectionJniValueManager {
 			const   JniObjectReferenceOptions   DoNotRegisterTarget = (JniObjectReferenceOptions) (1 << 2);
 		}
 	}