diff --git a/src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs b/src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs index 29e8d56742a..69fec65ac74 100644 --- a/src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs +++ b/src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JcwJavaSourceGenerator.cs @@ -175,9 +175,10 @@ static void WriteConstructors (JavaPeerInfo type, TextWriter writer) string parameters = FormatParameterList (ctorParams); string superArgs = ctor.SuperArgumentsString ?? FormatArgumentList (ctorParams); string args = FormatArgumentList (ctorParams); + string throwsClause = FormatThrowsClause (ctor.ThrownNames); writer.Write ($$""" - public {{simpleClassName}} ({{parameters}}) + public {{simpleClassName}} ({{parameters}}){{throwsClause}} { super ({{superArgs}}); @@ -251,10 +252,7 @@ static void WriteMethods (JavaPeerInfo type, TextWriter writer) string returnPrefix = isVoid ? "" : "return "; // throws clause for [Export] methods - string throwsClause = ""; - if (method.ThrownNames != null && method.ThrownNames.Count > 0) { - throwsClause = $"\n\t\tthrows {string.Join (", ", method.ThrownNames)}"; - } + string throwsClause = FormatThrowsClause (method.ThrownNames); if (method.Connector != null && !method.IsExport) { writer.Write ($$""" @@ -309,6 +307,19 @@ static void WriteClassClose (TextWriter writer) writer.WriteLine ('}'); } + static string FormatThrowsClause (IReadOnlyList? thrownNames) + { + if (thrownNames == null || thrownNames.Count == 0) { + return ""; + } + + var javaNames = new string [thrownNames.Count]; + for (int i = 0; i < thrownNames.Count; i++) { + javaNames [i] = JniSignatureHelper.JniNameToJavaName (thrownNames [i]); + } + return $"\n\t\tthrows {string.Join (", ", javaNames)}"; + } + static string FormatParameterList (IReadOnlyList parameters) { if (parameters.Count == 0) { diff --git a/src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerInfo.cs b/src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerInfo.cs index 5f591978de3..f613c1e1192 100644 --- a/src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerInfo.cs +++ b/src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerInfo.cs @@ -335,6 +335,12 @@ public sealed record JavaConstructorInfo /// public string? SuperArgumentsString { get; init; } + /// + /// For [Export] constructors: Java exception types that the constructor declares it can throw. + /// Null for [Register] constructors. + /// + public IReadOnlyList? ThrownNames { get; init; } + /// /// Managed constructor parameter types, in declaration order. /// diff --git a/src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs b/src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs index a9b28686132..f53e289d697 100644 --- a/src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs +++ b/src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs @@ -2479,6 +2479,7 @@ List BuildJavaConstructors (List marshal JniSignature = mm.JniSignature, ConstructorIndex = ctorIndex, SuperArgumentsString = mm.SuperArgumentsString, + ThrownNames = mm.ThrownNames, HasMatchingManagedCtor = managedParams != null, ManagedParameterTypes = managedParams ?? [], }); diff --git a/src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs b/src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs index be49c266d47..48e5e5dd2eb 100644 --- a/src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs +++ b/src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs @@ -98,6 +98,14 @@ internal bool ValidateJavaNames (IReadOnlyList peers, string? appl } foreach (var constructor in peer.JavaConstructors) { ValidateJniSignature (constructor.JniSignature); + if (constructor.ThrownNames is not null) { + foreach (var thrownName in constructor.ThrownNames) { + var javaThrownName = JniSignatureHelper.JniNameToJavaName (thrownName); + if (JavaNameValidator.TryGetInvalidJavaSourceTypeSegment (javaThrownName, out invalidIdentifier)) { + ReportInvalidName (thrownName, invalidIdentifier); + } + } + } } foreach (var method in peer.MarshalMethods) { if (!method.IsConstructor) { @@ -105,7 +113,8 @@ internal bool ValidateJavaNames (IReadOnlyList peers, string? appl } if (method.ThrownNames is not null) { foreach (var thrownName in method.ThrownNames) { - if (JavaNameValidator.TryGetInvalidJavaSourceTypeSegment (thrownName, out invalidIdentifier)) { + var javaThrownName = JniSignatureHelper.JniNameToJavaName (thrownName); + if (JavaNameValidator.TryGetInvalidJavaSourceTypeSegment (javaThrownName, out invalidIdentifier)) { ReportInvalidName (thrownName, invalidIdentifier); } } diff --git a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/ScannerExportShapesTests.cs b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/ScannerExportShapesTests.cs index ed3f727ad71..04d9f4eb1cf 100644 --- a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/ScannerExportShapesTests.cs +++ b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/ScannerExportShapesTests.cs @@ -28,6 +28,11 @@ static string UserTypesFixturePath { } static MarshalMethodInfo[] GetMarshalMethods (string javaName) + { + return GetPeer (javaName).MarshalMethods.ToArray (); + } + + static JavaPeerInfo GetPeer (string javaName) { var fixturePath = UserTypesFixturePath; var dir = AssertNotNull (Path.GetDirectoryName (fixturePath)); @@ -53,7 +58,7 @@ static MarshalMethodInfo[] GetMarshalMethods (string javaName) var peers = scanner.Scan (assemblies); var peer = peers.FirstOrDefault (p => p.ManagedTypeName.EndsWith (javaName)); - return AssertNotNull (peer).MarshalMethods.ToArray (); + return AssertNotNull (peer); } finally { foreach (var pe in peReaders) pe.Dispose (); @@ -120,6 +125,16 @@ public void Export_WithThrowsClause_SurfacesDeclaredExceptions () Assert.Contains ("java/lang/IllegalStateException", multiThrownNames); } + [Fact] + public void ExportConstructor_WithThrowsClause_SurfacesDeclaredExceptions () + { + var peer = GetPeer ("ExportThrowsShapes"); + var constructor = Assert.Single (peer.JavaConstructors); + var thrownNames = AssertNotNull (constructor.ThrownNames); + + Assert.Equal (["java/io/IOException", "java/lang/IllegalStateException"], thrownNames); + } + [Fact] public void MixedRegisterAndExport_BothPathsSurface () { diff --git a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/UserTypesFixture/UserTypes.cs b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/UserTypesFixture/UserTypes.cs index 9a5415426ec..df25fc4c28e 100644 --- a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/UserTypesFixture/UserTypes.cs +++ b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/UserTypesFixture/UserTypes.cs @@ -252,6 +252,9 @@ public class StaticExportShapes : Java.Lang.Object // A.2: [Export(Throws = ...)] — declared exceptions in JNI signature. public class ExportThrowsShapes : Java.Lang.Object { + [Export (Throws = new [] { typeof (Java.IO.IOException), typeof (Java.Lang.IllegalStateException) }, SuperArgumentsString = "")] + public ExportThrowsShapes () { } + [Export ("ioCall", Throws = new [] { typeof (Java.IO.IOException) })] public void IoCall () { } diff --git a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs index 055b3c399e7..50776436d8d 100644 --- a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs +++ b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/JcwJavaSourceGeneratorTests.cs @@ -464,6 +464,13 @@ public void Generate_ExportWithThrows_HasThrowsClause () AssertContainsLine ("throws java.io.IOException, java.lang.IllegalStateException\n", java); } + [Fact] + public void Generate_ExportConstructorWithThrows_HasThrowsClause () + { + var java = GenerateFixture ("my/app/ExportWithThrows"); + AssertContainsLine ("public ExportWithThrows ()\n\t\tthrows java.io.IOException, java.lang.IllegalStateException\n", java); + } + } public class StaticExportMethods diff --git a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TrimmableTypeMapGeneratorTests.cs b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TrimmableTypeMapGeneratorTests.cs index 567df31d17f..32d193815eb 100644 --- a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TrimmableTypeMapGeneratorTests.cs +++ b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TrimmableTypeMapGeneratorTests.cs @@ -180,6 +180,7 @@ public void ValidateJavaNames_ReservedEmittedTypeReferences_LogErrors () new JavaConstructorInfo { JniSignature = "(Lcom/example/Outer$for;)V", ConstructorIndex = 0, + ThrownNames = ["com/example/Outer$permits"], }, ], MarshalMethods = [ @@ -188,7 +189,7 @@ public void ValidateJavaNames_ReservedEmittedTypeReferences_LogErrors () JniSignature = "([Lcom/example/Outer$record;)Lcom/example/Outer$yield;", ManagedMethodName = "Method", NativeCallbackName = "n_method", - ThrownNames = ["com.example.Outer.permits"], + ThrownNames = ["com/example/Outer$sealed"], }, ], JavaFields = [ @@ -206,7 +207,8 @@ public void ValidateJavaNames_ReservedEmittedTypeReferences_LogErrors () Assert.Contains (logMessages, message => message.Contains ("Java name 'com/example/Outer$for' contains reserved Java identifier 'for'.")); Assert.Contains (logMessages, message => message.Contains ("Java name 'com/example/Outer$record' contains reserved Java identifier 'record'.")); Assert.Contains (logMessages, message => message.Contains ("Java name 'com/example/Outer$yield' contains reserved Java identifier 'yield'.")); - Assert.Contains (logMessages, message => message.Contains ("Java name 'com.example.Outer.permits' contains reserved Java identifier 'permits'.")); + Assert.Contains (logMessages, message => message.Contains ("Java name 'com/example/Outer$permits' contains reserved Java identifier 'permits'.")); + Assert.Contains (logMessages, message => message.Contains ("Java name 'com/example/Outer$sealed' contains reserved Java identifier 'sealed'.")); Assert.Contains (logMessages, message => message.Contains ("Java name 'com.example.Outer.sealed' contains reserved Java identifier 'sealed'.")); } diff --git a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/StubAttributes.cs b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/StubAttributes.cs index 050741c3e20..be7d55ff01c 100644 --- a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/StubAttributes.cs +++ b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/StubAttributes.cs @@ -178,11 +178,12 @@ public sealed class ContentProviderAttribute : Attribute, Java.Interop.IJniNameP namespace Java.Interop { - [AttributeUsage (AttributeTargets.Method, AllowMultiple = false)] + [AttributeUsage (AttributeTargets.Method | AttributeTargets.Constructor, AllowMultiple = false)] public sealed class ExportAttribute : Attribute { public string? Name { get; set; } public string[]? ThrownNames { get; set; } + public string? SuperArgumentsString { get; set; } public ExportAttribute () { } public ExportAttribute (string name) => Name = name; diff --git a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs index ceedbc96fe6..6817fc563d8 100644 --- a/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs +++ b/tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/TestFixtures/TestTypes.cs @@ -1244,6 +1244,9 @@ public class ExportWithThrows : Java.Lang.Object { protected ExportWithThrows (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { } + [Java.Interop.Export (SuperArgumentsString = "", ThrownNames = new [] { "java.io.IOException", "java.lang.IllegalStateException" })] + public ExportWithThrows () { } + [Java.Interop.Export ("riskyMethod", ThrownNames = new [] { "java.io.IOException", "java.lang.IllegalStateException" })] public void RiskyMethod () { } } diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ConstructorActivationTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ConstructorActivationTests.cs index 570fc0e1fc7..00cbfe024c5 100644 --- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ConstructorActivationTests.cs +++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/ConstructorActivationTests.cs @@ -162,6 +162,18 @@ public void JavaSideThrowingConstructorPropagatesException () Assert.IsTrue (exception.ToString ().Contains (ConstructorActivationThrowing.ExceptionMessage)); } + [Test] + [Category ("ConstructorParity")] + public void JavaSideExportConstructorWithThrowsRunsOnce () + { + ConstructorActivationWithThrows.Reset (); + + using (var instance = CreateFromJava ("()V")) { + Assert.AreEqual (1, ConstructorActivationWithThrows.ConstructorInvocations); + AssertRegisteredSame (instance); + } + } + [Test] public void JavaSideContextConstructorForwardsArgument () { @@ -796,6 +808,23 @@ public static void Reset () } } + [Register ("net/dot/android/test/ConstructorActivationWithThrows")] + public class ConstructorActivationWithThrows : Java.Lang.Object + { + public static int ConstructorInvocations; + + [Export (SuperArgumentsString = "", Throws = new [] { typeof (Java.IO.IOException) })] + public ConstructorActivationWithThrows () + { + ConstructorInvocations++; + } + + public static void Reset () + { + ConstructorInvocations = 0; + } + } + [Register ("net/dot/android/test/ConstructorActivationBase", DoNotGenerateAcw = true)] public class ConstructorActivationBase : Java.Lang.Object { diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs index a94de4443a5..71380047d2b 100644 --- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs +++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs @@ -146,6 +146,29 @@ public void NewClosedGenericTypeWorks () } } + [Test] + [Category ("ConstructorParity")] + public void ExistingJavaObjectWrapsAsKnownClosedGenericType () + { + GenericHolder.ActivationConstructorInvocations = 0; + + IntPtr handle = JNIEnv.CreateInstance (typeof (GenericHolder), "()V"); + try { + using var first = Java.Lang.Object.GetObject> (handle, JniHandleOwnership.DoNotTransfer); + var second = Java.Lang.Object.GetObject> (handle, JniHandleOwnership.DoNotTransfer); + try { + Assert.IsNotNull (first); + Assert.AreSame (first, second); + Assert.AreEqual (1, GenericHolder.ActivationConstructorInvocations); + } finally { + if (!ReferenceEquals (first, second)) + second?.Dispose (); + } + } finally { + JNIEnv.DeleteLocalRef (handle); + } + } + [Test] public void NewObjectArrayWithNullArray () { @@ -686,6 +709,18 @@ public MultiCtorActivatedFromJava (Java.Lang.Throwable cause) class GenericHolder : Java.Lang.Object { + public static int ActivationConstructorInvocations; + + public GenericHolder () + { + } + + protected GenericHolder (IntPtr handle, JniHandleOwnership transfer) + : base (handle, transfer) + { + ActivationConstructorInvocations++; + } + public T Value {get; set;} }