This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new fc9a7d8da3 Add missing @Override annotations
fc9a7d8da3 is described below
commit fc9a7d8da38c5fe679d158c9514defcbc8be7207
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Feb 9 20:20:54 2024 +0100
Add missing @Override annotations
---
.../main/java/org/apache/maven/api/Dependency.java | 1 +
.../org/apache/maven/artifact/DefaultArtifact.java | 47 ++++++++++++++++++++++
.../artifact/handler/ArtifactHandlerMock.java | 7 ++++
.../maven/repository/TestArtifactHandler.java | 7 ++++
.../manager/DefaultArtifactHandlerManager.java | 2 +
.../maven/internal/impl/AbstractSession.java | 18 +++++++++
.../impl/TransformedArtifactHandler.java | 7 ++++
.../maven/project/artifact/PluginArtifact.java | 7 ++++
.../maven/project/artifact/ProjectArtifact.java | 7 ++++
.../maven/internal/impl/TestArtifactHandler.java | 7 ++++
10 files changed, 110 insertions(+)
diff --git
a/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
b/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
index b64fffc0d5..d0906581b6 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
@@ -41,5 +41,6 @@ public interface Dependency extends Artifact {
* @return a {@link DependencyCoordinate}
*/
@Nonnull
+ @Override
DependencyCoordinate toCoordinate();
}
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
index 9a1ca1f433..44f2615790 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
@@ -181,52 +181,64 @@ public class DefaultArtifact implements Artifact {
return (value == null) || (value.trim().length() < 1);
}
+ @Override
public String getClassifier() {
return classifier;
}
+ @Override
public boolean hasClassifier() {
return classifier != null && !classifier.isEmpty();
}
+ @Override
public String getScope() {
return scope;
}
+ @Override
public String getGroupId() {
return groupId;
}
+ @Override
public String getArtifactId() {
return artifactId;
}
+ @Override
public String getVersion() {
return version;
}
+ @Override
public void setVersion(String version) {
this.version = version;
setBaseVersionInternal(version);
versionRange = null;
}
+ @Override
public String getType() {
return type;
}
+ @Override
public void setFile(File file) {
this.file = file;
}
+ @Override
public File getFile() {
return file;
}
+ @Override
public ArtifactRepository getRepository() {
return repository;
}
+ @Override
public void setRepository(ArtifactRepository repository) {
this.repository = repository;
}
@@ -235,10 +247,12 @@ public class DefaultArtifact implements Artifact {
//
// ----------------------------------------------------------------------
+ @Override
public String getId() {
return getDependencyConflictId() + ":" + getBaseVersion();
}
+ @Override
public String getDependencyConflictId() {
StringBuilder sb = new StringBuilder(128);
sb.append(getGroupId());
@@ -257,6 +271,7 @@ public class DefaultArtifact implements Artifact {
}
}
+ @Override
public void addMetadata(ArtifactMetadata metadata) {
if (metadataMap == null) {
metadataMap = new HashMap<>();
@@ -270,6 +285,7 @@ public class DefaultArtifact implements Artifact {
}
}
+ @Override
public Collection<ArtifactMetadata> getMetadataList() {
if (metadataMap == null) {
return Collections.emptyList();
@@ -282,6 +298,7 @@ public class DefaultArtifact implements Artifact {
// Object overrides
// ----------------------------------------------------------------------
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
if (getGroupId() != null) {
@@ -323,6 +340,7 @@ public class DefaultArtifact implements Artifact {
return Objects.hash(groupId, artifactId, type, classifier, version);
}
+ @Override
public String getBaseVersion() {
if (baseVersion == null && version != null) {
setBaseVersionInternal(version);
@@ -339,6 +357,7 @@ public class DefaultArtifact implements Artifact {
return baseVersion;
}
+ @Override
public void setBaseVersion(String baseVersion) {
setBaseVersionInternal(baseVersion);
}
@@ -347,6 +366,7 @@ public class DefaultArtifact implements Artifact {
this.baseVersion = ArtifactUtils.toSnapshotVersion(baseVersion);
}
+ @Override
public int compareTo(Artifact a) {
int result = groupId.compareTo(a.getGroupId());
if (result == 0) {
@@ -376,47 +396,58 @@ public class DefaultArtifact implements Artifact {
return result;
}
+ @Override
public void updateVersion(String version, ArtifactRepository
localRepository) {
setResolvedVersion(version);
setFile(new File(localRepository.getBasedir(),
localRepository.pathOf(this)));
}
+ @Override
public String getDownloadUrl() {
return downloadUrl;
}
+ @Override
public void setDownloadUrl(String downloadUrl) {
this.downloadUrl = downloadUrl;
}
+ @Override
public ArtifactFilter getDependencyFilter() {
return dependencyFilter;
}
+ @Override
public void setDependencyFilter(ArtifactFilter artifactFilter) {
dependencyFilter = artifactFilter;
}
+ @Override
public ArtifactHandler getArtifactHandler() {
return artifactHandler;
}
+ @Override
public List<String> getDependencyTrail() {
return dependencyTrail;
}
+ @Override
public void setDependencyTrail(List<String> dependencyTrail) {
this.dependencyTrail = dependencyTrail;
}
+ @Override
public void setScope(String scope) {
this.scope = scope;
}
+ @Override
public VersionRange getVersionRange() {
return versionRange;
}
+ @Override
public void setVersionRange(VersionRange versionRange) {
this.versionRange = versionRange;
selectVersionFromNewRangeIfAvailable();
@@ -431,70 +462,86 @@ public class DefaultArtifact implements Artifact {
}
}
+ @Override
public void selectVersion(String version) {
this.version = version;
setBaseVersionInternal(version);
}
+ @Override
public void setGroupId(String groupId) {
this.groupId = groupId;
}
+ @Override
public void setArtifactId(String artifactId) {
this.artifactId = artifactId;
}
+ @Override
public boolean isSnapshot() {
return getBaseVersion() != null
&& (getBaseVersion().endsWith(SNAPSHOT_VERSION)
|| getBaseVersion().equals(LATEST_VERSION));
}
+ @Override
public void setResolved(boolean resolved) {
this.resolved = resolved;
}
+ @Override
public boolean isResolved() {
return resolved;
}
+ @Override
public void setResolvedVersion(String version) {
this.version = version;
// retain baseVersion
}
+ @Override
public void setArtifactHandler(ArtifactHandler artifactHandler) {
this.artifactHandler = artifactHandler;
}
+ @Override
public void setRelease(boolean release) {
this.release = release;
}
+ @Override
public boolean isRelease() {
return release;
}
+ @Override
public List<ArtifactVersion> getAvailableVersions() {
return availableVersions;
}
+ @Override
public void setAvailableVersions(List<ArtifactVersion> availableVersions) {
this.availableVersions = availableVersions;
}
+ @Override
public boolean isOptional() {
return optional;
}
+ @Override
public ArtifactVersion getSelectedVersion() throws
OverConstrainedVersionException {
return versionRange.getSelectedVersion(this);
}
+ @Override
public boolean isSelectedVersionKnown() throws
OverConstrainedVersionException {
return versionRange.isSelectedVersionKnown(this);
}
+ @Override
public void setOptional(boolean optional) {
this.optional = optional;
}
diff --git
a/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
b/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
index deb3e77c54..8f8dd820e0 100644
---
a/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
+++
b/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
@@ -27,6 +27,7 @@ public class ArtifactHandlerMock implements ArtifactHandler {
this.extension = extension;
}
+ @Override
public String getExtension() {
return extension;
}
@@ -35,6 +36,7 @@ public class ArtifactHandlerMock implements ArtifactHandler {
this.directory = directory;
}
+ @Override
public String getDirectory() {
return directory;
}
@@ -43,6 +45,7 @@ public class ArtifactHandlerMock implements ArtifactHandler {
this.classifier = classifier;
}
+ @Override
public String getClassifier() {
return classifier;
}
@@ -51,6 +54,7 @@ public class ArtifactHandlerMock implements ArtifactHandler {
this.packaging = packaging;
}
+ @Override
public String getPackaging() {
return packaging;
}
@@ -59,6 +63,7 @@ public class ArtifactHandlerMock implements ArtifactHandler {
this.includesDependencies = includesDependencies;
}
+ @Override
public boolean isIncludesDependencies() {
return includesDependencies;
}
@@ -67,6 +72,7 @@ public class ArtifactHandlerMock implements ArtifactHandler {
this.language = language;
}
+ @Override
public String getLanguage() {
return language;
}
@@ -75,6 +81,7 @@ public class ArtifactHandlerMock implements ArtifactHandler {
this.addedToClasspath = addedToClasspath;
}
+ @Override
public boolean isAddedToClasspath() {
return addedToClasspath;
}
diff --git
a/maven-compat/src/test/java/org/apache/maven/repository/TestArtifactHandler.java
b/maven-compat/src/test/java/org/apache/maven/repository/TestArtifactHandler.java
index 860fbe3fb5..5e02488d07 100644
---
a/maven-compat/src/test/java/org/apache/maven/repository/TestArtifactHandler.java
+++
b/maven-compat/src/test/java/org/apache/maven/repository/TestArtifactHandler.java
@@ -39,30 +39,37 @@ class TestArtifactHandler implements ArtifactHandler {
this.extension = extension;
}
+ @Override
public String getClassifier() {
return null;
}
+ @Override
public String getDirectory() {
return getPackaging() + "s";
}
+ @Override
public String getExtension() {
return extension;
}
+ @Override
public String getLanguage() {
return "java";
}
+ @Override
public String getPackaging() {
return type;
}
+ @Override
public boolean isAddedToClasspath() {
return true;
}
+ @Override
public boolean isIncludesDependencies() {
return false;
}
diff --git
a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
index 3a0c1a234f..1084d8617f 100644
---
a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
+++
b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
@@ -60,6 +60,7 @@ public class DefaultArtifactHandlerManager extends
AbstractEventSpy implements A
}
}
+ @Override
public ArtifactHandler getArtifactHandler(String id) {
return allHandlers.computeIfAbsent(id, k -> {
Type type = typeRegistry.require(id);
@@ -79,6 +80,7 @@ public class DefaultArtifactHandlerManager extends
AbstractEventSpy implements A
// but to create those, proper filtering should happen via Type
properties.
}
+ @Override
public void addHandlers(Map<String, ArtifactHandler> handlers) {
throw new UnsupportedOperationException("Adding handlers
programmatically is not supported anymore");
}
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
index de4d19a066..f3bdb2be33 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
@@ -53,40 +53,49 @@ public abstract class AbstractSession implements
InternalSession {
private final Map<org.eclipse.aether.graph.Dependency, Dependency>
allDependencies =
Collections.synchronizedMap(new WeakHashMap<>());
+ @Override
public RemoteRepository
getRemoteRepository(org.eclipse.aether.repository.RemoteRepository repository) {
return allRepositories.computeIfAbsent(repository,
DefaultRemoteRepository::new);
}
+ @Override
public Node getNode(org.eclipse.aether.graph.DependencyNode node) {
return getNode(node, false);
}
+ @Override
public Node getNode(org.eclipse.aether.graph.DependencyNode node, boolean
verbose) {
return allNodes.computeIfAbsent(node, n -> new DefaultNode(this, n,
verbose));
}
@Nonnull
+ @Override
public Artifact getArtifact(@Nonnull org.eclipse.aether.artifact.Artifact
artifact) {
return allArtifacts.computeIfAbsent(artifact, a -> new
DefaultArtifact(this, a));
}
@Nonnull
+ @Override
public Dependency getDependency(@Nonnull
org.eclipse.aether.graph.Dependency dependency) {
return allDependencies.computeIfAbsent(dependency, d -> new
DefaultDependency(this, d));
}
+ @Override
public List<Project> getProjects(List<MavenProject> projects) {
return projects == null ? null : map(projects, this::getProject);
}
+ @Override
public Project getProject(MavenProject project) {
return allProjects.computeIfAbsent(project.getId(), id -> new
DefaultProject(this, project));
}
+ @Override
public List<org.eclipse.aether.repository.RemoteRepository>
toRepositories(List<RemoteRepository> repositories) {
return repositories == null ? null : map(repositories,
this::toRepository);
}
+ @Override
public org.eclipse.aether.repository.RemoteRepository
toRepository(RemoteRepository repository) {
if (repository instanceof DefaultRemoteRepository) {
return ((DefaultRemoteRepository) repository).getRepository();
@@ -96,6 +105,7 @@ public abstract class AbstractSession implements
InternalSession {
}
}
+ @Override
public org.eclipse.aether.repository.LocalRepository
toRepository(LocalRepository repository) {
if (repository instanceof DefaultLocalRepository) {
return ((DefaultLocalRepository) repository).getRepository();
@@ -105,23 +115,29 @@ public abstract class AbstractSession implements
InternalSession {
}
}
+ @Override
public List<ArtifactRepository>
toArtifactRepositories(List<RemoteRepository> repositories) {
return repositories == null ? null : map(repositories,
this::toArtifactRepository);
}
+ @Override
public abstract ArtifactRepository toArtifactRepository(RemoteRepository
repository);
+ @Override
public List<org.eclipse.aether.graph.Dependency> toDependencies(
Collection<DependencyCoordinate> dependencies, boolean managed) {
return dependencies == null ? null : map(dependencies, d ->
toDependency(d, managed));
}
+ @Override
public abstract org.eclipse.aether.graph.Dependency
toDependency(DependencyCoordinate dependency, boolean managed);
+ @Override
public List<org.eclipse.aether.artifact.Artifact>
toArtifacts(Collection<Artifact> artifacts) {
return artifacts == null ? null : map(artifacts, this::toArtifact);
}
+ @Override
public org.eclipse.aether.artifact.Artifact toArtifact(Artifact artifact) {
File file = getService(ArtifactManager.class)
.getPath(artifact)
@@ -143,6 +159,7 @@ public abstract class AbstractSession implements
InternalSession {
file);
}
+ @Override
public org.eclipse.aether.artifact.Artifact toArtifact(ArtifactCoordinate
coord) {
if (coord instanceof DefaultArtifactCoordinate) {
return ((DefaultArtifactCoordinate) coord).getCoordinate();
@@ -421,6 +438,7 @@ public abstract class AbstractSession implements
InternalSession {
* @see DependencyCoordinateFactory#create(Session, ArtifactCoordinate)
*/
@Nonnull
+ @Override
public DependencyCoordinate createDependencyCoordinate(@Nonnull Dependency
dependency) {
return getService(DependencyCoordinateFactory.class).create(this,
dependency);
}
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifactHandler.java
b/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifactHandler.java
index 80ba4e7cdf..b2a1f9c274 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifactHandler.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifactHandler.java
@@ -36,30 +36,37 @@ class TransformedArtifactHandler implements ArtifactHandler
{
this.packaging = requireNonNull(packaging);
}
+ @Override
public String getClassifier() {
return classifier;
}
+ @Override
public String getDirectory() {
return null;
}
+ @Override
public String getExtension() {
return extension;
}
+ @Override
public String getLanguage() {
return "none";
}
+ @Override
public String getPackaging() {
return packaging;
}
+ @Override
public boolean isAddedToClasspath() {
return false;
}
+ @Override
public boolean isIncludesDependencies() {
return false;
}
diff --git
a/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
b/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
index d5bb916664..bf266e717f 100644
---
a/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
+++
b/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
@@ -57,30 +57,37 @@ public class PluginArtifact extends DefaultArtifact
implements ArtifactWithDepen
// TODO: this is duplicate of MavenPluginArtifactHandlerProvider provided
one
static class PluginArtifactHandler implements ArtifactHandler {
+ @Override
public String getClassifier() {
return null;
}
+ @Override
public String getDirectory() {
return null;
}
+ @Override
public String getExtension() {
return "jar";
}
+ @Override
public String getLanguage() {
return "none";
}
+ @Override
public String getPackaging() {
return "maven-plugin";
}
+ @Override
public boolean isAddedToClasspath() {
return true;
}
+ @Override
public boolean isIncludesDependencies() {
return false;
}
diff --git
a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
index 8d75eb76c5..965b370970 100644
---
a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
+++
b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
@@ -62,30 +62,37 @@ public class ProjectArtifact extends DefaultArtifact
implements ArtifactWithDepe
// TODO: this is duplicate of PomArtifactHandlerProvider provided one
static class PomArtifactHandler implements ArtifactHandler {
+ @Override
public String getClassifier() {
return null;
}
+ @Override
public String getDirectory() {
return null;
}
+ @Override
public String getExtension() {
return "pom";
}
+ @Override
public String getLanguage() {
return "none";
}
+ @Override
public String getPackaging() {
return "pom";
}
+ @Override
public boolean isAddedToClasspath() {
return false;
}
+ @Override
public boolean isIncludesDependencies() {
return false;
}
diff --git
a/maven-core/src/test/java/org/apache/maven/internal/impl/TestArtifactHandler.java
b/maven-core/src/test/java/org/apache/maven/internal/impl/TestArtifactHandler.java
index cb86c6efdb..68281e9169 100644
---
a/maven-core/src/test/java/org/apache/maven/internal/impl/TestArtifactHandler.java
+++
b/maven-core/src/test/java/org/apache/maven/internal/impl/TestArtifactHandler.java
@@ -39,30 +39,37 @@ class TestArtifactHandler implements ArtifactHandler {
this.extension = extension;
}
+ @Override
public String getClassifier() {
return null;
}
+ @Override
public String getDirectory() {
return getPackaging() + "s";
}
+ @Override
public String getExtension() {
return extension;
}
+ @Override
public String getLanguage() {
return "java";
}
+ @Override
public String getPackaging() {
return type;
}
+ @Override
public boolean isAddedToClasspath() {
return true;
}
+ @Override
public boolean isIncludesDependencies() {
return false;
}
