Partially revert 9027591

Remember 902fe28? > Assuming it works on CI, next step will be to largely revert > 9027591, and then fix > `Java.Interop.Export-Tests` to use an `n_` prefix on all `native` > method declarations. That bit is hand-written; it can change. > Keeping the tooling consistent is more important. Let's Do It! Revert most of the `JavaCallableWrapperGenerator` bits of 9027591. Update the `JavaInterop1` JCW output to conform, using `n_`-prefixed native method declarations. *Retain the constructor signature fix* in 93a901a.. Revert the `JreTypeManager` change in 902fe28. Update `jnimarshalmethod-gen` to register `n_`-prefixed names. Update `Java.Interop.Export-Tests` so that native method declarations now have `n_` prefixes, so that all is in sync.
dotnet · jonpryor · Feb 22, 2024 · Oct 24, 2023 · Oct 25, 2023 · Oct 25, 2023
commit a50457be6517921f77f4cf3307d09c25588803a1
diff --git a/src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs b/src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs
@@ -68,7 +68,7 @@ public JniNativeMethodRegistration CreateMarshalToManagedMethodRegistration (Jav
 
 		string GetJniMethodName (JavaCallableAttribute export, MethodInfo method)
 		{
-			return export.Name ?? "n_" + method.Name;
+			return "n_" + method.Name;
 		}
 
 		public string GetJniMethodSignature (JavaCallableAttribute export, MethodInfo method)

diff --git a/...aCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs b/...aCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
@@ -160,18 +160,6 @@ void AddNestedTypes (TypeDefinition type)
 					 type.IsSubclassOf ("Android.Content.ContentProvider", cache)))
 				Diagnostic.Error (4203, LookupSource (type), Localization.Resources.JavaCallableWrappers_XA4203, jniName);
 
