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.git
The following commit(s) were added to refs/heads/master by this push:
new 9dd7b01a89 [MNG-7856] Maven Resolver Provider ctor and other minor
code changes (#1223)
9dd7b01a89 is described below
commit 9dd7b01a8953ee31905f0687c1b3fc8713d2e409
Author: Tamas Cservenak <[email protected]>
AuthorDate: Tue Sep 5 21:50:10 2023 +0200
[MNG-7856] Maven Resolver Provider ctor and other minor code changes (#1223)
Maven Resolver Provider gets similar change as other Resolver components
had in MRESOLVER-386.
Also, some minor code updates like adding Override and other cosmetic stuff.
Forward port of 1ac8be50c82aa5f0335d5d8fe1da132fbf6573ac
---
https://issues.apache.org/jira/browse/MNG-7856
---
.../repository/internal/ArtifactDescriptorReaderDelegate.java | 8 ++++----
.../apache/maven/repository/internal/ArtifactDescriptorUtils.java | 2 +-
.../repository/internal/DefaultArtifactDescriptorReader.java | 1 +
.../org/apache/maven/repository/internal/DefaultModelCache.java | 2 ++
.../maven/repository/internal/DefaultVersionRangeResolver.java | 1 +
.../apache/maven/repository/internal/DefaultVersionResolver.java | 1 +
.../apache/maven/repository/internal/LocalSnapshotMetadata.java | 5 +++++
.../maven/repository/internal/LocalSnapshotMetadataGenerator.java | 3 +++
.../java/org/apache/maven/repository/internal/MavenMetadata.java | 5 +++++
.../org/apache/maven/repository/internal/MavenResolverModule.java | 1 +
.../apache/maven/repository/internal/MavenSnapshotMetadata.java | 4 ++++
.../org/apache/maven/repository/internal/RelocatedArtifact.java | 8 ++++++++
.../apache/maven/repository/internal/RemoteSnapshotMetadata.java | 1 +
.../repository/internal/RemoteSnapshotMetadataGenerator.java | 3 +++
.../org/apache/maven/repository/internal/VersionsMetadata.java | 5 +++++
.../maven/repository/internal/VersionsMetadataGenerator.java | 7 +++++--
16 files changed, 50 insertions(+), 7 deletions(-)
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
index 1ea74fcfb0..0e6f684cf9 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -44,7 +44,7 @@ import org.eclipse.aether.resolution.ArtifactDescriptorResult;
/**
* Populates Aether {@link ArtifactDescriptorResult} from Maven project {@link
Model}.
- *
+ * <p/>
* <strong>Note:</strong> This class is part of work in progress and can be
changed or removed without notice.
* @since 3.2.4
*/
@@ -95,8 +95,8 @@ public class ArtifactDescriptorReaderDelegate {
stereotype = new DefaultArtifactType(dependency.getType());
}
- boolean system =
- dependency.getSystemPath() != null &&
dependency.getSystemPath().length() > 0;
+ boolean system = dependency.getSystemPath() != null
+ && !dependency.getSystemPath().isEmpty();
Map<String, String> props = null;
if (system) {
@@ -134,7 +134,7 @@ public class ArtifactDescriptorReaderDelegate {
if (distMgmt != null) {
downloadUrl = distMgmt.getDownloadUrl();
}
- if (downloadUrl != null && downloadUrl.length() > 0) {
+ if (downloadUrl != null && !downloadUrl.isEmpty()) {
Artifact artifact = result.getArtifact();
Map<String, String> props = new
HashMap<>(artifact.getProperties());
props.put(ArtifactProperties.DOWNLOAD_URL, downloadUrl);
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
index 2bcab215c6..cd6eaa56f1 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
@@ -36,7 +36,7 @@ public class ArtifactDescriptorUtils {
public static Artifact toPomArtifact(Artifact artifact) {
Artifact pomArtifact = artifact;
- if (pomArtifact.getClassifier().length() > 0 ||
!"pom".equals(pomArtifact.getExtension())) {
+ if (!pomArtifact.getClassifier().isEmpty() ||
!"pom".equals(pomArtifact.getExtension())) {
pomArtifact =
new DefaultArtifact(artifact.getGroupId(),
artifact.getArtifactId(), "pom", artifact.getVersion());
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 8a3ed3ed6c..51ef4a0aa9 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -103,6 +103,7 @@ public class DefaultArtifactDescriptorReader implements
ArtifactDescriptorReader
this.modelCacheFactory = Objects.requireNonNull(modelCacheFactory,
"modelCacheFactory cannot be null");
}
+ @Override
public ArtifactDescriptorResult readArtifactDescriptor(
RepositorySystemSession session, ArtifactDescriptorRequest
request) throws ArtifactDescriptorException {
ArtifactDescriptorResult result = new
ArtifactDescriptorResult(request);
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
index 4bcb09691c..bf6b622386 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
@@ -63,10 +63,12 @@ public class DefaultModelCache implements ModelCache {
put(new SourceCacheKey(path, tag), data);
}
+ @Override
public Object get(String groupId, String artifactId, String version,
String tag) {
return get(new GavCacheKey(groupId, artifactId, version, tag));
}
+ @Override
public void put(String groupId, String artifactId, String version, String
tag, Object data) {
put(new GavCacheKey(groupId, artifactId, version, tag), data);
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index 7a0a168806..6611efdb13 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -86,6 +86,7 @@ public class DefaultVersionRangeResolver implements
VersionRangeResolver {
this.versionScheme = Objects.requireNonNull(versionScheme,
"versionScheme cannot be null");
}
+ @Override
public VersionRangeResult resolveVersionRange(RepositorySystemSession
session, VersionRangeRequest request)
throws VersionRangeResolutionException {
VersionRangeResult result = new VersionRangeResult(request);
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index 22b3980f9b..2f793313a0 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -94,6 +94,7 @@ public class DefaultVersionResolver implements
VersionResolver {
}
@SuppressWarnings("checkstyle:methodlength")
+ @Override
public VersionResult resolveVersion(RepositorySystemSession session,
VersionRequest request)
throws VersionResolutionException {
RequestTrace trace = RequestTrace.newChild(request.getTrace(),
request);
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
index 55141b3ca5..99b9bb36fb 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
@@ -65,6 +65,7 @@ final class LocalSnapshotMetadata extends MavenMetadata {
artifacts.add(artifact);
}
+ @Override
public MavenMetadata setFile(File file) {
return new LocalSnapshotMetadata(metadata, file, timestamp);
}
@@ -113,18 +114,22 @@ final class LocalSnapshotMetadata extends MavenMetadata {
return classifier + ':' + extension;
}
+ @Override
public String getGroupId() {
return metadata.getGroupId();
}
+ @Override
public String getArtifactId() {
return metadata.getArtifactId();
}
+ @Override
public String getVersion() {
return metadata.getVersion();
}
+ @Override
public Nature getNature() {
return Nature.SNAPSHOT;
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
index 5a7f3a3444..ad08a4cfa9 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
@@ -48,6 +48,7 @@ class LocalSnapshotMetadataGenerator implements
MetadataGenerator {
snapshots = new LinkedHashMap<>();
}
+ @Override
public Collection<? extends Metadata> prepare(Collection<? extends
Artifact> artifacts) {
for (Artifact artifact : artifacts) {
if (artifact.isSnapshot()) {
@@ -64,10 +65,12 @@ class LocalSnapshotMetadataGenerator implements
MetadataGenerator {
return Collections.emptyList();
}
+ @Override
public Artifact transformArtifact(Artifact artifact) {
return artifact;
}
+ @Override
public Collection<? extends Metadata> finish(Collection<? extends
Artifact> artifacts) {
return snapshots.values();
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
index 4b50d96293..a611da4cdf 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
@@ -57,14 +57,17 @@ abstract class MavenMetadata extends AbstractMetadata
implements MergeableMetada
this.timestamp = timestamp;
}
+ @Override
public String getType() {
return MAVEN_METADATA_XML;
}
+ @Override
public File getFile() {
return file;
}
+ @Override
public void merge(File existing, File result) throws RepositoryException {
Metadata recessive = read(existing);
@@ -75,6 +78,7 @@ abstract class MavenMetadata extends AbstractMetadata
implements MergeableMetada
merged = true;
}
+ @Override
public boolean isMerged() {
return merged;
}
@@ -102,6 +106,7 @@ abstract class MavenMetadata extends AbstractMetadata
implements MergeableMetada
}
}
+ @Override
public Map<String, String> getProperties() {
return Collections.emptyMap();
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenResolverModule.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenResolverModule.java
index 1dd85e300f..b04cd3aeea 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenResolverModule.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenResolverModule.java
@@ -40,6 +40,7 @@ import org.eclipse.aether.version.VersionScheme;
/**
* MavenResolverModule
*/
+@Deprecated
public final class MavenResolverModule extends AbstractModule {
@Override
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
index 4ce891b775..2b75523a42 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
@@ -64,18 +64,22 @@ abstract class MavenSnapshotMetadata extends MavenMetadata {
return classifier + ':' + extension;
}
+ @Override
public String getGroupId() {
return metadata.getGroupId();
}
+ @Override
public String getArtifactId() {
return metadata.getArtifactId();
}
+ @Override
public String getVersion() {
return metadata.getVersion();
}
+ @Override
public Nature getNature() {
return Nature.SNAPSHOT;
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
index 0797fd7fdd..1053ef983d 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
@@ -49,6 +49,7 @@ public final class RelocatedArtifact extends AbstractArtifact
{
this.message = (message != null && message.length() > 0) ? message :
null;
}
+ @Override
public String getGroupId() {
if (groupId != null) {
return groupId;
@@ -57,6 +58,7 @@ public final class RelocatedArtifact extends AbstractArtifact
{
}
}
+ @Override
public String getArtifactId() {
if (artifactId != null) {
return artifactId;
@@ -65,6 +67,7 @@ public final class RelocatedArtifact extends AbstractArtifact
{
}
}
+ @Override
public String getVersion() {
if (version != null) {
return version;
@@ -101,22 +104,27 @@ public final class RelocatedArtifact extends
AbstractArtifact {
return new RelocatedArtifact(artifact.setProperties(properties),
groupId, artifactId, version, message);
}
+ @Override
public String getClassifier() {
return artifact.getClassifier();
}
+ @Override
public String getExtension() {
return artifact.getExtension();
}
+ @Override
public File getFile() {
return artifact.getFile();
}
+ @Override
public String getProperty(String key, String defaultValue) {
return artifact.getProperty(key, defaultValue);
}
+ @Override
public Map<String, String> getProperties() {
return artifact.getProperties();
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
index 9ccc65f0a8..578105719b 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
@@ -52,6 +52,7 @@ final class RemoteSnapshotMetadata extends
MavenSnapshotMetadata {
super(metadata, file, timestamp);
}
+ @Override
public MavenMetadata setFile(File file) {
return new RemoteSnapshotMetadata(metadata, file, timestamp);
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
index 3a5022a934..2fcef26645 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
@@ -61,6 +61,7 @@ class RemoteSnapshotMetadataGenerator implements
MetadataGenerator {
}
}
+ @Override
public Collection<? extends Metadata> prepare(Collection<? extends
Artifact> artifacts) {
for (Artifact artifact : artifacts) {
if (artifact.isSnapshot()) {
@@ -77,6 +78,7 @@ class RemoteSnapshotMetadataGenerator implements
MetadataGenerator {
return snapshots.values();
}
+ @Override
public Artifact transformArtifact(Artifact artifact) {
if (artifact.isSnapshot() &&
artifact.getVersion().equals(artifact.getBaseVersion())) {
Object key = RemoteSnapshotMetadata.getKey(artifact);
@@ -89,6 +91,7 @@ class RemoteSnapshotMetadataGenerator implements
MetadataGenerator {
return artifact;
}
+ @Override
public Collection<? extends Metadata> finish(Collection<? extends
Artifact> artifacts) {
return Collections.emptyList();
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
index 8ac1077619..12e1ce0a25 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
@@ -93,22 +93,27 @@ final class VersionsMetadata extends MavenMetadata {
return artifact.getGroupId() + ':' + artifact.getArtifactId();
}
+ @Override
public MavenMetadata setFile(File file) {
return new VersionsMetadata(artifact, file, timestamp);
}
+ @Override
public String getGroupId() {
return artifact.getGroupId();
}
+ @Override
public String getArtifactId() {
return artifact.getArtifactId();
}
+ @Override
public String getVersion() {
return "";
}
+ @Override
public Nature getNature() {
return artifact.isSnapshot() ? Nature.RELEASE_OR_SNAPSHOT :
Nature.RELEASE;
}
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
index e24e54be47..f9d98cdf1f 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java
@@ -40,9 +40,9 @@ import org.eclipse.aether.util.ConfigUtils;
*/
class VersionsMetadataGenerator implements MetadataGenerator {
- private Map<Object, VersionsMetadata> versions;
+ private final Map<Object, VersionsMetadata> versions;
- private Map<Object, VersionsMetadata> processedVersions;
+ private final Map<Object, VersionsMetadata> processedVersions;
private final Date timestamp;
@@ -75,14 +75,17 @@ class VersionsMetadataGenerator implements
MetadataGenerator {
}
}
+ @Override
public Collection<? extends Metadata> prepare(Collection<? extends
Artifact> artifacts) {
return Collections.emptyList();
}
+ @Override
public Artifact transformArtifact(Artifact artifact) {
return artifact;
}
+ @Override
public Collection<? extends Metadata> finish(Collection<? extends
Artifact> artifacts) {
for (Artifact artifact : artifacts) {
Object key = VersionsMetadata.getKey(artifact);
