Skip to content

Commit 17cb16e

Browse files
gnodetgnodet
committed
Cleanup
1 parent b9df9f5 commit 17cb16e

File tree

1 file changed

+11
-56
lines changed
  • maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone

1 file changed

+11
-56
lines changed

‎maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java

Lines changed: 11 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -75,67 +75,13 @@ public static Session createSession() {
7575
injector.bindInstance(Injector.class, injector);
7676
injector.bindImplicit(ApiRunner.class);
7777
injector.discover(ApiRunner.class.getClassLoader());
78-
79-
// injector.bindImplicit(DefaultArtifactCoordinatesFactory.class);
80-
// injector.bindImplicit(DefaultArtifactDeployer.class);
81-
// injector.bindImplicit(DefaultArtifactFactory.class);
82-
// injector.bindImplicit(DefaultArtifactInstaller.class);
83-
// injector.bindImplicit(DefaultArtifactResolver.class);
84-
// injector.bindImplicit(DefaultChecksumAlgorithmService.class);
85-
// injector.bindImplicit(DefaultDependencyResolver.class);
86-
// injector.bindImplicit(DefaultDependencyCoordinatesFactory.class);
87-
// injector.bindImplicit(DefaultLocalRepositoryManager.class);
88-
// injector.bindImplicit(DefaultMessageBuilderFactory.class);
89-
// injector.bindImplicit(DefaultModelXmlFactory.class);
90-
// injector.bindImplicit(DefaultRepositoryFactory.class);
91-
// injector.bindImplicit(DefaultSettingsBuilder.class);
92-
// injector.bindImplicit(DefaultSettingsXmlFactory.class);
93-
// injector.bindImplicit(DefaultToolchainsBuilder.class);
94-
// injector.bindImplicit(DefaultToolchainsXmlFactory.class);
95-
// injector.bindImplicit(DefaultTransportProvider.class);
96-
// injector.bindImplicit(DefaultVersionParser.class);
97-
// injector.bindImplicit(DefaultVersionRangeResolver.class);
98-
// injector.bindImplicit(org.apache.maven.internal.impl.DefaultVersionParser.class);
99-
// injector.bindImplicit(org.apache.maven.internal.impl.DefaultVersionRangeResolver.class);
100-
// injector.bindImplicit(DefaultVersionResolver.class);
101-
// injector.bindImplicit(ExtensibleEnumRegistries.class);
102-
// injector.bindImplicit(DefaultTypeProvider.class);
103-
//
104-
// injector.bindImplicit(MavenVersionScheme.class);
105-
// injector.bindImplicit(BuildModelTransformer.class);
106-
// injector.bindImplicit(DefaultDependencyManagementImporter.class);
107-
// injector.bindImplicit(DefaultDependencyManagementInjector.class);
108-
// injector.bindImplicit(DefaultModelBuilder.class);
109-
// injector.bindImplicit(DefaultModelProcessor.class);
110-
// injector.bindImplicit(DefaultModelValidator.class);
111-
// injector.bindImplicit(DefaultModelVersionProcessor.class);
112-
// injector.bindImplicit(DefaultModelNormalizer.class);
113-
// injector.bindImplicit(DefaultModelInterpolator.class);
114-
// injector.bindImplicit(DefaultPathTranslator.class);
115-
// injector.bindImplicit(DefaultRootLocator.class);
116-
// injector.bindImplicit(DefaultModelPathTranslator.class);
117-
// injector.bindImplicit(DefaultUrlNormalizer.class);
118-
// injector.bindImplicit(DefaultModelUrlNormalizer.class);
119-
// injector.bindImplicit(DefaultSuperPomProvider.class);
120-
// injector.bindImplicit(DefaultInheritanceAssembler.class);
121-
// injector.bindImplicit(DefaultProfileInjector.class);
122-
// injector.bindImplicit(DefaultProfileSelector.class);
123-
// injector.bindImplicit(DefaultPluginManagementInjector.class);
124-
// injector.bindImplicit(DefaultLifecycleBindingsInjector.class);
125-
// injector.bindImplicit(DefaultPluginConfigurationExpander.class);
126-
// injector.bindImplicit(ProfileActivationFilePathInterpolator.class);
127-
// injector.bindImplicit(DefaultModelVersionParser.class);
128-
//
129-
// injector.bindImplicit(ProfileActivator.class);
130-
// injector.bindImplicit(ModelParser.class);
131-
13278
return injector.getInstance(Session.class);
13379
}
13480

