From 345f55dabd9519016b4c347f52152e55195d8e79 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 8 Sep 2023 16:08:09 +0200 Subject: [PATCH] [MRESOLVER-405] Get rid of component name free string literals (#330) Use NAME constants instead. --- https://issues.apache.org/jira/browse/MRESOLVER-405 --- .../basic/BasicRepositoryConnectorFactory.java | 3 ++- .../impl/EnhancedLocalRepositoryManagerFactory.java | 3 ++- .../internal/impl/Maven2RepositoryLayoutFactory.java | 3 ++- .../impl/SimpleLocalRepositoryManagerFactory.java | 3 ++- .../aether/supplier/RepositorySystemSupplier.java | 10 ++++++---- .../classpath/ClasspathTransporterFactory.java | 3 ++- .../aether/transport/file/FileTransporterFactory.java | 3 ++- .../aether/transport/http/HttpTransporterFactory.java | 4 +++- .../transport/wagon/WagonTransporterFactory.java | 3 ++- 9 files changed, 23 insertions(+), 12 deletions(-) diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java index 76dc3116d..15470d3e3 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java +++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java @@ -44,8 +44,9 @@ * {@link org.eclipse.aether.spi.connector.transport.TransporterFactory transporters} and * {@link org.eclipse.aether.spi.connector.layout.RepositoryLayoutFactory repository layouts} for the transfers. */ -@Named("basic") +@Named(BasicRepositoryConnectorFactory.NAME) public final class BasicRepositoryConnectorFactory implements RepositoryConnectorFactory, Service { + public static final String NAME = "basic"; private TransporterProvider transporterProvider; private RepositoryLayoutProvider layoutProvider; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java index ec1c5583c..a0e0a558d 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java @@ -41,8 +41,9 @@ * emulating physically separated artifact caches per remote repository. */ @Singleton -@Named("enhanced") +@Named(EnhancedLocalRepositoryManagerFactory.NAME) public class EnhancedLocalRepositoryManagerFactory implements LocalRepositoryManagerFactory, Service { + public static final String NAME = "enhanced"; private static final String CONFIG_PROP_TRACKING_FILENAME = "aether.enhancedLocalRepository.trackingFilename"; private static final String DEFAULT_TRACKING_FILENAME = "_remote.repositories"; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java index e9a1ccd70..8e52d18e8 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java @@ -49,8 +49,9 @@ * Provides a Maven-2 repository layout for repositories with content type {@code "default"}. */ @Singleton -@Named("maven2") +@Named(Maven2RepositoryLayoutFactory.NAME) public final class Maven2RepositoryLayoutFactory implements RepositoryLayoutFactory { + public static final String NAME = "maven2"; public static final String CONFIG_PROP_CHECKSUMS_ALGORITHMS = "aether.checksums.algorithms"; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java index 1fe6d19eb..68974b304 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java @@ -36,8 +36,9 @@ * Creates local repository managers for repository type {@code "simple"}. */ @Singleton -@Named("simple") +@Named(SimpleLocalRepositoryManagerFactory.NAME) public class SimpleLocalRepositoryManagerFactory implements LocalRepositoryManagerFactory, Service { + public static final String NAME = "simple"; private float priority; private LocalPathComposer localPathComposer; diff --git a/maven-resolver-supplier/src/main/java/org/eclipse/aether/supplier/RepositorySystemSupplier.java b/maven-resolver-supplier/src/main/java/org/eclipse/aether/supplier/RepositorySystemSupplier.java index f20023352..13616c523 100644 --- a/maven-resolver-supplier/src/main/java/org/eclipse/aether/supplier/RepositorySystemSupplier.java +++ b/maven-resolver-supplier/src/main/java/org/eclipse/aether/supplier/RepositorySystemSupplier.java @@ -220,7 +220,9 @@ protected ChecksumAlgorithmFactorySelector getChecksumAlgorithmFactorySelector( protected Map getRepositoryLayoutFactories( ChecksumAlgorithmFactorySelector checksumAlgorithmFactorySelector) { HashMap result = new HashMap<>(); - result.put("maven2", new Maven2RepositoryLayoutFactory(checksumAlgorithmFactorySelector)); + result.put( + Maven2RepositoryLayoutFactory.NAME, + new Maven2RepositoryLayoutFactory(checksumAlgorithmFactorySelector)); return result; } @@ -303,8 +305,8 @@ protected Map getChecksumExtractors() { protected Map getTransporterFactories(Map extractors) { HashMap result = new HashMap<>(); - result.put("file", new FileTransporterFactory()); - result.put("http", new HttpTransporterFactory(extractors)); + result.put(FileTransporterFactory.NAME, new FileTransporterFactory()); + result.put(HttpTransporterFactory.NAME, new HttpTransporterFactory(extractors)); return result; } @@ -329,7 +331,7 @@ protected BasicRepositoryConnectorFactory getBasicRepositoryConnectorFactory( protected Map getRepositoryConnectorFactories( BasicRepositoryConnectorFactory basicRepositoryConnectorFactory) { HashMap result = new HashMap<>(); - result.put("basic", basicRepositoryConnectorFactory); + result.put(BasicRepositoryConnectorFactory.NAME, basicRepositoryConnectorFactory); return result; } diff --git a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java b/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java index 772a28e53..c0a6c6133 100644 --- a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java +++ b/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java @@ -36,8 +36,9 @@ *

* Note: Such repositories are read-only and uploads to them are generally not supported. */ -@Named("classpath") +@Named(ClasspathTransporterFactory.NAME) public final class ClasspathTransporterFactory implements TransporterFactory { + public static final String NAME = "classpath"; /** * The key in the repository session's {@link RepositorySystemSession#getConfigProperties() configuration diff --git a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java b/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java index 1b4753295..168cb9734 100644 --- a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java +++ b/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java @@ -31,8 +31,9 @@ /** * A transporter factory for repositories using the {@code file:} protocol. */ -@Named("file") +@Named(FileTransporterFactory.NAME) public final class FileTransporterFactory implements TransporterFactory { + public static final String NAME = "file"; private float priority; diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java index f11670485..8cd098b10 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java +++ b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java @@ -37,8 +37,10 @@ * A transporter factory for repositories using the {@code http:} or {@code https:} protocol. The provided transporters * support uploads to WebDAV servers and resumable downloads. */ -@Named("http") +@Named(HttpTransporterFactory.NAME) public final class HttpTransporterFactory implements TransporterFactory { + public static final String NAME = "http"; + private static Map getManuallyCreatedExtractors() { HashMap map = new HashMap<>(); map.put(Nexus2ChecksumExtractor.NAME, new Nexus2ChecksumExtractor()); diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java index bdac5e9d8..dcd354b89 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java +++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java @@ -36,8 +36,9 @@ * that this factory merely serves as an adapter to the Wagon API and by itself does not provide any transport services * unless one or more wagon implementations are registered with the {@link WagonProvider}. */ -@Named("wagon") +@Named(WagonTransporterFactory.NAME) public final class WagonTransporterFactory implements TransporterFactory, Service { + public static final String NAME = "wagon"; private WagonProvider wagonProvider;