Skip to content

[MRESOLVER-373] Make GavNameResolver to distinguish names better #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2023
Merged

[MRESOLVER-373] Make GavNameResolver to distinguish names better #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,6 @@ public static NameMapper gav() {
}

public static NameMapper fileGav() {
return new GAVNameMapper(true, "", ".lock", "", ".lock", "~");
return new GAVNameMapper(true, "artifact~", ".lock", "metadata~", ".lock", "~");
}
}
8 changes: 4 additions & 4 deletions ...l/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void singleArtifact() {
Collection<String> names = mapper.nameLocks(session, singletonList(artifact), null);

assertThat(names, hasSize(1));
assertThat(names.iterator().next(), equalTo("group~artifact~1.0.lock"));
assertThat(names.iterator().next(), equalTo("artifact~group~artifact~1.0.lock"));
}

@Test
Expand All @@ -69,7 +69,7 @@ public void singleMetadata() {
Collection<String> names = mapper.nameLocks(session, null, singletonList(metadata));

assertThat(names, hasSize(1));
assertThat(names.iterator().next(), equalTo("group~artifact.lock"));
assertThat(names.iterator().next(), equalTo("metadata~group~artifact.lock"));
}

@Test
Expand All @@ -83,7 +83,7 @@ public void oneAndOne() {
Iterator<String> namesIterator = names.iterator();

// they are sorted as well
assertThat(namesIterator.next(), equalTo("agroup~artifact~1.0.lock"));
assertThat(namesIterator.next(), equalTo("bgroup~artifact.lock"));
assertThat(namesIterator.next(), equalTo("artifact~agroup~artifact~1.0.lock"));
assertThat(namesIterator.next(), equalTo("metadata~bgroup~artifact.lock"));
}
}