(maven-resolver) branch master updated: Cleanup prefix and others (#1670)

[cstamas]

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new 0362881a8 Cleanup prefix and others (#1670)
0362881a8 is described below

commit 0362881a8f10fc7674c3e922977f9750b60ecab3
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Nov 20 16:25:49 2025 +0100

    Cleanup prefix and others (#1670)
    
    Just rename things to reflect what they are, and do not perform work if not 
needed.
---
 .../impl/filter/PrefixesRemoteRepositoryFilterSource.java    |  4 ++--
 .../internal/impl/synccontext/named/GAVNameMapper.java       | 12 +++++++-----
 .../impl/synccontext/named/BasedirHashingNameMapperTest.java |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/PrefixesRemoteRepositoryFilterSource.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/PrefixesRemoteRepositoryFilterSource.java
index 806cfef96..854560a59 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/PrefixesRemoteRepositoryFilterSource.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/PrefixesRemoteRepositoryFilterSource.java
@@ -82,7 +82,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
@@ -340,7 +340,7 @@ public final class PrefixesRemoteRepositoryFilterSource 
extends RemoteRepository
                     .get(0);
             // retrieve prefix as metadata from repository
             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));
             request.setRepository(prepared);
             request.setDeleteLocalCopyIfMissing(true);
             request.setFavorLocalRepository(true);
diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java
index dc21b4438..4f26137e4 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java
@@ -87,8 +87,8 @@ public class GAVNameMapper implements NameMapper {
         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;
@@ -106,7 +106,8 @@ public class GAVNameMapper implements NameMapper {
 
     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();
@@ -117,11 +118,12 @@ public class GAVNameMapper implements NameMapper {
                 }
             }
             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;
diff --git 
a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirHashingNameMapperTest.java
 
b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirHashingNameMapperTest.java
index feea3b1ea..226cc0f36 100644
--- 
a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirHashingNameMapperTest.java
+++ 
b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirHashingNameMapperTest.java
@@ -129,7 +129,7 @@ public class BasedirHashingNameMapperTest extends 
NameMapperTestSupport {
         assertEquals(1, names.size());
         assertEquals(
                 names.iterator().next().name(),
-                basedir.toUri() + PS + ".locks" + PS + 
"520e2ba3a365db8cd804bcc40df38e1a52987e0f");
+                basedir.toUri() + PS + ".locks" + PS + 
"d7e4ca43a23278042698fe526287af16b18f8791");
     }
 
     @Test