This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git
commit 575c8a4f4dab9d2820c0f84074940bf199aca40e Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 07:44:22 2026 +0000 Simplify redundant code --- .../java/org/apache/maven/resolver/internal/ant/AntRepoSys.java | 7 +++---- .../apache/maven/resolver/internal/ant/AntRepositoryListener.java | 2 -- .../maven/resolver/internal/ant/ProjectWorkspaceReader.java | 4 ++-- .../org/apache/maven/resolver/internal/ant/tasks/RefTask.java | 2 +- .../org/apache/maven/resolver/internal/ant/types/Artifact.java | 4 ++-- .../org/apache/maven/resolver/internal/ant/types/Dependency.java | 6 +++--- .../org/apache/maven/resolver/internal/ant/types/Exclusion.java | 8 ++++---- .../java/org/apache/maven/resolver/internal/ant/types/Mirror.java | 2 +- .../maven/resolver/internal/ant/types/PomPropertyEvaluator.java | 2 +- .../maven/resolver/internal/ant/types/RemoteRepository.java | 6 +++--- .../maven/resolver/internal/ant/ProjectWorkspaceReaderTest.java | 3 +-- 11 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java index 6abf2b2..afc072e 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntRepoSys.java @@ -122,7 +122,7 @@ import org.eclipse.aether.util.repository.DefaultProxySelector; * </p> * */ -public class AntRepoSys { +public final class AntRepoSys { private static final Date STARTED = new Date(); private static final boolean OS_WINDOWS = Os.isFamily("windows"); @@ -353,7 +353,7 @@ public class AntRepoSys { Xpp3Dom name = child.getChild("name"); Xpp3Dom value = child.getChild("value"); if (name != null && name.getValue() != null) { - headers.put(name.getValue(), (value != null) ? value.getValue() : null); + headers.put(name.getValue(), value != null ? value.getValue() : null); } } return Collections.unmodifiableMap(headers); @@ -930,8 +930,7 @@ public class AntRepoSys { DeployRequest request = new DeployRequest(); request.setArtifacts(toArtifacts(task, session, pom, artifacts)); boolean snapshot = request.getArtifacts().iterator().next().isSnapshot(); - RemoteRepository distRepo = - (snapshot && snapshotRepository != null) ? snapshotRepository : releaseRepository; + RemoteRepository distRepo = snapshot && snapshotRepository != null ? snapshotRepository : releaseRepository; request.setRepository(ConverterUtils.toDistRepository(distRepo, session)); try { diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntRepositoryListener.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntRepositoryListener.java index c641003..eade406 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/AntRepositoryListener.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntRepositoryListener.java @@ -94,7 +94,6 @@ class AntRepositoryListener extends AbstractRepositoryListener { event.getException(), Project.MSG_WARN); } - ; @Override public void artifactDescriptorMissing(final RepositoryEvent event) { @@ -102,5 +101,4 @@ class AntRepositoryListener extends AbstractRepositoryListener { "The POM for " + event.getArtifact() + " is missing, no dependency information available", Project.MSG_WARN); } - ; } diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReader.java b/src/main/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReader.java index 15f47f8..d887049 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReader.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReader.java @@ -136,7 +136,7 @@ public class ProjectWorkspaceReader implements WorkspaceReader { @Override public File findArtifact(Artifact artifact) { Path path = findArtifactPath(artifact); - return (path != null) ? path.toFile() : null; + return path != null ? path.toFile() : null; } /** @@ -148,7 +148,7 @@ public class ProjectWorkspaceReader implements WorkspaceReader { @Override public Path findArtifactPath(Artifact artifact) { Artifact found = artifacts.get(coords(artifact)); - return (found != null) ? found.getPath() : null; + return found != null ? found.getPath() : null; } /** diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/RefTask.java b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/RefTask.java index e2f5c0d..eae1683 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/RefTask.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/RefTask.java @@ -155,7 +155,7 @@ public abstract class RefTask extends Task { throw new BuildException("No Project specified"); } Object o = ref.getReferencedObject(project); - if (!(requiredClass.isAssignableFrom(o.getClass()))) { + if (!requiredClass.isAssignableFrom(o.getClass())) { log("Class " + o.getClass() + " is not a subclass of " + requiredClass, Project.MSG_VERBOSE); String msg = ref.getRefId() + " doesn't denote a " + dataTypeName; throw new BuildException(msg); diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Artifact.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Artifact.java index 9401783..c3ba2df 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Artifact.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/Artifact.java @@ -195,7 +195,7 @@ public class Artifact extends RefTask implements ArtifactContainer { if (isReference()) { return getRef().getType(); } - return (type != null) ? type : "jar"; + return type != null ? type : "jar"; } /** @@ -217,7 +217,7 @@ public class Artifact extends RefTask implements ArtifactContainer { if (isReference()) { return getRef().getClassifier(); } - return (classifier != null) ? classifier : ""; + return classifier != null ? classifier : ""; } /** diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Dependency.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Dependency.java index a94a5fd..d8113e6 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Dependency.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/Dependency.java @@ -446,7 +446,7 @@ public class Dependency extends DataType implements DependencyContainer { if (isReference()) { return getRef().getType(); } - return (type != null) ? type : "jar"; + return type != null ? type : "jar"; } /** @@ -505,7 +505,7 @@ public class Dependency extends DataType implements DependencyContainer { if (isReference()) { return getRef().getScope(); } - return (scope != null) ? scope : ""; + return scope != null ? scope : ""; } /** @@ -695,7 +695,7 @@ public class Dependency extends DataType implements DependencyContainer { key.append(artifactId); } key.append(':'); - key.append((type != null) ? type : "jar"); + key.append(type != null ? type : "jar"); if (classifier != null && !classifier.isEmpty()) { key.append(':'); key.append(classifier); diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Exclusion.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Exclusion.java index 365601b..9ce55f5 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Exclusion.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/Exclusion.java @@ -155,7 +155,7 @@ public class Exclusion extends DataType { if (isReference()) { return getRef().getGroupId(); } - return (groupId != null) ? groupId : WILDCARD; + return groupId != null ? groupId : WILDCARD; } /** @@ -202,7 +202,7 @@ public class Exclusion extends DataType { if (isReference()) { return getRef().getArtifactId(); } - return (artifactId != null) ? artifactId : WILDCARD; + return artifactId != null ? artifactId : WILDCARD; } /** @@ -253,7 +253,7 @@ public class Exclusion extends DataType { if (isReference()) { return getRef().getClassifier(); } - return (classifier != null) ? classifier : WILDCARD; + return classifier != null ? classifier : WILDCARD; } /** @@ -303,7 +303,7 @@ public class Exclusion extends DataType { if (isReference()) { return getRef().getExtension(); } - return (extension != null) ? extension : WILDCARD; + return extension != null ? extension : WILDCARD; } /** diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Mirror.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Mirror.java index f8aa0c6..4b868cc 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Mirror.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/Mirror.java @@ -241,7 +241,7 @@ public class Mirror extends DataType { if (isReference()) { return getRef().getType(); } - return (type != null) ? type : "default"; + return type != null ? type : "default"; } /** diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyEvaluator.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyEvaluator.java index bc96452..e16daf4 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyEvaluator.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/PomPropertyEvaluator.java @@ -24,7 +24,7 @@ import org.apache.tools.ant.property.NullReturn; /** */ -class PomPropertyEvaluator implements PropertyEvaluator { +final class PomPropertyEvaluator implements PropertyEvaluator { private final ModelValueExtractor extractor; diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/RemoteRepository.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/RemoteRepository.java index 46b8459..8d8b956 100644 --- a/src/main/java/org/apache/maven/resolver/internal/ant/types/RemoteRepository.java +++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/RemoteRepository.java @@ -185,7 +185,7 @@ public class RemoteRepository extends DataType implements RemoteRepositoryContai if (isReference()) { return getRef().getType(); } - return (type != null) ? type : "default"; + return type != null ? type : "default"; } /** @@ -303,7 +303,7 @@ public class RemoteRepository extends DataType implements RemoteRepositoryContai if (isReference()) { return getRef().getUpdates(); } - return (updates != null) ? updates : RepositoryPolicy.UPDATE_POLICY_DAILY; + return updates != null ? updates : RepositoryPolicy.UPDATE_POLICY_DAILY; } /** @@ -342,7 +342,7 @@ public class RemoteRepository extends DataType implements RemoteRepositoryContai if (isReference()) { return getRef().getChecksums(); } - return (checksums != null) ? checksums : RepositoryPolicy.CHECKSUM_POLICY_WARN; + return checksums != null ? checksums : RepositoryPolicy.CHECKSUM_POLICY_WARN; } /** diff --git a/src/test/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReaderTest.java b/src/test/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReaderTest.java index 86e3a35..8a7f495 100644 --- a/src/test/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReaderTest.java +++ b/src/test/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReaderTest.java @@ -21,7 +21,6 @@ package org.apache.maven.resolver.internal.ant; import java.io.File; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.apache.maven.resolver.internal.ant.types.Pom; @@ -126,7 +125,7 @@ public class ProjectWorkspaceReaderTest { reader.addArtifact(artifact2); List<String> versions = new ArrayList<>(reader.findVersions(artifact("test:dummy:txt:[0,)"))); - Collections.sort(versions); + versions.sort(null); assertEquals(Arrays.asList("1-SNAPSHOT", "2-SNAPSHOT"), versions); } }
