Address review feedback.

Author: jpobst

src/Java.Interop.Tools.Maven/Extensions/PropertyStack.cs

@@ -32,6 +32,9 @@ public void Pop ()
 
 	public string Apply (string value)
 	{
+		if (stack.Count == 0 || !value.Contains ("${"))
+			return value;
+
 		foreach (var property_set in stack) {
 			foreach (var prop in property_set)
 				value = value.Replace ($"${{{prop.Key}}}", prop.Value);

src/Java.Interop.Tools.Maven/Models/Project.cs

@@ -10,6 +10,7 @@
 // https://github.com/mganss/XmlSchemaClassGenerator
 // This code was generated by XmlSchemaClassGenerator version 2.1.1057.0 using the following command:
 // xscgen maven-4.0.0.xsd --nullable --nc --nr
+// Schema from: https://maven.apache.org/xsd/maven-4.0.0.xsd
 namespace Java.Interop.Tools.Maven.Models
 {
 
@@ -226,7 +227,7 @@ public bool LicensesSpecified
         /// <summary>
         /// <para xml:lang="en">Initializes a new instance of the <see cref="Model" /> class.</para>
         /// </summary>
-        public Project()
+        internal Project()
         {
             this._licenses = new System.Collections.ObjectModel.Collection<License>();
             this._developers = new System.Collections.ObjectModel.Collection<Developer>();

src/Java.Interop.Tools.Maven/Repositories/CachedMavenRepository.cs

@@ -47,13 +47,12 @@ public bool TryGetFilePath (Artifact artifact, string filename, [NotNullWhen (tr
 			return true;
 		}
 
-		Directory.CreateDirectory (directory);
-
 		if (repository.TryGetFile (artifact, filename, out var repo_stream)) {
-			using (var sw = File.Create (file))
-				repo_stream!.CopyTo (sw);
+			Directory.CreateDirectory (directory);
 
-			using (repo_stream) { }
+			using (var sw = File.Create (file))
+			using (repo_stream)
+				repo_stream.CopyTo (sw);
 
 			path = file;
 			return true;
@@ -70,13 +69,13 @@ public bool TryGetFilePath (Artifact artifact, string filename, [NotNullWhen (tr
 		if (File.Exists (file))
 			return file;
 
-		Directory.CreateDirectory (directory);
-
 		if (repository.TryGetFile (artifact, filename, out var repo_stream)) {
+			Directory.CreateDirectory (directory);
+
 			using (var sw = File.Create (file))
-				await repo_stream!.CopyToAsync (sw, 81920, cancellationToken);
+			using (repo_stream)
+				await repo_stream.CopyToAsync (sw, 81920, cancellationToken);
 
-			using (repo_stream) { }
 
 			return file;
 		}

src/Java.Interop.Tools.Maven/Repositories/IMavenRepository.cs

@@ -6,7 +6,8 @@ namespace Java.Interop.Tools.Maven.Repositories;
 
 public interface IMavenRepository
 {
-	// This name is used for on-disk caching purposes, and thus must be compatible with file system naming rules.
+	// The on-disk cache for this repository will be in a sub-directory with this name, and thus must be
+	// compatible with file system naming rules. For example, "central" or "google".
 	string Name { get; }
 	bool TryGetFile (Artifact artifact, string filename, [NotNullWhen (true)] out Stream? stream);
 }

src/Java.Interop.Tools.Maven/Repositories/MavenRepository.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Net.Http;
@@ -9,30 +8,31 @@ namespace Java.Interop.Tools.Maven.Repositories;
 public class MavenRepository : IMavenRepository
 {
 	readonly string base_url;
-	readonly HttpClient client;
+	static readonly HttpClient client;
 
 	public string Name { get; }
 
 	public MavenRepository (string baseUrl, string name)
 	{
 		Name = name;
-		base_url = baseUrl;
+		base_url = baseUrl.TrimEnd ('/');
+	}
 
-		client = new HttpClient {
-			BaseAddress = new Uri (base_url)
-		};
+	static MavenRepository ()
+	{
+		client = new HttpClient ();
 	}
 
 	public bool TryGetFile (Artifact artifact, string filename, [NotNullWhen (true)] out Stream? stream)
 	{
 		// ex: https://repo1.maven.org/maven2/dev/chrisbanes/snapper/snapper/0.3.0/{filename}
-		var file = $"{artifact.GroupId.Replace ('.', '/')}/{artifact.Id}/{artifact.Version}/{filename}";
+		var file = $"{base_url}/{artifact.GroupId.Replace ('.', '/')}/{artifact.Id}/{artifact.Version}/{filename}";
 		stream = client.GetStreamAsync (file).Result;
 
 		return true;
 	}
 
-	public static MavenRepository Google = new MavenRepository ("https://dl.google.com/android/maven2/", "google");
+	public static readonly MavenRepository Google = new MavenRepository ("https://dl.google.com/android/maven2/", "google");
 
-	public static MavenRepository Central = new MavenRepository ("https://repo1.maven.org/maven2/", "central");
+	public static readonly MavenRepository Central = new MavenRepository ("https://repo1.maven.org/maven2/", "central");
 }

tests/Java.Interop.Tools.Maven-Tests/Extensions/TestDataExtensions.cs

@@ -7,20 +7,26 @@ static class TestDataExtensions
 {
 	public static Project CreateProject (Artifact artifact, Project? parent = null)
 	{
-		var p = new Project {
-			GroupId = artifact.GroupId,
-			ArtifactId = artifact.Id,
-			Version = artifact.Version,
-		};
+		var xml = new XDocument (
+			new XElement ("project",
+				new XElement ("modelVersion", "4.0.0"),
+				new XElement ("groupId", artifact.GroupId),
+				new XElement ("artifactId", artifact.Id),
+				new XElement ("version", artifact.Version)
+				)
+			);
 
-		if (parent is not null)
-			p.Parent = new Parent {
-				GroupId = parent.GroupId,
-				ArtifactId = parent.ArtifactId,
-				Version = parent.Version,
-			};
+		if (parent is not null) {
+			var parent_xml = new XElement ("parent",
+				new XElement ("groupId", parent.GroupId),
+				new XElement ("artifactId", parent.ArtifactId),
+				new XElement ("version", parent.Version)
+			);
 
-		return p;
+			xml.Root!.Add (parent_xml);
+		}
+
+		return Project.ParseXml (xml.ToString ());
 	}
 
 	public static void AddProperty (this Project project, string key, string value)