[MNG-8218] Always normalize Path in PathSource (#1684)

gnodet · web-flow · commit c948b2648472 · 2024-08-29T19:44:16.000+02:00
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/PathSource.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/PathSource.java
@@ -35,8 +35,8 @@ class PathSource implements ModelSource {
     }
 
     PathSource(Path path, String location) {
-        this.path = path;
-        this.location = location != null ? location : path.toString();
+        this.path = path.normalize();
+        this.location = location != null ? location : this.path.toString();
     }
 
     @Override
@@ -65,7 +65,7 @@ public ModelSource resolve(ModelLocator locator, String relative) {
         Path path = getPath().getParent().resolve(norm);
         Path relatedPom = locator.locateExistingPom(path);
         if (relatedPom != null) {
-            return new PathSource(relatedPom.normalize(), null);
+            return new PathSource(relatedPom);
         }
         return null;
     }

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ class PathSource implements ModelSource {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`PathSource(Path path, String location) {`
`38`		`- this.path = path;`
`39`		`- this.location = location != null ? location : path.toString();`
	`38`	`+ this.path = path.normalize();`
	`39`	`+ this.location = location != null ? location : this.path.toString();`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`@@ -65,7 +65,7 @@ public ModelSource resolve(ModelLocator locator, String relative) {`
`65`	`65`	`Path path = getPath().getParent().resolve(norm);`
`66`	`66`	`Path relatedPom = locator.locateExistingPom(path);`
`67`	`67`	`if (relatedPom != null) {`
`68`		`- return new PathSource(relatedPom.normalize(), null);`
	`68`	`+ return new PathSource(relatedPom);`
`69`	`69`	`}`
`70`	`70`	`return null;`
`71`	`71`	`}`