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

src/Java.Interop.Dynamic/Java.Interop.Dynamic/JavaInstanceProxy.cs

@@ -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)

src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil/TypeDefinitionRocks.cs

@@ -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)
+		{
+			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 ();
 

src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs

@@ -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;

src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs

@@ -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;

src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs

@@ -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)) {

src/Java.Interop/Java.Interop/JavaException.cs

@@ -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";

src/Java.Interop/Java.Interop/JavaObject.cs

@@ -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));

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

@@ -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 ();
@@ -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 ();
@@ -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 ();
@@ -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 ();
@@ -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 ();
@@ -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 ();
@@ -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 ();
@@ -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 ();

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

@@ -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 ();

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

@@ -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";

src/Java.Interop/Java.Interop/JavaProxyThrowable.cs

@@ -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";

src/Java.Interop/Java.Interop/ManagedPeer.cs

@@ -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";

tests/Java.Interop-PerformanceTests/Java.Interop/JavaTiming.cs

@@ -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";

tests/Java.Interop-Tests/Java.Interop-Tests.csproj

@@ -30,6 +30,7 @@
     <ProjectReference Include="..\..\src\Java.Interop.GenericMarshaler\Java.Interop.GenericMarshaler.csproj" />
     <ProjectReference Include="..\..\src\Java.Runtime.Environment\Java.Runtime.Environment.csproj" />
     <ProjectReference Include="..\TestJVM\TestJVM.csproj" />
+    <ProjectReference Include="..\..\tools\jcw-gen\jcw-gen.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>

tests/Java.Interop-Tests/Java.Interop-Tests.targets

@@ -1,12 +1,47 @@
 <Project>
 
+  <ItemGroup>
+    <_BuildJavaInteropTestsJarInputs Include="$(TargetPath)" />
+    <_BuildJavaInteropTestsJarInputs Include="$(MSBuildThisFileFullPath)" />
+    <_BuildJavaInteropTestsJarInputs Include="java\**\*.java" />
+  </ItemGroup>
+
+  <Target Name="_CreateJavaCallableWrappers"
+      Condition=" '$(TargetPath)' != '' "
+      AfterTargets="Build"
+      Inputs="@(_BuildJavaInteropTestsJarInputs)"
+      Outputs="$(IntermediateOutputPath)java\.stamp">
+    <RemoveDir Directories="$(IntermediateOutputPath)java" />
+    <MakeDir Directories="$(IntermediateOutputPath)java" />
+    <ItemGroup>
+      <!-- I can't find a good way to trim the trailing `\`, so append with `.` so we can sanely quote for $(_Libpath) -->
+      <_RefAsmDirs Include="@(ReferencePathWithRefAssemblies->'%(RootDir)%(Directory).'->Distinct())" />
+    </ItemGroup>
+    <PropertyGroup>
+      <_JcwGen>"$(UtilityOutputFullPath)/jcw-gen.dll"</_JcwGen>
+      <_Target>--codegen-target JavaInterop1</_Target>
+      <_Output>-o "$(IntermediateOutputPath)/java"</_Output>
+      <_Libpath>@(_RefAsmDirs->'-L "%(Identity)"', ' ')</_Libpath>
+    </PropertyGroup>
+    <Exec Command="$(DotnetToolPath) $(_JcwGen) -v &quot;$(TargetPath)&quot; $(_Target) $(_Output) $(_Libpath)" />
+    <Touch Files="$(IntermediateOutputPath)java\.stamp" AlwaysCreate="True" />
+  </Target>
+
+  <Target Name="_CollectGeneratdJcwSource">
+    <ItemGroup>
+      <_GeneratedJcwSource Include="$(IntermediateOutputPath)java\**\*.java" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="BuildInteropTestJar"
-      BeforeTargets="Build"
-      Inputs="@(JavaInteropTestJar)"
+      AfterTargets="Build"
+      DependsOnTargets="_CreateJavaCallableWrappers;_CollectGeneratdJcwSource"
+      Inputs="@(JavaInteropTestJar);@(_GeneratedJcwSource)"
       Outputs="$(OutputPath)interop-test.jar">
     <MakeDir Directories="$(IntermediateOutputPath)it-classes" />
     <ItemGroup>
       <_Source Include="@(JavaInteropTestJar->Replace('%5c', '/'))" />
