Skip to content

Commit f133af8

Browse files
elharoelharo
authored
Remove redundant code (#2188)
1 parent cdb3e37 commit f133af8

File tree

16 files changed

+23
-30
lines changed

16 files changed

+23
-30
lines changed

Diff for: ‎compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public Object getValue(String expression) {
237237

238238
protected List<InterpolationPostProcessor> createPostProcessors(
239239
final Model model, final File projectDir, final ProjectBuilderConfiguration config) {
240-
return Collections.singletonList((InterpolationPostProcessor) new PathTranslatingPostProcessor(
240+
return Collections.singletonList(new PathTranslatingPostProcessor(
241241
PROJECT_PREFIXES, TRANSLATED_PATH_EXPRESSIONS, projectDir, pathTranslator));
242242
}
243243

Diff for: ‎compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,7 @@ private void processTreeNodes(MetadataGraphVertex parentVertex, MetadataTreeNode
128128
}
129129

130130
MetadataGraphVertex vertex = new MetadataGraphVertex(node.md, versionedVertices, scopedVertices);
131-
if (!vertices.contains(vertex)) {
132-
vertices.add(vertex);
133-
}
131+
vertices.add(vertex);
134132

135133
if (parentVertex != null) // then create the edge
136134
{

Diff for: ‎compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ public ResolutionGroup retrieve(
833833
throws ArtifactMetadataRetrievalException {
834834
String key = getKey(artifact);
835835

836-
ArtifactSpec a = (ArtifactSpec) artifacts.get(key);
836+
ArtifactSpec a = artifacts.get(key);
837837
try {
838838
return new ResolutionGroup(
839839
artifact,

Diff for: ‎compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.apache.maven.artifact.Artifact;
2626
import org.apache.maven.artifact.factory.ArtifactFactory;
27-
import org.apache.maven.artifact.repository.ArtifactRepository;
2827
import org.apache.maven.artifact.resolver.ResolutionNode;
2928
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
3029
import org.apache.maven.artifact.versioning.VersionRange;
@@ -116,10 +115,10 @@ protected Artifact createArtifact(String id, String version, String scope, Strin
116115
}
117116

118117
protected ResolutionNode createResolutionNode(Artifact artifact) {
119-
return new ResolutionNode(artifact, Collections.<ArtifactRepository>emptyList());
118+
return new ResolutionNode(artifact, Collections.emptyList());
120119
}
121120

122121
protected ResolutionNode createResolutionNode(Artifact artifact, ResolutionNode parent) {
123-
return new ResolutionNode(artifact, Collections.<ArtifactRepository>emptyList(), parent);
122+
return new ResolutionNode(artifact, Collections.emptyList(), parent);
124123
}
125124
}

Diff for: ‎compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ private ModelData readParentLocally(
893893
resolver.resolveRawModel(parent.getGroupId(), parent.getArtifactId(), parent.getVersion());
894894
} catch (UnresolvableModelException e) {
895895
problems.add(new ModelProblemCollectorRequest(Severity.FATAL, Version.BASE) //
896-
.setMessage(e.getMessage().toString())
896+
.setMessage(e.getMessage())
897897
.setLocation(parent.getLocation(""))
898898
.setException(e));
899899
throw problems.newModelBuildingException();
@@ -1194,7 +1194,7 @@ private void importDependencyManagement(
11941194
importModel = workspaceResolver.resolveEffectiveModel(groupId, artifactId, version);
11951195
} catch (UnresolvableModelException e) {
11961196
problems.add(new ModelProblemCollectorRequest(Severity.FATAL, Version.BASE)
1197-
.setMessage(e.getMessage().toString())
1197+
.setMessage(e.getMessage())
11981198
.setException(e));
11991199
continue;
12001200
}

Diff for: ‎compat/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class Result<T> {
4949
* @param model
5050
*/
5151
public static <T> Result<T> success(T model) {
52-
return success(model, Collections.<ModelProblem>emptyList());
52+
return success(model, Collections.emptyList());
5353
}
5454

5555
/**
@@ -91,7 +91,7 @@ public static <T> Result<T> error(Iterable<? extends ModelProblem> problems) {
9191
}
9292

9393
public static <T> Result<T> error(T model) {
94-
return error(model, Collections.<ModelProblem>emptyList());
94+
return error(model, Collections.emptyList());
9595
}
9696

9797
public static <T> Result<T> error(Result<?> result) {
@@ -190,7 +190,7 @@ public static <T> Result<Iterable<T>> newResultSet(Iterable<? extends Result<? e
190190
hasErrors = true;
191191
}
192192
}
193-
return new Result<>(hasErrors, (Iterable<T>) modelsList, problemsList);
193+
return new Result<>(hasErrors, modelsList, problemsList);
194194
}
195195

196196
// helper to determine if problems contain error

Diff for: ‎compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ObjectBasedValueSource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public ObjectBasedValueSource(Object root) {
6868
* accessor types to resolve the value for each successive expression part.
6969
* Finally, return the result of the last expression part's resolution.</p>
7070
*
71-
* <p><b>NOTE:</b> The object-graph nagivation actually takes place via the
71+
* <p><b>NOTE:</b> The object-graph navigation actually takes place via the
7272
* {@link ReflectionValueExtractor} class.</p>
7373
*/
7474
public Object getValue(String expression) {

Diff for: ‎compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,7 @@ void testStrictToolchainsParseException() throws Exception {
196196
ToolchainsBuildingRequest request = new DefaultToolchainsBuildingRequest();
197197
request.setGlobalToolchainsSource(new StringSource(""));
198198
ToolchainsParseException parseException = new ToolchainsParseException("MESSAGE", 4, 2);
199-
doThrow(parseException)
200-
.when(toolchainsReader)
201-
.read(any(InputStream.class), ArgumentMatchers.<String, Object>anyMap());
199+
doThrow(parseException).when(toolchainsReader).read(any(InputStream.class), ArgumentMatchers.anyMap());
202200

203201
try {
204202
toolchainBuilder.build(request);

Diff for: ‎compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ToolchainsBuildingExceptionTest {
3232

3333
@Test
3434
void testNoProblems() {
35-
ToolchainsBuildingException e = new ToolchainsBuildingException(Collections.<Problem>emptyList());
35+
ToolchainsBuildingException e = new ToolchainsBuildingException(Collections.emptyList());
3636
assertEquals("0 problems were encountered while building the effective toolchains" + LS, e.getMessage());
3737
}
3838

Diff for: ‎impl/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void merge(Model target, Model source) {
9090
target.setBuild(new Build());
9191
}
9292

93-
Map<Object, Object> context = Collections.<Object, Object>singletonMap(
93+
Map<Object, Object> context = Collections.singletonMap(
9494
PLUGIN_MANAGEMENT, target.getBuild().getPluginManagement());
9595

9696
mergePluginContainer_Plugins(target.getBuild(), source.getBuild(), false, context);

Diff for: ‎impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@ public DependencyFilter getExtensionDependencyFilter() {
14361436
* @param artifacts The set of artifacts, may be {@code null}.
14371437
*/
14381438
public void setResolvedArtifacts(Set<Artifact> artifacts) {
1439-
this.resolvedArtifacts = (artifacts != null) ? artifacts : Collections.<Artifact>emptySet();
1439+
this.resolvedArtifacts = (artifacts != null) ? artifacts : Collections.emptySet();
14401440
this.artifacts = null;
14411441
this.artifactMap = null;
14421442
}

Diff for: ‎impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -341,12 +341,11 @@ private static MavenSession createSession(PlexusContainer container, ArtifactRep
341341
throws CycleDetectedException, DuplicateProjectException {
342342
MavenExecutionRequest request = new DefaultMavenExecutionRequest()
343343
.setSystemProperties(properties)
344-
.setGoals(Collections.<String>emptyList())
344+
.setGoals(Collections.emptyList())
345345
.setBaseDirectory(new File(""))
346346
.setLocalRepository(repo);
347347

348-
return new MavenSession(
349-
container, request, new DefaultMavenExecutionResult(), Collections.<MavenProject>emptyList());
348+
return new MavenSession(container, request, new DefaultMavenExecutionResult(), Collections.emptyList());
350349
}
351350

352351
@Test

Diff for: ‎impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ private static MavenSession createSession(PlexusContainer container, ArtifactRep
296296
throws CycleDetectedException, DuplicateProjectException, NoLocalRepositoryManagerException {
297297
MavenExecutionRequest request = new DefaultMavenExecutionRequest()
298298
.setSystemProperties(properties)
299-
.setGoals(Collections.<String>emptyList())
299+
.setGoals(Collections.emptyList())
300300
.setBaseDirectory(new File(""))
301301
.setLocalRepository(repo);
302302

@@ -306,7 +306,7 @@ private static MavenSession createSession(PlexusContainer container, ArtifactRep
306306
.newInstance(repositorySession, new LocalRepository(repo.getUrl())));
307307
MavenSession session =
308308
new MavenSession(container, repositorySession, request, new DefaultMavenExecutionResult());
309-
session.setProjects(Collections.<MavenProject>emptyList());
309+
session.setProjects(Collections.emptyList());
310310
return session;
311311
}
312312

Diff for: ‎impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1922,6 +1922,6 @@ private static String createPath(List<String> elements) {
19221922
for (String s : elements) {
19231923
buffer.append(s).append(File.separator);
19241924
}
1925-
return buffer.toString().substring(0, buffer.toString().length() - 1);
1925+
return buffer.toString().substring(0, buffer.length() - 1);
19261926
}
19271927
}

Diff for: ‎impl/maven-impl/src/main/java/org/apache/maven/impl/ExtensibleEnumRegistries.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ public abstract static class DefaultExtensibleEnumRegistry<
9191
protected final Map<String, T> values;
9292

9393
public DefaultExtensibleEnumRegistry(List<P> providers, T... builtinValues) {
94-
values = Stream.<T>concat(
95-
Stream.of(builtinValues), providers.stream().flatMap(p -> p.provides().stream()))
94+
values = Stream.concat(Stream.of(builtinValues), providers.stream().flatMap(p -> p.provides().stream()))
9695
.collect(Collectors.toUnmodifiableMap(t -> t.id().toLowerCase(Locale.ROOT), t -> t));
9796
}
9897

Diff for: ‎impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelInterpolatorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public void testShouldThrowExceptionOnRecursiveScmConnectionReference() throws E
185185

186186
final SimpleProblemCollector collector = new SimpleProblemCollector();
187187
interpolator.interpolateModel(
188-
model, (Path) null, createModelBuildingRequest(context).build(), collector);
188+
model, null, createModelBuildingRequest(context).build(), collector);
189189
assertCollectorState(0, 1, 0, collector);
190190
}
191191

@@ -502,7 +502,7 @@ public void shouldInterpolateSourceDirectoryReferencedFromResourceDirectoryCorre
502502

503503
final SimpleProblemCollector collector = new SimpleProblemCollector();
504504
Model out = interpolator.interpolateModel(
505-
model, (Path) null, createModelBuildingRequest(context).build(), collector);
505+
model, null, createModelBuildingRequest(context).build(), collector);
506506
assertCollectorState(0, 0, 0, collector);
507507

508508
List<Resource> outResources = out.getBuild().getResources();

0 commit comments

Comments
 (0)