Skip to content

Cleanup prefix and others #1670

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+10 −8
Open

Cleanup prefix and others #1670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b3c3dc
Cleanup prefix and others
cstamas Nov 17, 2025
627c940
Reformat
cstamas Nov 17, 2025
b19ad9c
Fixes
cstamas Nov 17, 2025
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
4 changes: 2 additions & 2 deletions ...in/java/org/eclipse/aether/internal/impl/filter/PrefixesRemoteRepositoryFilterSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public final class PrefixesRemoteRepositoryFilterSource extends RemoteRepository
private static final String CONFIG_PROPS_PREFIX =
RemoteRepositoryFilterSourceSupport.CONFIG_PROPS_PREFIX + NAME + ".";

private static final String PREFIX_FILE_PATH = ".meta/prefixes.txt";
private static final String PREFIX_FILE_TYPE = ".meta/prefixes.txt";

/**
* Configuration to enable the Prefixes filter (enabled by default). Can be fine-tuned per repository using
Expand Down Expand Up @@ -289,7 +289,7 @@ private Path resolvePrefixesFromRemoteRepository(
// supplier for path
Supplier<Path> supplier = () -> {
MetadataRequest request =
new MetadataRequest(new DefaultMetadata(PREFIX_FILE_PATH, Metadata.Nature.RELEASE_OR_SNAPSHOT));
new MetadataRequest(new DefaultMetadata(PREFIX_FILE_TYPE, Metadata.Nature.RELEASE_OR_SNAPSHOT));
// use unique repository; this will result in prefix (repository metadata) cached under unique id
request.setRepository(unique);
request.setDeleteLocalCopyIfMissing(true);
Expand Down
12 changes: 7 additions & 5 deletions ...-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 @@ -87,8 +87,8 @@ public Collection<NamedLockKey> nameLocks(
if (metadatas != null) {
for (Metadata metadata : metadatas) {
keys.add(NamedLockKey.of(
getMetadataName(metadata, metadataPrefix, fieldSeparator, metadataSuffix),
getMetadataName(metadata, "", ":", "")));
getMetadataName(metadata, fileSystemFriendly, metadataPrefix, fieldSeparator, metadataSuffix),
getMetadataName(metadata, false, "", ":", "")));
}
}
return keys;
Expand All @@ -106,7 +106,8 @@ private static String getArtifactName(Artifact artifact, String prefix, String s

private static final String MAVEN_METADATA = "maven-metadata.xml";

private static String getMetadataName(Metadata metadata, String prefix, String separator, String suffix) {
private static String getMetadataName(
Metadata metadata, boolean fileSystemFriendly, String prefix, String separator, String suffix) {
String name = prefix;
if (!metadata.getGroupId().isEmpty()) {
name += metadata.getGroupId();
Expand All @@ -117,11 +118,12 @@ private static String getMetadataName(Metadata metadata, String prefix, String s
}
}
if (!MAVEN_METADATA.equals(metadata.getType())) {
name += separator + PathUtils.stringToPathSegment(metadata.getType());
name += separator
+ (fileSystemFriendly ? PathUtils.stringToPathSegment(metadata.getType()) : metadata.getType());
}
} else {
if (!MAVEN_METADATA.equals(metadata.getType())) {
name += PathUtils.stringToPathSegment(metadata.getType());
name += (fileSystemFriendly ? PathUtils.stringToPathSegment(metadata.getType()) : metadata.getType());
}
}
return name + suffix;
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/eclipse/aether/internal/impl/synccontext/named/BasedirHashingNameMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void prefixMetadata() {
assertEquals(1, names.size());
assertEquals(
names.iterator().next().name(),
basedir.toUri() + PS + ".locks" + PS + "520e2ba3a365db8cd804bcc40df38e1a52987e0f");
basedir.toUri() + PS + ".locks" + PS + "d7e4ca43a23278042698fe526287af16b18f8791");
}

@Test
Expand Down
Loading