Skip to content

Commit

Permalink
fix (model): Fix bug with repository_url in Maven GAVR.toPkgURL() for…
Browse files Browse the repository at this point in the history
… Package URLs
  • Loading branch information
vorburger committed Feb 8, 2025
1 parent 6b42d3f commit 2133bbc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion java/dev/enola/model/enola/maven/connect/mima/GAVR.java
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public String toPkgURL() {
builder.withQualifier("classifier", classifier);
}
if (!repo.isEmpty()) {
builder.withQualifier("repository_url", classifier);
builder.withQualifier("repository_url", repo);
}
try {
return builder.build().canonicalize();
Expand Down
9 changes: 9 additions & 0 deletions java/dev/enola/model/enola/maven/connect/mima/GAVRTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ public void parseGavAndPkg() {
"pkg:maven/ch.vorburger.mariaDB4j/mariaDB4j-core@3.1.0?classifier=dist&type=zip");
}

@Test
public void parsePkg() {
var purl =
"pkg:maven/ch.vorburger.mariaDB4j/mariaDB4j-core@3.1.0?repository_url=https%3A%2F%2Fmaven.google.com&type=pom";
var gavr = GAVR.parsePkgURL(purl);
assertThat(gavr.repo()).isEqualTo("https://maven.google.com");
assertThat(gavr.toGAV()).isEqualTo("ch.vorburger.mariaDB4j:mariaDB4j-core:pom:3.1.0");
}

private void check(String gav, String purl) {
checkFromAndToGAV(gav);
checkFromAndToPkgURL(purl);
Expand Down

0 comments on commit 2133bbc

Please sign in to comment.