13581
static class DefaultSession extends AbstractSession {
13682

13783
private final Map<String, String> systemProperties;
138-
private Instant startTime = Instant.now();
84+
private final Instant startTime = Instant.now();
13985

14086
DefaultSession(RepositorySystemSession session, RepositorySystem repositorySystem, Lookup lookup) {
14187
this(session, repositorySystem, Collections.emptyList(), null, lookup);
@@ -149,7 +95,7 @@ protected DefaultSession(
14995
Lookup lookup) {
15096
super(session, repositorySystem, repositories, resolverRepositories, lookup);
15197
systemProperties = System.getenv().entrySet().stream()
152-
.collect(Collectors.toMap(e -> "env." + e.getKey(), e -> e.getValue()));
98+
.collect(Collectors.toMap(e -> "env." + e.getKey(), Map.Entry::getValue));
15399
System.getProperties().forEach((k, v) -> systemProperties.put(k.toString(), v.toString()));
154100
}
155101

@@ -220,6 +166,7 @@ public Map<String, Object> getPluginContext(Project project) {
220166
}
221167

222168
@Provides
169+
@SuppressWarnings("unused")
223170
static Lookup newLookup(Injector injector) {
224171
return new Lookup() {
225172
@Override
@@ -271,6 +218,7 @@ public <T> Map<String, T> lookupMap(Class<T> type) {
271218
}
272219

273220
@Provides
221+
@SuppressWarnings("unused")
274222
static ArtifactManager newArtifactManager() {
275223
return new ArtifactManager() {
276224
private final Map<Artifact, Path> paths = new ConcurrentHashMap<>();
@@ -288,11 +236,13 @@ public void setPath(ProducedArtifact artifact, Path path) {
288236
}
289237

290238
@Provides
239+
@SuppressWarnings("unused")
291240
static PackagingRegistry newPackagingRegistry(TypeRegistry typeRegistry) {
292241
return id -> Optional.of(new DumbPackaging(id, typeRegistry.require(id), Map.of()));
293242
}
294243

295244
@Provides
245+
@SuppressWarnings("unused")
296246
static TypeRegistry newTypeRegistry(List<TypeProvider> providers) {
297247
return new TypeRegistry() {
298248
@Override
@@ -306,6 +256,7 @@ public Optional<Type> lookup(String id) {
306256
}
307257

308258
@Provides
259+
@SuppressWarnings("unused")
309260
static LifecycleRegistry newLifecycleRegistry() {
310261
return new LifecycleRegistry() {
311262

@@ -327,21 +278,25 @@ public List<String> computePhases(Lifecycle lifecycle) {
327278
}
328279

329280
@Provides
281+
@SuppressWarnings("unused")
330282
static RepositorySystemSupplier newRepositorySystemSupplier() {
331283
return new RepositorySystemSupplier();
332284
}
333285

334286
@Provides
287+
@SuppressWarnings("unused")
335288
static RepositorySystem newRepositorySystem(RepositorySystemSupplier repositorySystemSupplier) {
336289
return repositorySystemSupplier.getRepositorySystem();
337290
}
338291

339292
@Provides
293+
@SuppressWarnings("unused")
340294
static RemoteRepositoryManager newRemoteRepositoryManager(RepositorySystemSupplier repositorySystemSupplier) {
341295
return repositorySystemSupplier.getRemoteRepositoryManager();
342296
}
343297

344298
@Provides
299+
@SuppressWarnings("unused")
345300
static Session newSession(RepositorySystem system, Lookup lookup) {
346301
Map<String, String> properties = new HashMap<>();
347302
// Env variables prefixed with "env."

0 commit comments

Comments
 (0)