Skip to content

Commit 345f55d

Browse files
authored
[MRESOLVER-405] Get rid of component name free string literals (#330)
Use NAME constants instead. --- https://issues.apache.org/jira/browse/MRESOLVER-405
1 parent 4605205 commit 345f55d

File tree

9 files changed

+23
-12
lines changed

9 files changed

+23
-12
lines changed

maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@
4444
* {@link org.eclipse.aether.spi.connector.transport.TransporterFactory transporters} and
4545
* {@link org.eclipse.aether.spi.connector.layout.RepositoryLayoutFactory repository layouts} for the transfers.
4646
*/
47-
@Named("basic")
47+
@Named(BasicRepositoryConnectorFactory.NAME)
4848
public final class BasicRepositoryConnectorFactory implements RepositoryConnectorFactory, Service {
49+
public static final String NAME = "basic";
4950
private TransporterProvider transporterProvider;
5051

5152
private RepositoryLayoutProvider layoutProvider;

maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@
4141
* emulating physically separated artifact caches per remote repository.
4242
*/
4343
@Singleton
44-
@Named("enhanced")
44+
@Named(EnhancedLocalRepositoryManagerFactory.NAME)
4545
public class EnhancedLocalRepositoryManagerFactory implements LocalRepositoryManagerFactory, Service {
46+
public static final String NAME = "enhanced";
4647
private static final String CONFIG_PROP_TRACKING_FILENAME = "aether.enhancedLocalRepository.trackingFilename";
4748

4849
private static final String DEFAULT_TRACKING_FILENAME = "_remote.repositories";

maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@
4949
* Provides a Maven-2 repository layout for repositories with content type {@code "default"}.
5050
*/
5151
@Singleton
52-
@Named("maven2")
52+
@Named(Maven2RepositoryLayoutFactory.NAME)
5353
public final class Maven2RepositoryLayoutFactory implements RepositoryLayoutFactory {
54+
public static final String NAME = "maven2";
5455

5556
public static final String CONFIG_PROP_CHECKSUMS_ALGORITHMS = "aether.checksums.algorithms";
5657

maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@
3636
* Creates local repository managers for repository type {@code "simple"}.
3737
*/
3838
@Singleton
39-
@Named("simple")
39+
@Named(SimpleLocalRepositoryManagerFactory.NAME)
4040
public class SimpleLocalRepositoryManagerFactory implements LocalRepositoryManagerFactory, Service {
41+
public static final String NAME = "simple";
4142
private float priority;
4243

4344
private LocalPathComposer localPathComposer;

maven-resolver-supplier/src/main/java/org/eclipse/aether/supplier/RepositorySystemSupplier.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,9 @@ protected ChecksumAlgorithmFactorySelector getChecksumAlgorithmFactorySelector(
220220
protected Map<String, RepositoryLayoutFactory> getRepositoryLayoutFactories(
221221
ChecksumAlgorithmFactorySelector checksumAlgorithmFactorySelector) {
222222
HashMap<String, RepositoryLayoutFactory> result = new HashMap<>();
223-
result.put("maven2", new Maven2RepositoryLayoutFactory(checksumAlgorithmFactorySelector));
223+
result.put(
224+
Maven2RepositoryLayoutFactory.NAME,
225+
new Maven2RepositoryLayoutFactory(checksumAlgorithmFactorySelector));
224226
return result;
225227
}
226228

@@ -303,8 +305,8 @@ protected Map<String, ChecksumExtractor> getChecksumExtractors() {
303305

304306
protected Map<String, TransporterFactory> getTransporterFactories(Map<String, ChecksumExtractor> extractors) {
305307
HashMap<String, TransporterFactory> result = new HashMap<>();
306-
result.put("file", new FileTransporterFactory());
307-
result.put("http", new HttpTransporterFactory(extractors));
308+
result.put(FileTransporterFactory.NAME, new FileTransporterFactory());
309+
result.put(HttpTransporterFactory.NAME, new HttpTransporterFactory(extractors));
308310
return result;
309311
}
310312

@@ -329,7 +331,7 @@ protected BasicRepositoryConnectorFactory getBasicRepositoryConnectorFactory(
329331
protected Map<String, RepositoryConnectorFactory> getRepositoryConnectorFactories(
330332
BasicRepositoryConnectorFactory basicRepositoryConnectorFactory) {
331333
HashMap<String, RepositoryConnectorFactory> result = new HashMap<>();
332-
result.put("basic", basicRepositoryConnectorFactory);
334+
result.put(BasicRepositoryConnectorFactory.NAME, basicRepositoryConnectorFactory);
333335
return result;
334336
}
335337

maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@
3636
* <p>
3737
* <em>Note:</em> Such repositories are read-only and uploads to them are generally not supported.
3838
*/
39-
@Named("classpath")
39+
@Named(ClasspathTransporterFactory.NAME)
4040
public final class ClasspathTransporterFactory implements TransporterFactory {
41+
public static final String NAME = "classpath";
4142

4243
/**
4344
* The key in the repository session's {@link RepositorySystemSession#getConfigProperties() configuration

maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@
3131
/**
3232
* A transporter factory for repositories using the {@code file:} protocol.
3333
*/
34-
@Named("file")
34+
@Named(FileTransporterFactory.NAME)
3535
public final class FileTransporterFactory implements TransporterFactory {
36+
public static final String NAME = "file";
3637

3738
private float priority;
3839

maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@
3737
* A transporter factory for repositories using the {@code http:} or {@code https:} protocol. The provided transporters
3838
* support uploads to WebDAV servers and resumable downloads.
3939
*/
40-
@Named("http")
40+
@Named(HttpTransporterFactory.NAME)
4141
public final class HttpTransporterFactory implements TransporterFactory {
42+
public static final String NAME = "http";
43+
4244
private static Map<String, ChecksumExtractor> getManuallyCreatedExtractors() {
4345
HashMap<String, ChecksumExtractor> map = new HashMap<>();
4446
map.put(Nexus2ChecksumExtractor.NAME, new Nexus2ChecksumExtractor());

maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@
3636
* that this factory merely serves as an adapter to the Wagon API and by itself does not provide any transport services
3737
* unless one or more wagon implementations are registered with the {@link WagonProvider}.
3838
*/
39-
@Named("wagon")
39+
@Named(WagonTransporterFactory.NAME)
4040
public final class WagonTransporterFactory implements TransporterFactory, Service {
41+
public static final String NAME = "wagon";
4142

4243
private WagonProvider wagonProvider;
4344

0 commit comments

Comments
 (0)