You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2024/05/21 11:05:15 UTC
(maven-resolver-ant-tasks) branch master updated: [MRESOLVER-561] Refresh codebase, drop unused classes (#40)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git
The following commit(s) were added to refs/heads/master by this push:
new 82e4859 [MRESOLVER-561] Refresh codebase, drop unused classes (#40)
82e4859 is described below
commit 82e4859cf0d183763737e5c3bbc8450f775d99ea
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue May 21 13:05:11 2024 +0200
[MRESOLVER-561] Refresh codebase, drop unused classes (#40)
Also use latest parent POM 42.
---
https://issues.apache.org/jira/browse/MRESOLVER-560
https://issues.apache.org/jira/browse/MRESOLVER-561
---
pom.xml | 3 +-
.../internal/ant/AntRepositoryListener.java | 2 +-
.../ant/AntServiceLocatorErrorHandler.java | 43 ----------------------
.../internal/ant/ProjectWorkspaceReader.java | 5 ++-
.../internal/ant/tasks/DependencyGraphLogger.java | 4 +-
.../maven/resolver/internal/ant/tasks/Layout.java | 6 +--
.../maven/resolver/internal/ant/tasks/RefTask.java | 2 +-
.../maven/resolver/internal/ant/tasks/Resolve.java | 25 ++++++++-----
.../resolver/internal/ant/types/Artifact.java | 4 ++
.../resolver/internal/ant/types/Artifacts.java | 7 +++-
.../internal/ant/types/Authentication.java | 7 ++--
.../resolver/internal/ant/types/Dependencies.java | 8 ++--
.../resolver/internal/ant/types/Dependency.java | 8 ++--
.../resolver/internal/ant/types/Exclusion.java | 3 +-
.../internal/ant/types/LocalRepository.java | 3 +-
.../maven/resolver/internal/ant/types/Mirror.java | 3 +-
.../maven/resolver/internal/ant/types/Pom.java | 2 +
.../internal/ant/types/PomPropertyEvaluator.java | 1 +
.../maven/resolver/internal/ant/types/Proxy.java | 3 +-
.../internal/ant/types/RemoteRepositories.java | 7 +++-
.../internal/ant/types/RemoteRepository.java | 5 ++-
.../resolver/internal/ant/types/Settings.java | 2 +-
22 files changed, 73 insertions(+), 80 deletions(-)
diff --git a/pom.xml b/pom.xml
index 17fd374..c6bc978 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>41</version>
+ <version>42</version>
</parent>
<groupId>org.apache.maven.resolver</groupId>
@@ -181,7 +181,6 @@
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>0.9.0.M2</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
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 3746584..ff40604 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
@@ -31,7 +31,7 @@ import org.eclipse.aether.transfer.MetadataNotFoundException;
*/
class AntRepositoryListener extends AbstractRepositoryListener {
- private Task task;
+ private final Task task;
AntRepositoryListener(final Task task) {
this.task = task;
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntServiceLocatorErrorHandler.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntServiceLocatorErrorHandler.java
deleted file mode 100644
index 2045ebf..0000000
--- a/src/main/java/org/apache/maven/resolver/internal/ant/AntServiceLocatorErrorHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.maven.resolver.internal.ant;
-
-import org.apache.tools.ant.Project;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.impl.DefaultServiceLocator;
-
-/**
- */
-class AntServiceLocatorErrorHandler extends DefaultServiceLocator.ErrorHandler {
-
- private Project project;
-
- AntServiceLocatorErrorHandler(final Project project) {
- this.project = project;
- }
-
- public void serviceCreationFailed(final Class<?> type, final Class<?> impl, final Throwable exception) {
- String msg = "Could not initialize repository system";
- if (!RepositorySystem.class.equals(type)) {
- msg += ", service " + type.getName() + " (" + impl.getName() + ") failed to initialize";
- }
- msg += ": " + exception.getMessage();
- project.log(msg, exception, Project.MSG_ERR);
- }
-}
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 bd2f3be..41f815d 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
@@ -45,7 +45,7 @@ public class ProjectWorkspaceReader implements WorkspaceReader {
private static final Object LOCK = new Object();
- private Map<String, Artifact> artifacts = new ConcurrentHashMap<>();
+ private final Map<String, Artifact> artifacts = new ConcurrentHashMap<>();
public void addPom(Pom pom) {
if (pom.getFile() != null) {
@@ -89,15 +89,18 @@ public class ProjectWorkspaceReader implements WorkspaceReader {
return ArtifactIdUtils.toId(artifact);
}
+ @Override
public WorkspaceRepository getRepository() {
return new WorkspaceRepository("ant");
}
+ @Override
public File findArtifact(Artifact artifact) {
artifact = artifacts.get(coords(artifact));
return (artifact != null) ? artifact.getFile() : null;
}
+ @Override
public List<String> findVersions(Artifact artifact) {
List<String> versions = new ArrayList<>();
for (Artifact art : artifacts.values()) {
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/DependencyGraphLogger.java b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/DependencyGraphLogger.java
index ada0323..432edd1 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/DependencyGraphLogger.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/DependencyGraphLogger.java
@@ -30,7 +30,7 @@ import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
*/
class DependencyGraphLogger implements DependencyVisitor {
- private Task task;
+ private final Task task;
private String indent = "";
@@ -38,6 +38,7 @@ class DependencyGraphLogger implements DependencyVisitor {
this.task = task;
}
+ @Override
public boolean visitEnter(DependencyNode node) {
StringBuilder buffer = new StringBuilder(128);
buffer.append(indent);
@@ -68,6 +69,7 @@ class DependencyGraphLogger implements DependencyVisitor {
return true;
}
+ @Override
public boolean visitLeave(DependencyNode node) {
indent = indent.substring(0, indent.length() - 3);
return true;
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java
index f590c1f..d4769c0 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Layout.java
@@ -48,7 +48,7 @@ class Layout {
public static final String CLS = "{classifier}";
- private String[] tokens;
+ private final String[] tokens;
Layout(String layout) throws BuildException {
Collection<String> valid = new HashSet<>(Arrays.asList(GID, GID_DIRS, AID, VER, BVER, EXT, CLS));
@@ -61,7 +61,7 @@ class Layout {
}
tokens.add(m.group());
}
- this.tokens = tokens.toArray(new String[tokens.size()]);
+ this.tokens = tokens.toArray(new String[0]);
}
public String getPath(Artifact artifact) {
@@ -83,7 +83,7 @@ class Layout {
if (artifact.getClassifier().length() <= 0) {
if (i > 0) {
String lt = tokens[i - 1];
- if (lt.length() > 0 && "-_".indexOf(lt.charAt(lt.length() - 1)) >= 0) {
+ if (!lt.isEmpty() && "-_".indexOf(lt.charAt(lt.length() - 1)) >= 0) {
buffer.setLength(buffer.length() - 1);
}
}
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 804d513..d13bb02 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
@@ -73,7 +73,7 @@ public abstract class RefTask extends Task {
Object o = ref.getReferencedObject(project);
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;
+ String msg = ref.getRefId() + " doesn't denote a " + dataTypeName;
throw new BuildException(msg);
}
return o;
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java
index e4af158..cf344bf 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/tasks/Resolve.java
@@ -56,7 +56,7 @@ import org.eclipse.aether.util.filter.ScopeDependencyFilter;
*/
public class Resolve extends AbstractResolvingTask {
- private List<ArtifactConsumer> consumers = new ArrayList<>();
+ private final List<ArtifactConsumer> consumers = new ArrayList<>();
private boolean failOnMissingAttachments;
@@ -191,7 +191,7 @@ public class Resolve extends AbstractResolvingTask {
} else {
dst = included;
}
- if (scope.length() > 0) {
+ if (!scope.isEmpty()) {
dst.add(scope);
}
}
@@ -215,7 +215,7 @@ public class Resolve extends AbstractResolvingTask {
/**
*/
- public class Path extends ArtifactConsumer {
+ public static class Path extends ArtifactConsumer {
private String refid;
@@ -225,12 +225,14 @@ public class Resolve extends AbstractResolvingTask {
this.refid = refId;
}
+ @Override
public void validate() {
if (refid == null) {
throw new BuildException("You must specify the 'refid' for the path");
}
}
+ @Override
public void process(Artifact artifact, RepositorySystemSession session) {
if (path == null) {
path = new org.apache.tools.ant.types.Path(getProject());
@@ -264,6 +266,7 @@ public class Resolve extends AbstractResolvingTask {
this.refid = refId;
}
+ @Override
public String getClassifier() {
return classifier;
}
@@ -290,6 +293,7 @@ public class Resolve extends AbstractResolvingTask {
this.layout = new Layout(layout);
}
+ @Override
public void validate() {
if (refid == null && dir == null) {
throw new BuildException("You must either specify the 'refid' for the resource collection"
@@ -300,6 +304,7 @@ public class Resolve extends AbstractResolvingTask {
}
}
+ @Override
public void process(Artifact artifact, RepositorySystemSession session) {
if (dir != null) {
if (refid != null && fileset == null) {
@@ -346,7 +351,7 @@ public class Resolve extends AbstractResolvingTask {
/**
*/
- public class Props extends ArtifactConsumer {
+ public static class Props extends ArtifactConsumer {
private String prefix;
@@ -356,6 +361,7 @@ public class Resolve extends AbstractResolvingTask {
this.prefix = prefix;
}
+ @Override
public String getClassifier() {
return classifier;
}
@@ -371,9 +377,10 @@ public class Resolve extends AbstractResolvingTask {
}
}
+ @Override
public void process(Artifact artifact, RepositorySystemSession session) {
StringBuilder buffer = new StringBuilder(256);
- if (prefix != null && prefix.length() > 0) {
+ if (prefix != null && !prefix.isEmpty()) {
buffer.append(prefix);
if (!prefix.endsWith(".")) {
buffer.append('.');
@@ -384,7 +391,7 @@ public class Resolve extends AbstractResolvingTask {
buffer.append(artifact.getArtifactId());
buffer.append(':');
buffer.append(artifact.getExtension());
- if (artifact.getClassifier().length() > 0) {
+ if (!artifact.getClassifier().isEmpty()) {
buffer.append(':');
buffer.append(artifact.getClassifier());
}
@@ -397,11 +404,11 @@ public class Resolve extends AbstractResolvingTask {
private static class Group {
- private String classifier;
+ private final String classifier;
- private List<ArtifactConsumer> consumers = new ArrayList<>();
+ private final List<ArtifactConsumer> consumers = new ArrayList<>();
- private List<ArtifactRequest> requests = new ArrayList<>();
+ private final List<ArtifactRequest> requests = new ArrayList<>();
Group(String classifier) {
this.classifier = classifier;
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 3984be8..f8561be 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
@@ -44,6 +44,7 @@ public class Artifact extends RefTask implements ArtifactContainer {
return (Artifact) getCheckedRef();
}
+ @Override
public void validate(final Task task) {
if (isReference()) {
getRef().validate(task);
@@ -59,6 +60,7 @@ public class Artifact extends RefTask implements ArtifactContainer {
}
}
+ @Override
public void setRefid(final Reference ref) {
if (file != null || type != null || classifier != null) {
throw tooManyAttributes();
@@ -130,6 +132,7 @@ public class Artifact extends RefTask implements ArtifactContainer {
return pom;
}
+ @Override
public List<Artifact> getArtifacts() {
return Collections.singletonList(this);
}
@@ -139,6 +142,7 @@ public class Artifact extends RefTask implements ArtifactContainer {
ProjectWorkspaceReader.getInstance().addArtifact(this);
}
+ @Override
public String toString() {
final String pomRepr = getPom() != null ? "(" + getPom().toString() + ":)" : "";
return String.format(pomRepr + "%s:%s", getType(), getClassifier());
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Artifacts.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Artifacts.java
index 05927f0..2788e0e 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Artifacts.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/Artifacts.java
@@ -29,12 +29,13 @@ import org.apache.tools.ant.types.Reference;
*/
public class Artifacts extends DataType implements ArtifactContainer {
- private List<ArtifactContainer> containers = new ArrayList<>();
+ private final List<ArtifactContainer> containers = new ArrayList<>();
protected Artifacts getRef() {
- return (Artifacts) getCheckedRef();
+ return getCheckedRef(Artifacts.class);
}
+ @Override
public void validate(Task task) {
if (isReference()) {
getRef().validate(task);
@@ -45,6 +46,7 @@ public class Artifacts extends DataType implements ArtifactContainer {
}
}
+ @Override
public void setRefid(Reference ref) {
if (!containers.isEmpty()) {
throw noChildrenAllowed();
@@ -65,6 +67,7 @@ public class Artifacts extends DataType implements ArtifactContainer {
containers.add(artifacts);
}
+ @Override
public List<Artifact> getArtifacts() {
if (isReference()) {
return getRef().getArtifacts();
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Authentication.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Authentication.java
index f75b6dc..f9f3889 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Authentication.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/Authentication.java
@@ -38,7 +38,7 @@ public class Authentication extends DataType {
private String passphrase;
- private List<String> servers = new ArrayList<>();
+ private final List<String> servers = new ArrayList<>();
@Override
public void setProject(Project project) {
@@ -48,9 +48,10 @@ public class Authentication extends DataType {
}
protected Authentication getRef() {
- return (Authentication) getCheckedRef();
+ return getCheckedRef(Authentication.class);
}
+ @Override
public void setRefid(Reference ref) {
if (username != null || password != null || privateKeyFile != null || passphrase != null) {
throw tooManyAttributes();
@@ -119,7 +120,7 @@ public class Authentication extends DataType {
String[] split = servers.split("[;:]");
for (String server : split) {
server = server.trim();
- if (server.length() > 0) {
+ if (!server.isEmpty()) {
this.servers.add(server);
}
}
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Dependencies.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Dependencies.java
index 28567d8..3812a78 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Dependencies.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/Dependencies.java
@@ -37,16 +37,17 @@ public class Dependencies extends DataType implements DependencyContainer {
private Pom pom;
- private List<DependencyContainer> containers = new ArrayList<>();
+ private final List<DependencyContainer> containers = new ArrayList<>();
- private List<Exclusion> exclusions = new ArrayList<>();
+ private final List<Exclusion> exclusions = new ArrayList<>();
private boolean nestedDependencies;
protected Dependencies getRef() {
- return (Dependencies) getCheckedRef();
+ return getCheckedRef(Dependencies.class);
}
+ @Override
public void validate(Task task) {
if (isReference()) {
getRef().validate(task);
@@ -71,6 +72,7 @@ public class Dependencies extends DataType implements DependencyContainer {
}
}
+ @Override
public void setRefid(Reference ref) {
if (pom != null || !exclusions.isEmpty() || !containers.isEmpty()) {
throw noChildrenAllowed();
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 9abb2e6..85cb724 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
@@ -48,12 +48,13 @@ public class Dependency extends DataType implements DependencyContainer {
private File systemPath;
- private List<Exclusion> exclusions = new ArrayList<>();
+ private final List<Exclusion> exclusions = new ArrayList<>();
protected Dependency getRef() {
- return (Dependency) getCheckedRef();
+ return getCheckedRef(Dependency.class);
}
+ @Override
public void validate(Task task) {
if (isReference()) {
getRef().validate(task);
@@ -91,6 +92,7 @@ public class Dependency extends DataType implements DependencyContainer {
}
}
+ @Override
public void setRefid(Reference ref) {
if (groupId != null
|| artifactId != null
@@ -253,7 +255,7 @@ public class Dependency extends DataType implements DependencyContainer {
}
key.append(':');
key.append((type != null) ? type : "jar");
- if (classifier != null && classifier.length() > 0) {
+ 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 b9b7de9..730da25 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
@@ -41,7 +41,7 @@ public class Exclusion extends DataType {
private String extension;
protected Exclusion getRef() {
- return (Exclusion) getCheckedRef();
+ return getCheckedRef(Exclusion.class);
}
public void validate(Task task) {
@@ -55,6 +55,7 @@ public class Exclusion extends DataType {
}
}
+ @Override
public void setRefid(Reference ref) {
if (groupId != null || artifactId != null || extension != null || classifier != null) {
throw tooManyAttributes();
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/LocalRepository.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/LocalRepository.java
index d7bb528..fd2fc95 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/types/LocalRepository.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/LocalRepository.java
@@ -52,9 +52,10 @@ public class LocalRepository extends DataType {
}
protected LocalRepository getRef() {
- return (LocalRepository) getCheckedRef();
+ return getCheckedRef(LocalRepository.class);
}
+ @Override
public void setRefid(Reference ref) {
if (dir != null) {
throw tooManyAttributes();
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 ca69d93..03bcbcf 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
@@ -46,9 +46,10 @@ public class Mirror extends DataType {
}
protected Mirror getRef() {
- return (Mirror) getCheckedRef();
+ return getCheckedRef(Mirror.class);
}
+ @Override
public void setRefid(Reference ref) {
if (id != null || url != null || mirrorOf != null || type != null) {
throw tooManyAttributes();
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Pom.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Pom.java
index 07da226..b258fcd 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Pom.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/Pom.java
@@ -75,6 +75,7 @@ public class Pom extends RefTask {
}
}
+ @Override
public void setRefid(Reference ref) {
if (id != null || file != null || groupId != null || artifactId != null || version != null) {
throw tooManyAttributes();
@@ -278,6 +279,7 @@ public class Pom extends RefTask {
}
}
+ @Override
public String toString() {
return coords + " (" + super.toString() + ")";
}
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 4b798eb..bc96452 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
@@ -39,6 +39,7 @@ class PomPropertyEvaluator implements PropertyEvaluator {
this.extractor = extractor;
}
+ @Override
public Object evaluate(String property, PropertyHelper propertyHelper) {
Object value = extractor.getValue(property);
if (value != null) {
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Proxy.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Proxy.java
index e68c20e..bf74c90 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Proxy.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/Proxy.java
@@ -46,9 +46,10 @@ public class Proxy extends DataType {
}
protected Proxy getRef() {
- return (Proxy) getCheckedRef();
+ return getCheckedRef(Proxy.class);
}
+ @Override
public void setRefid(Reference ref) {
if (host != null || port != 0 || type != null || nonProxyHosts != null) {
throw tooManyAttributes();
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/RemoteRepositories.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/RemoteRepositories.java
index 6a3cce9..b5050ab 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/types/RemoteRepositories.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/RemoteRepositories.java
@@ -29,12 +29,13 @@ import org.apache.tools.ant.types.Reference;
*/
public class RemoteRepositories extends DataType implements RemoteRepositoryContainer {
- private List<RemoteRepositoryContainer> containers = new ArrayList<>();
+ private final List<RemoteRepositoryContainer> containers = new ArrayList<>();
protected RemoteRepositories getRef() {
- return (RemoteRepositories) getCheckedRef();
+ return getCheckedRef(RemoteRepositories.class);
}
+ @Override
public void validate(Task task) {
if (isReference()) {
getRef().validate(task);
@@ -45,6 +46,7 @@ public class RemoteRepositories extends DataType implements RemoteRepositoryCont
}
}
+ @Override
public void setRefid(Reference ref) {
if (!containers.isEmpty()) {
throw noChildrenAllowed();
@@ -65,6 +67,7 @@ public class RemoteRepositories extends DataType implements RemoteRepositoryCont
containers.add(repositories);
}
+ @Override
public List<RemoteRepository> getRepositories() {
if (isReference()) {
return getRef().getRepositories();
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 eae223f..fb42ebf 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
@@ -62,9 +62,10 @@ public class RemoteRepository extends DataType implements RemoteRepositoryContai
}
protected RemoteRepository getRef() {
- return (RemoteRepository) getCheckedRef();
+ return getCheckedRef(RemoteRepository.class);
}
+ @Override
public void validate(Task task) {
if (isReference()) {
getRef().validate(task);
@@ -78,6 +79,7 @@ public class RemoteRepository extends DataType implements RemoteRepositoryContai
}
}
+ @Override
public void setRefid(Reference ref) {
if (id != null || url != null || type != null || checksums != null || updates != null) {
throw tooManyAttributes();
@@ -244,6 +246,7 @@ public class RemoteRepository extends DataType implements RemoteRepositoryContai
authentication.setRefid(ref);
}
+ @Override
public List<RemoteRepository> getRepositories() {
return Collections.singletonList(this);
}
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/types/Settings.java b/src/main/java/org/apache/maven/resolver/internal/ant/types/Settings.java
index 045191a..8b33d3d 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/types/Settings.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/types/Settings.java
@@ -33,7 +33,7 @@ public class Settings extends DataType {
private File globalFile;
protected Settings getRef() {
- return (Settings) getCheckedRef();
+ return getCheckedRef(Settings.class);
}
public void setRefid(Reference ref) {