[MRESOLVER-586] Avoid copying the type default properties map (#535)

gsmet · web-flow · commit f1be3b94f472 · 2024-08-02T11:47:35.000+02:00
When we don't have specific properties for a DefaultArtifact, we can just reuse the type default properties map as it's readonly and immutable. The patch contains some additional changes as I renamed the method and parameters to make them more specific so that the method wouldn't be used for things that wouldn't be safe. --- https://issues.apache.org/jira/browse/MRESOLVER-586
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java
@@ -173,21 +173,27 @@ public DefaultArtifact(
         }
         this.version = emptify(version);
         this.file = null;
-        this.properties = merge(properties, (type != null) ? type.getProperties() : null);
+        this.properties = mergeArtifactProperties(properties, (type != null) ? type.getProperties() : null);
     }
 
-    private static Map<String, String> merge(Map<String, String> dominant, Map<String, String> recessive) {
+    private static Map<String, String> mergeArtifactProperties(
+            Map<String, String> artifactProperties, Map<String, String> typeDefaultProperties) {
         Map<String, String> properties;
 
-        if ((dominant == null || dominant.isEmpty()) && (recessive == null || recessive.isEmpty())) {
-            properties = Collections.emptyMap();
+        if (artifactProperties == null || artifactProperties.isEmpty()) {
+            if (typeDefaultProperties == null || typeDefaultProperties.isEmpty()) {
+                properties = Collections.emptyMap();
+            } else {
+                // type default properties are already unmodifiable
+                return typeDefaultProperties;
+            }
         } else {
             properties = new HashMap<>();
-            if (recessive != null) {
-                properties.putAll(recessive);
+            if (typeDefaultProperties != null) {
+                properties.putAll(typeDefaultProperties);
             }
-            if (dominant != null) {
-                properties.putAll(dominant);
+            if (artifactProperties != null) {
+                properties.putAll(artifactProperties);
             }
             properties = Collections.unmodifiableMap(properties);
         }