-			this.outerType = outerType;
-		}
-
-		bool initialized;
-		string? outerType;
-
-		void Initialize ()
-		{
-			if (initialized)
-				return;
-			initialized = true;
-
 			foreach (MethodDefinition minfo in type.Methods.Where (m => !m.IsConstructor)) {
 				var baseRegisteredMethod = GetBaseRegisteredMethod (minfo);
 				if (baseRegisteredMethod != null)
@@ -313,9 +301,7 @@ void AddConstructor (MethodDefinition ctor, TypeDefinition type, string? outerTy
 					if (!string.IsNullOrEmpty (eattr.Name)) {
 						// Diagnostic.Warning (log, "Use of ExportAttribute.Name property is invalid on constructors");
 					}
-					ctors.Add (new Signature (new (cache, CodeGenerationTarget, ctor, eattr) {
-						ManagedParameters   = managedParameters,
-					}));
+					ctors.Add (new Signature (ctor, eattr, managedParameters, cache));
 					curCtors.Add (ctor);
 					return;
 				}
@@ -324,10 +310,7 @@ void AddConstructor (MethodDefinition ctor, TypeDefinition type, string? outerTy
 				if (rattr != null) {
 					if (ctors.Any (c => c.JniSignature == rattr.Signature))
 						return;
-					ctors.Add (new Signature (new (cache, CodeGenerationTarget, ctor, rattr) {
-						ManagedParameters   = managedParameters,
-						OuterType           = outerType,
-					}));
+					ctors.Add (new Signature (ctor, rattr, managedParameters, outerType, cache));
 					curCtors.Add (ctor);
 					return;
 				}
@@ -348,26 +331,12 @@ void AddConstructor (MethodDefinition ctor, TypeDefinition type, string? outerTy
 				}
 
 				if (baseCtors.Any (m => m.Parameters.AreParametersCompatibleWith (ctor.Parameters, cache))) {
-					ctors.Add (new Signature (new (cache, CodeGenerationTarget) {
-						RegisterName            = ".ctor",
-						RegisterSignature       = jniSignature,
-						RegisterConnector       = "",
-						ManagedParameters       = managedParameters,
-						OuterType               = outerType,
-						IsDynamicallyRegistered = true,
-					}));
+					ctors.Add (new Signature (".ctor", jniSignature, "", managedParameters, outerType, null));
 					curCtors.Add (ctor);
 					return;
 				}
 				if (baseCtors.Any (m => !m.HasParameters)) {
-					ctors.Add (new Signature (new (cache, CodeGenerationTarget) {
-						RegisterName            = ".ctor",
-						RegisterSignature       = jniSignature,
-						RegisterConnector       = "",
-						ManagedParameters       = managedParameters,
-						OuterType               = outerType,
-						IsDynamicallyRegistered = true,
-					}));
+					ctors.Add (new Signature (".ctor", jniSignature, "", managedParameters, outerType, ""));
 					curCtors.Add (ctor);
 					return;
 				}
@@ -533,17 +502,15 @@ void AddMethod (MethodDefinition? registeredMethod, MethodDefinition implemented
 						Diagnostic.Error (4217, LookupSource (implementedMethod), Localization.Resources.JavaCallableWrappers_XA4217, attr.Name);
 
 					bool shouldBeDynamicallyRegistered = methodClassifier?.ShouldBeDynamicallyRegistered (type, registeredMethod, implementedMethod, attr.OriginAttribute) ?? true;
-					var msig = new Signature (new (cache, CodeGenerationTarget, implementedMethod, attr) {
-						IsDynamicallyRegistered = shouldBeDynamicallyRegistered,
-					});
+					var msig = new Signature (implementedMethod, attr, cache, shouldBeDynamicallyRegistered);
 					if (!registeredMethod.IsConstructor && !methods.Any (m => m.Name == msig.Name && m.Params == msig.Params))
 						methods.Add (msig);
 				}
 			foreach (ExportAttribute attr in GetExportAttributes (implementedMethod)) {
 				if (type.HasGenericParameters)
 					Diagnostic.Error (4206, LookupSource (implementedMethod), Localization.Resources.JavaCallableWrappers_XA4206);
 
-				var msig = new Signature (new (cache, CodeGenerationTarget, implementedMethod, attr));
+				var msig = new Signature (implementedMethod, attr, null, cache);
 				if (!string.IsNullOrEmpty (attr.SuperArgumentsString)) {
 					// Diagnostic.Warning (log, "Use of ExportAttribute.SuperArgumentsString property is invalid on methods");
 				}
@@ -554,7 +521,7 @@ void AddMethod (MethodDefinition? registeredMethod, MethodDefinition implemented
 				if (type.HasGenericParameters)
 					Diagnostic.Error (4207, LookupSource (implementedMethod), Localization.Resources.JavaCallableWrappers_XA4207);
 
-				var msig = new Signature (new (cache, CodeGenerationTarget, implementedMethod, attr));
+				var msig = new Signature (implementedMethod, attr, cache);
 				if (!implementedMethod.IsConstructor && !methods.Any (m => m.Name == msig.Name && m.Params == msig.Params)) {
 					methods.Add (msig);
 					exported_fields.Add (new JavaFieldInfo (implementedMethod, attr.Name, cache));
@@ -603,8 +570,6 @@ string GetManagedParameters (MethodDefinition ctor, string? outerType)
 
 		public void Generate (TextWriter writer)
 		{
-			Initialize ();
-
 			if (!string.IsNullOrEmpty (package)) {
 				writer.WriteLine ("package " + package + ";");
 				writer.WriteLine ();
@@ -821,7 +786,7 @@ void GenerateRegisterType (TextWriter sw, JavaCallableWrapperGenerator self, str
 
 			foreach (Signature method in self.methods) {
 				if (method.IsDynamicallyRegistered) {
-					sw.Write ("\t\t\t\"");
+					sw.Write ("\t\t\t\"", method.Method);
 					sw.Write (method.Method);
 					sw.WriteLine ("\\n\" +");
 				}
@@ -887,121 +852,66 @@ bool CannotRegisterInStaticConstructor (TypeDefinition type)
 			return JavaNativeTypeManager.IsApplication (type, cache) || JavaNativeTypeManager.IsInstrumentation (type, cache);
 		}
 
-		record struct SignatureOptions (IMetadataResolver Cache, JavaPeerStyle Style) {
+		class Signature {
 
-			public SignatureOptions (IMetadataResolver cache, JavaPeerStyle style, MethodDefinition method)
-				: this (cache, style)
-			{
-				Method                  = method;
-				IsStatic                = method.IsStatic;
-				JavaAccess              = JavaCallableWrapperGenerator.GetJavaAccess (method.Attributes & MethodAttributes.MemberAccessMask);
-				Annotations             = JavaCallableWrapperGenerator.GetAnnotationsString ("\t", method.CustomAttributes, cache);
-				IsDynamicallyRegistered = true;
-			}
+			public Signature (MethodDefinition method, RegisterAttribute register, IMetadataResolver cache, bool shouldBeDynamicallyRegistered = true) : this (method, register, null, null, cache, shouldBeDynamicallyRegistered) {}
 
-			public SignatureOptions (IMetadataResolver cache, JavaPeerStyle style, MethodDefinition method, RegisterAttribute register)
-				: this (cache, style, method)
+			public Signature (MethodDefinition method, RegisterAttribute register, string? managedParameters, string? outerType, IMetadataResolver cache, bool shouldBeDynamicallyRegistered = true)
+				: this (register.Name, register.Signature, register.Connector, managedParameters, outerType, null)
 			{
-				Register                = register;
+				Annotations = JavaCallableWrapperGenerator.GetAnnotationsString ("\t", method.CustomAttributes, cache);
+				IsDynamicallyRegistered = shouldBeDynamicallyRegistered;
 			}
 
-			public SignatureOptions (IMetadataResolver cache, JavaPeerStyle style, MethodDefinition method, ExportAttribute export)
-				: this (cache, style, method)
+			public Signature (MethodDefinition method, ExportAttribute export, string? managedParameters, IMetadataResolver cache)
+				: this (method.Name, GetJniSignature (method, cache), "__export__", null, null, export.SuperArgumentsString)
 			{
-				IsExport            = true;
-				SuperCall           = export.SuperArgumentsString;
-				ThrownTypeNames     = export.ThrownNames;
-				JavaNameOverride    = export.Name;
-				if (style == JavaPeerStyle.JavaInterop1) {
-					RegisterName    = export.Name;
-				}
+				IsExport = true;
+				IsStatic = method.IsStatic;
+				JavaAccess = JavaCallableWrapperGenerator.GetJavaAccess (method.Attributes & MethodAttributes.MemberAccessMask);
+				ThrownTypeNames = export.ThrownNames;
+				JavaNameOverride = export.Name;
+				ManagedParameters = managedParameters;
+				Annotations = JavaCallableWrapperGenerator.GetAnnotationsString ("\t", method.CustomAttributes, cache);
 			}
 
-			public SignatureOptions (IMetadataResolver cache, JavaPeerStyle style, MethodDefinition method, ExportFieldAttribute exportField)
-				: this (cache, style, method)
+			public Signature (MethodDefinition method, ExportFieldAttribute exportField, IMetadataResolver cache)
+				: this (method.Name, GetJniSignature (method, cache), "__export__", null, null, null)
 			{
-				IsExport    = true;
-				Annotations = null;
-
 				if (method.HasParameters)
 					Diagnostic.Error (4205, JavaCallableWrapperGenerator.LookupSource (method), Localization.Resources.JavaCallableWrappers_XA4205);
 				if (method.ReturnType.MetadataType == MetadataType.Void)
 					Diagnostic.Error (4208, JavaCallableWrapperGenerator.LookupSource (method), Localization.Resources.JavaCallableWrappers_XA4208);
-			}
-
+				IsExport = true;
+				IsStatic = method.IsStatic;
+				JavaAccess = JavaCallableWrapperGenerator.GetJavaAccess (method.Attributes & MethodAttributes.MemberAccessMask);
 
-			public  string?             RegisterName;
-			public  string?             RegisterSignature;
-			public  string?             RegisterConnector;
-			public  RegisterAttribute   Register {
-				set {
-					RegisterName        = value.Name;
-					RegisterSignature   = value.Signature;
-					RegisterConnector   = value.Connector;
-				}
-			}
-			public  MethodDefinition    Method {
-				set {
-					RegisterName        = value.Name;
-					RegisterSignature   = GetJniSignature (value, Cache);
-					RegisterConnector   = "__export__";
-					Annotations         = JavaCallableWrapperGenerator.GetAnnotationsString ("\t", value.CustomAttributes, Cache);
-				}
+				// annotations are processed within JavaFieldInfo, not the initializer method. So we don't generate them here.
 			}
-			public  bool                IsDynamicallyRegistered;
-			public  string?             ManagedParameters;
-			public  string?             OuterType;
-			public  string?             SuperCall;
-			public  string?             Annotations;
-			public  string?             JavaAccess;
-			public  string?             JavaNameOverride;
-			public  bool                IsExport;
-			public  bool                IsStatic;
-			public  string[]?           ThrownTypeNames;
-		}
 
-		class Signature {
-
-			public Signature (SignatureOptions options)
+			public Signature (string name, string? signature, string? connector, string? managedParameters, string? outerType, string? superCall)
 			{
-				if (options.RegisterName == null) {
-					throw new ArgumentNullException ("`RegisterName` cannot be null.", nameof (options.RegisterName));
-				}
-				if (options.RegisterSignature == null) {
-					throw new ArgumentNullException ("`RegisterSignature` cannot be null.", nameof (options.RegisterSignature));
-				}
-				Annotations                 = options.Annotations;
-				IsDynamicallyRegistered     = options.IsDynamicallyRegistered;
-				IsExport                    = options.IsExport;
-				IsStatic                    = options.IsStatic;
-				JavaAccess                  = options.JavaAccess;
-				JavaNameOverride            = options.JavaNameOverride;
-				JniSignature                = options.RegisterSignature;
-				ManagedParameters           = options.ManagedParameters;
-				Method                      = options.RegisterName + ":" + JniSignature + ":" + options.RegisterConnector;
-				Name                        = options.RegisterName;
-				ThrownTypeNames             = options.ThrownTypeNames;
-
-				if (options.Style == JavaPeerStyle.XAJavaInterop1) {
-					Method        = "n_" + Method;
-				}
+				ManagedParameters = managedParameters;
+				JniSignature      = signature ?? throw new ArgumentNullException ("`connector` cannot be null.", nameof (connector));
+				Method    = "n_" + name + ":" + JniSignature + ":" + connector;
+				Name      = name;
 
 				var jnisig = JniSignature;
 				int closer = jnisig.IndexOf (')');
 				string ret = jnisig.Substring (closer + 1);
 				retval = JavaNativeTypeManager.Parse (ret)?.Type;
 				string jniparms = jnisig.Substring (1, closer - 1);
-				if (string.IsNullOrEmpty (jniparms) && string.IsNullOrEmpty (options.SuperCall))
+				if (string.IsNullOrEmpty (jniparms) && string.IsNullOrEmpty (superCall))
 					return;
 				var parms = new StringBuilder ();
 				var scall = new StringBuilder ();
 				var acall = new StringBuilder ();
 				bool first = true;
 				int i = 0;
 				foreach (JniTypeName jti in JavaNativeTypeManager.FromSignature (jniparms)) {
-					if (options.OuterType != null) {
-						acall.Append (options.OuterType).Append (".this");
-						options.OuterType = null;
+					if (outerType != null) {
+						acall.Append (outerType).Append (".this");
+						outerType = null;
 						continue;
 					}
 					string? parmType = jti.Type;
@@ -1017,7 +927,7 @@ public Signature (SignatureOptions options)
 					++i;
 				}
 				this.parms = parms.ToString ();
-				this.call  = options.SuperCall != null ? options.SuperCall : scall.ToString ();
+				this.call  = superCall != null ? superCall : scall.ToString ();
 				this.ActivateCall = acall.ToString ();
 			}
 
@@ -1154,21 +1064,13 @@ void GenerateMethod (Signature method, TextWriter sw)
 			sw.Write (' ');
 			if (method.IsStatic)
 				sw.Write ("static ");
-			if (CodeGenerationTarget == JavaPeerStyle.JavaInterop1) {
-				sw.Write ("native ");
-			}
 			sw.Write (method.Retval);
 			sw.Write (' ');
 			sw.Write (method.JavaName);
 			sw.Write (" (");
 			sw.Write (method.Params);
 			sw.Write (')');
-			sw.Write (method.ThrowsDeclaration);
-			if (CodeGenerationTarget == JavaPeerStyle.JavaInterop1) {
-				sw.WriteLine (";");
-				return;
-			}
-			sw.WriteLine ();
+			sw.WriteLine (method.ThrowsDeclaration);
 			sw.WriteLine ("\t{");
 #if MONODROID_TIMING
 			sw.WriteLine ("\t\tandroid.util.Log.i(\"MonoDroid-Timing\", \"{0}.{1}: time: \"+java.lang.System.currentTimeMillis());", name, method.Name);
@@ -1239,8 +1141,6 @@ StreamWriter OpenStream (string outputPath)
 		/// </summary>
 		public string GetDestinationPath (string outputPath)
 		{
-			Initialize ();
-
 			var dir = package.Replace ('.', Path.DirectorySeparatorChar);
 			return Path.Combine (outputPath, dir, name + ".java");
 		}

diff --git a/src/Java.Runtime.Environment/Java.Interop/JreTypeManager.cs b/src/Java.Runtime.Environment/Java.Interop/JreTypeManager.cs
@@ -75,7 +75,7 @@ static void AddJniMethod (JniMethodMap toRegister, MethodInfo declaringMethod, M
 			if (signature == null || string.IsNullOrEmpty (signature.MemberName)) {
 				return;
 			}
-			toRegister [(signature.MemberName, signature.MemberSignature)]   = targetMethod ?? declaringMethod;
+			toRegister [("n_" + signature.MemberName, signature.MemberSignature)]   = targetMethod ?? declaringMethod;
 		}
 
 		static void AddClassMethods (JniMethodMap toRegister, Type type)

diff --git a/tests/Java.Interop.Export-Tests/Java.Interop/MarshalMemberBuilderTest.cs b/tests/Java.Interop.Export-Tests/Java.Interop/MarshalMemberBuilderTest.cs
@@ -24,10 +24,10 @@ public void AddExportMethods ()
 					.ToList ();
 				Assert.AreEqual (11, methods.Count);
 
-				Assert.AreEqual ("action",  methods [0].Name);
-				Assert.AreEqual ("()V",     methods [0].Signature);
+				Assert.AreEqual ("n_InstanceAction",    methods [0].Name);
+				Assert.AreEqual ("()V",                 methods [0].Signature);
 
-				Assert.AreEqual ("staticAction",        methods [1].Name);
+				Assert.AreEqual ("n_StaticAction",      methods [1].Name);
 				Assert.AreEqual ("()V",                 methods [1].Signature);
 
 #if NET