+      <_Source Include="@(_GeneratedJcwSource->Replace('%5c', '/'))" />
     </ItemGroup>
     <WriteLinesToFile
         File="$(IntermediateOutputPath)_java_sources.txt"

tests/Java.Interop-Tests/Java.Interop/CallNonvirtualBase.cs

@@ -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";

tests/Java.Interop-Tests/Java.Interop/CallNonvirtualDerived.cs

@@ -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";

tests/Java.Interop-Tests/Java.Interop/CallNonvirtualDerived2.cs

@@ -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";

tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs

@@ -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";

tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs

@@ -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));

tests/Java.Interop-Tests/Java.Interop/GetThis.cs

@@ -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";

tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs

@@ -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";
 

tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs

@@ -164,11 +164,13 @@ public void Ctor_Exceptions ()
 			var r   = new JniObjectReference ();
 			Assert.Throws<ArgumentException> (() => new JavaObject (ref r, JniObjectReferenceOptions.CopyAndDispose));
 
-			// Note: This may break if/when JavaVM provides "default"
-			Assert.Throws<NotSupportedException> (() => new JavaObjectWithNoJavaPeer ());
 #if __ANDROID__
 			Assert.Throws<Java.Lang.ClassNotFoundException> (() => new JavaObjectWithMissingJavaPeer ()).Dispose ();
 #else   // !__ANDROID__
+			// Note: `JavaObjectWithNoJavaPeer` creation works on Android because tooling provides all
+			// typemap entries.  On desktop, we use the hardcoded dictionary in JavaVMFixture, which
+   			// deliberately *lacks* an  entry for `JavaObjectWithNoJavaPeer`.
+			Assert.Throws<NotSupportedException> (() => new JavaObjectWithNoJavaPeer ());
 			Assert.Throws<JavaException> (() => new JavaObjectWithMissingJavaPeer ()).Dispose ();
 #endif  // !__ANDROID__
 		}
@@ -201,17 +203,21 @@ public void DisposeAccessesThis ()
 		}
 	}
 
+#if !__ANDROID__
 	class JavaObjectWithNoJavaPeer : JavaObject {
 	}
+#endif  // !__ANDROID__
 
-	[JniTypeSignature (JniTypeName)]
+	[JniTypeSignature (JniTypeName, GenerateJavaPeer=false)]
 	class JavaObjectWithMissingJavaPeer : JavaObject {
 		internal    const   string  JniTypeName = "__this__/__type__/__had__/__better__/__not__/__Exist__";
 	}
 
-	[JniTypeSignature ("java/lang/Object")]
+	[JniTypeSignature (JniTypeName)]
 	class JavaDisposedObject : JavaObject {
 
+		internal    const   string  JniTypeName = "net/dot/jni/test/JavaDisposedObject";
+
 		public Action   OnDisposed;
 		public Action   OnFinalized;
 
@@ -230,8 +236,10 @@ protected override void Dispose (bool disposing)
 		}
 	}
 
-	[JniTypeSignature ("java/lang/Object")]
+	[JniTypeSignature (JniTypeName)]
 	class MyDisposableObject : JavaObject {
+		internal    const   string  JniTypeName = "net/dot/jni/test/MyDisposableObject";
+
 		bool _isDisposed;
 
 		public MyDisposableObject ()

tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs

@@ -39,7 +39,11 @@ class JavaVMFixtureTypeManager : JniRuntime.JniTypeManager {
 			[RenameClassDerived.JniTypeName]    = typeof (RenameClassDerived),
 			[CallVirtualFromConstructorBase.JniTypeName]    = typeof (CallVirtualFromConstructorBase),
 			[CallVirtualFromConstructorDerived.JniTypeName] = typeof (CallVirtualFromConstructorDerived),
+			[CrossReferenceBridge.JniTypeName]              = typeof (CrossReferenceBridge),
 			[GetThis.JniTypeName]                           = typeof (GetThis),
+			[JavaDisposedObject.JniTypeName]                = typeof (JavaDisposedObject),
+			[JavaObjectWithMissingJavaPeer.JniTypeName]     = typeof (JavaObjectWithMissingJavaPeer),
+			[MyDisposableObject.JniTypeName]                = typeof (JavaDisposedObject),
 		};
 
 		public JavaVMFixtureTypeManager ()