support default interface methods

Java.Interop.sln

@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{4C173212-3
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop", "src\Java.Interop\Java.Interop.csproj", "{94BD81F7-B06F-4295-9636-F8A3B6BDC762}"
 EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "java-interop", "src\java-interop\java-interop.csproj", "{BB0AB9F7-0979-41A7-B7A9-877260655F94}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "java-interop", "src\java-interop\java-interop.csproj", "{BB0AB9F7-0979-41A7-B7A9-877260655F94}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Dynamic", "src\Java.Interop.Dynamic\Java.Interop.Dynamic.csproj", "{AD4468F8-8883-434B-9D4C-E1801BB3B52A}"
 EndProject
@@ -99,6 +99,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.GenericMarshal
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.BootstrapTasks", "src\Java.Interop.BootstrapTasks\Java.Interop.BootstrapTasks.csproj", "{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "binding-integration-Tests", "tests\binding-integrated-Tests\binding-integration-Tests.csproj", "{D5CE4B09-C1D3-4647-B78B-6D2E89FE883E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -349,6 +351,14 @@ Global
 		{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
 		{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU
+		{D5CE4B09-C1D3-4647-B78B-6D2E89FE883E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5CE4B09-C1D3-4647-B78B-6D2E89FE883E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5CE4B09-C1D3-4647-B78B-6D2E89FE883E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5CE4B09-C1D3-4647-B78B-6D2E89FE883E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5CE4B09-C1D3-4647-B78B-6D2E89FE883E}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5CE4B09-C1D3-4647-B78B-6D2E89FE883E}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
+		{D5CE4B09-C1D3-4647-B78B-6D2E89FE883E}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{D5CE4B09-C1D3-4647-B78B-6D2E89FE883E}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0C001D50-4176-45AE-BDC8-BA626508B0CC} = {C8F58966-94BF-407F-914A-8654F8B8AE3B}
@@ -392,5 +402,6 @@ Global
 		{C0487169-8F81-497F-919E-EB42B1D0243F} = {C8F58966-94BF-407F-914A-8654F8B8AE3B}
 		{D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF} = {4C173212-371D-45D8-BA83-9226194F48DC}
 		{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A} = {172B608B-E6F3-41CC-9949-203A76BA247C}
+		{D5CE4B09-C1D3-4647-B78B-6D2E89FE883E} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
 	EndGlobalSection
 EndGlobal

src/Java.Interop/Java.Interop/JniPeerMembers.JniInstanceMethods_Invoke.tt

@@ -44,7 +44,7 @@ namespace Java.Interop {
 				JniPeerMembers.AssertSelf (self);
 
 				var declaringType   = DeclaringType;
-				if (Members.ShouldUseVirtualDispatch (self, declaringType)) {
+				if (Members.UsesVirtualDispatch (self, declaringType)) {
 					var m   = GetMethodInfo (encodedMember);
 					<#= returnType.ReturnType != "void" ? "return " : "" #>JniEnvironment.InstanceMethods.Call<#= returnType.JniCallType #>Method (self.PeerReference, m, parameters);
 					<#= returnType.ReturnType == "void" ? "return;" : "" #>

tests/binding-integrated-Tests/BindingBuilder.cs

@@ -0,0 +1,292 @@
+using NUnit.Framework;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using Xamarin.Android.Tools.Bytecode;
+using Xamarin.Android.Tools.ApiXmlAdjuster;
+
+namespace BindingIntegrationTests
+{
+	public class BindingBuilder
+	{
+		// This is required to get generator.exe deployed next to this assembly
+		// so that the default GeneratorPath can probe that it is right there.
+		static readonly Type dummy = typeof (MonoDroid.Generation.GenBase);
+
+		[Flags]
+		public enum Steps
+		{
+			Javac = 1,
+			Jar = 2,
+			ClassParse = 4,
+			ApiXmlAdjuster = 8,
+			Generator = 16,
+			Csc = 32,
+			All = Javac | Jar | ClassParse | ApiXmlAdjuster | Generator | Csc
+		}
+
+		public const string JavaSourcesSubDir = "java-sources";
+		public const string ClassesSubDir = "classes";
+		public const string ClassParseSubDir = "class-parse-xml";
+		public const string ApiXmlSubDir = "api-xml";
+		public const string MetadataXmlSubDir = "metadata";
+		public const string CSharpSourcesSubDir = "csharp";
+
+		public Steps ProcessSteps { get; set; } = Steps.All;
+
+		// entire work (intermediate output) directory
+		public string IntermediateOutputPathRelative { get; set; } = "intermediate-output";
+
+		// Used to resolve javac and rt.jar
+		public string JdkPath { get; set; }
+
+		public string GeneratorPath { get; set; } = Path.Combine (Path.GetDirectoryName (new Uri (typeof (BindingBuilder).Assembly.CodeBase).LocalPath), "generator.exe");
+
+		static string ProbeJavaHome ()
+		{
+			var env = Environment.GetEnvironmentVariable ("JAVA_HOME");
+			if (!string.IsNullOrEmpty (env))
+				return env;
+			return "/usr/lib/jvm/java-8-openjdk-amd64/";
+		}
+
+		public static BindingBuilder CreateBestBetDefault (BindingProject project)
+		{
+			return new BindingBuilder (project) { JdkPath = ProbeJavaHome () };
+		}
+
+		public BindingBuilder (BindingProject project)
+		{
+			this.project = project;
+		}
+
+		readonly BindingProject project;
+
+		public string IntermediateOutputPathAbsolute => Path.Combine (Path.GetDirectoryName (new Uri (GetType ().Assembly.CodeBase).LocalPath), IntermediateOutputPathRelative, project.Id);
+
+		public void Clean ()
+		{
+			if (Directory.Exists (IntermediateOutputPathAbsolute))
+				Directory.Delete (IntermediateOutputPathAbsolute, true);
+		}
+
+		public void Build ()
+		{
+			Javac ();
+			Jar ();
+			ClassParse ();
+			AdjustApiXml ();
+			GenerateBindingSources ();
+			CompileBindings ();
+		}
+
+		void EnsureDirectory (string dir)
+		{
+			var parent = Path.GetDirectoryName (dir);
+			if (parent != Path.GetPathRoot (parent))
+				EnsureDirectory (parent);
+			if (!Directory.Exists (dir))
+				Directory.CreateDirectory (dir);
+		}
+
+		void Javac ()
+		{
+			if ((ProcessSteps & Steps.Javac) == 0)
+				return;
+
+			if (JdkPath == null)
+				throw new InvalidOperationException ("JdkPath is not set.");
+
+			var objDir = IntermediateOutputPathAbsolute;
+			EnsureDirectory (objDir);
+
+			string sourcesSaved = Path.Combine (objDir, JavaSourcesSubDir);
+			EnsureDirectory (sourcesSaved);
+			foreach (var item in project.JavaSourceStrings)
+				File.WriteAllText (Path.Combine (sourcesSaved, item.FileName), item.Content);
+			var sourceFiles = project.JavaSourceFiles.Concat (project.JavaSourceStrings.Select (i => Path.Combine (sourcesSaved, i.FileName)));
+
+			if (project.CompiledClassesDirectory == null)
+				project.CompiledClassesDirectory = Path.Combine (objDir, ClassesSubDir);
+			EnsureDirectory (project.CompiledClassesDirectory);
+
+			var psi = new ProcessStartInfo () {
+				UseShellExecute = false,
+				FileName = JdkPath != null ? Path.Combine (JdkPath, "bin", "javac") : "javac",
+				Arguments = $"{project.JavacOptions} -d \"{project.CompiledClassesDirectory}\" {string.Join (" ", sourceFiles.Select (s => '"' + s + '"'))}",
+				RedirectStandardOutput = true,
+				RedirectStandardError = true,
+			};
+			if (project.CustomRuntimeJar != null)
+				psi.Arguments += $" -bootclasspath {project.CustomRuntimeJar} -classpath {project.CustomRuntimeJar}";
+
+			project.JavacExecutionOutput = $"Execute javac as: {psi.FileName} {psi.Arguments}\n";
+
+			var proc = new Process () { StartInfo = psi };
+			proc.OutputDataReceived += (sender, e) => project.JavacExecutionOutput += e.Data;
+			proc.ErrorDataReceived += (sender, e) => project.JavacExecutionOutput += e.Data;
+			proc.Start ();
+			proc.BeginOutputReadLine ();
+			proc.BeginErrorReadLine ();
+			proc.WaitForExit ();
+			if (proc.ExitCode != 0)
+				throw new Exception ("Javac failed: " + project.JavacExecutionOutput);
+		}
+
+		void Jar ()
+		{
+			if ((ProcessSteps & Steps.Jar) == 0)
+				return;
+
+			if (JdkPath == null)
+				throw new InvalidOperationException ("JdkPath is not set.");
+
+			var objDir = IntermediateOutputPathAbsolute;
+			if (project.CompiledClassesDirectory == null)
+				project.CompiledClassesDirectory = Path.Combine (objDir, ClassesSubDir);
+			if (project.CompiledJarFile == null)
+				project.CompiledJarFile = Path.Combine (project.CompiledClassesDirectory, project.Id + ".jar");
+
+			var psi = new ProcessStartInfo () {
+				UseShellExecute = false,
+				FileName = JdkPath != null ? Path.Combine (JdkPath, "bin", "jar") : "jar",
+				Arguments = $"cvf \"{project.CompiledJarFile}\" -C \"{project.CompiledClassesDirectory}\" .",
+				RedirectStandardOutput = true,
+				RedirectStandardError = true,
+			};
+
+			project.JarExecutionOutput = $"Execute jar as: {psi.FileName} {psi.Arguments}\n";
+
+			var proc = new Process () { StartInfo = psi };
+			proc.OutputDataReceived += (sender, e) => project.JarExecutionOutput += e.Data;
+			proc.ErrorDataReceived += (sender, e) => project.JarExecutionOutput += e.Data;
+			proc.Start ();
+			proc.BeginOutputReadLine ();
+			proc.BeginErrorReadLine ();
+			proc.WaitForExit ();
+			if (proc.ExitCode != 0)
+				throw new Exception ("Jar failed: " + project.JarExecutionOutput);
+		}
+
+		void ClassParse ()
+		{
+			if ((ProcessSteps & Steps.ClassParse) == 0)
+				return;
+
+			if (project.CompiledJarFile == null && !project.InputJarFiles.Any ())
+				throw new InvalidOperationException ("Input Jar files are not set either at CompiledJarFile or InputJarFiles.");
+
+			var objDir = IntermediateOutputPathAbsolute;
+			EnsureDirectory (objDir);
+			var cpDir = Path.Combine (objDir, ClassParseSubDir);
+			EnsureDirectory (cpDir);
+			if (project.GeneratedClassParseXmlFile == null)
+				project.GeneratedClassParseXmlFile = Path.Combine (cpDir, project.Id + ".class-parse");
+
+			// FIXME: logging
+			var cp = new ClassPath ();
+			cp.Load (project.CompiledJarFile);
+			foreach (var jar in project.InputJarFiles)
+				cp.Load (jar);
+			cp.SaveXmlDescription (project.GeneratedClassParseXmlFile);
+		}
+
+		void AdjustApiXml ()
+		{
+			if ((ProcessSteps & Steps.ApiXmlAdjuster) == 0)
+				return;
+
+			var objDir = IntermediateOutputPathAbsolute;
+			var cpDir = Path.Combine (objDir, ClassParseSubDir);
+			EnsureDirectory (cpDir);
+			if (project.GeneratedApiXmlFile == null)
+				project.GeneratedApiXmlFile = Path.Combine (objDir, "api.xml");
+			if (!File.Exists (project.GeneratedClassParseXmlFile) && !project.ClassParseXmlFiles.Any () && !project.ClassParseXmlStrings.Any ())
+				throw new InvalidOperationException ("Input class-parse file does not exist.");
+
+			foreach (var cpSource in project.ClassParseXmlStrings)
+				File.WriteAllText (Path.Combine (cpDir, cpSource.FileName), cpSource.Content);
+			var cpFiles = project.ClassParseXmlFiles.Concat (project.ClassParseXmlStrings.Select (i => Path.Combine (cpDir, i.FileName)));
+
+			// FIXME: this does not scale for parallel tasking.
+			var writer = new StringWriter ();
+			Xamarin.Android.Tools.ApiXmlAdjuster.Log.DefaultWriter = writer;
+
+			var api = new JavaApi ();
+			if (File.Exists (project.GeneratedClassParseXmlFile))
+				api.Load (project.GeneratedClassParseXmlFile);
+			foreach (var apixml in cpFiles)
+				api.Load (apixml);
+			api.Resolve ();
+			api.CreateGenericInheritanceMapping ();
+			api.MarkOverrides ();
+			api.FindDefects ();
+			api.Save (project.GeneratedApiXmlFile);
+			project.ApiXmlAdjusterExecutionOutput = writer.ToString ();
+			if (project.ApiXmlAdjusterExecutionOutput != string.Empty)
+				throw new Exception ("api-xml-adjuster failed: " + project.ApiXmlAdjusterExecutionOutput);
+		}
+
+		void GenerateBindingSources ()
+		{
+			if ((ProcessSteps & Steps.Generator) == 0)
+				return;
+
+			if (GeneratorPath == null)
+				throw new InvalidOperationException ("GeneratorPath is not set.");
+
+			var objDir = IntermediateOutputPathAbsolute;
+			EnsureDirectory (objDir);
+
+			if (project.GeneratedApiXmlFile == null)
+				project.GeneratedApiXmlFile = Path.Combine (objDir, "api.xml");
+			if (!File.Exists (project.GeneratedApiXmlFile) && !project.ApiXmlFiles.Any () && !project.ApiXmlStrings.Any ())
+				throw new InvalidOperationException ("Input api xml file does not exist.");
+			if (project.GeneratedCSharpSourceDirectory == null)
+				project.GeneratedCSharpSourceDirectory = Path.Combine (objDir, CSharpSourcesSubDir);
+
+			string apiXmlSaved = Path.Combine (objDir, ApiXmlSubDir);
+			EnsureDirectory (apiXmlSaved);
+			foreach (var item in project.ApiXmlStrings)
+				File.WriteAllText (Path.Combine (apiXmlSaved, item.FileName), item.Content);
+			var apiXmlFiles = project.ApiXmlFiles.Concat (project.ApiXmlStrings.Select (i => Path.Combine (apiXmlSaved, i.FileName)));
+
+			string metadataSaved = Path.Combine (objDir, MetadataXmlSubDir);
+			EnsureDirectory (metadataSaved);
+			foreach (var item in project.MetadataXmlStrings)
+				File.WriteAllText (Path.Combine (metadataSaved, item.FileName), item.Content);
+			var metadataFiles = project.MetadataXmlFiles.Concat (project.MetadataXmlStrings.Select (i => Path.Combine (metadataSaved, i.FileName)));
+
+			var psi = new ProcessStartInfo () {
+				UseShellExecute = false,
+				FileName = GeneratorPath,
+				Arguments = $"{project.GeneratorOptions}" +
+					$" {(File.Exists (project.GeneratedApiXmlFile) ? project.GeneratedApiXmlFile : string.Empty)}" +
+					$" {string.Join (" ", apiXmlFiles.Select (s => '"' + s + '"'))}" +
+					$" {string.Join (" ", metadataFiles.Select (s => " --fixup=\"" + s + '"'))}" +
+					$" {string.Join (" ", project.ReferenceDlls.Select (s => " -r \"" + s + '"'))}" +
+					$" --csdir=\"{project.GeneratedCSharpSourceDirectory}\"",
+				RedirectStandardOutput = true,
+				RedirectStandardError = true,
+			};
+
+			project.GeneratorExecutionOutput = $"Execute generator as: {psi.FileName} {psi.Arguments}\n";
+
+			var proc = new Process () { StartInfo = psi };
+			proc.OutputDataReceived += (sender, e) => project.GeneratorExecutionOutput += e.Data;
+			proc.ErrorDataReceived += (sender, e) => project.GeneratorExecutionOutput += e.Data;
+			proc.Start ();
+			proc.BeginOutputReadLine ();
+			proc.BeginErrorReadLine ();
+			proc.WaitForExit ();
+			if (proc.ExitCode != 0)
+				throw new Exception ("generator failed: " + project.GeneratorExecutionOutput);
+		}
+
+		void CompileBindings ()
+		{
+		}
+	}
+}
+