This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new 1ac8be50c8 [MNG-7856] Maven Resolver Provider ctor and other minor
code changes (#1223)
1ac8be50c8 is described below
commit 1ac8be50c82aa5f0335d5d8fe1da132fbf6573ac
Author: Tamas Cservenak <[email protected]>
AuthorDate: Tue Sep 5 21:41:20 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.
---
https://issues.apache.org/jira/browse/MNG-7856
---
.../repository/internal/ArtifactDescriptorReaderDelegate.java | 6 +++---
.../apache/maven/repository/internal/ArtifactDescriptorUtils.java | 2 +-
.../repository/internal/DefaultArtifactDescriptorReader.java | 5 ++++-
.../org/apache/maven/repository/internal/DefaultModelCache.java | 2 ++
.../maven/repository/internal/DefaultVersionRangeResolver.java | 5 ++++-
.../apache/maven/repository/internal/DefaultVersionResolver.java | 5 ++++-
.../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, 58 insertions(+), 9 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 04e53d7fa6..c600be0d9a 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
*/
@@ -96,7 +96,7 @@ public class ArtifactDescriptorReaderDelegate {
}
boolean system =
- dependency.getSystemPath() != null &&
dependency.getSystemPath().length() > 0;
+ dependency.getSystemPath() != null &&
!dependency.getSystemPath().isEmpty();
Map<String, String> props = null;
if (system) {
@@ -136,7 +136,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 70bc429030..b2cd07a872 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
@@ -35,7 +35,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 580b8e89ac..bbbc463e86 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
@@ -91,12 +91,13 @@ public class DefaultArtifactDescriptorReader implements
ArtifactDescriptorReader
private final ArtifactDescriptorReaderDelegate
artifactDescriptorReaderDelegate =
new ArtifactDescriptorReaderDelegate();
+ @Deprecated
public DefaultArtifactDescriptorReader() {
// enable no-arg constructor
}
@Inject
- DefaultArtifactDescriptorReader(
+ public DefaultArtifactDescriptorReader(
RemoteRepositoryManager remoteRepositoryManager,
VersionResolver versionResolver,
VersionRangeResolver versionRangeResolver,
@@ -113,6 +114,7 @@ public class DefaultArtifactDescriptorReader implements
ArtifactDescriptorReader
setModelCacheFactory(modelCacheFactory);
}
+ @Deprecated
public void initService(ServiceLocator locator) {
setRemoteRepositoryManager(locator.getService(RemoteRepositoryManager.class));
setVersionResolver(locator.getService(VersionResolver.class));
@@ -165,6 +167,7 @@ public class DefaultArtifactDescriptorReader implements
ArtifactDescriptorReader
return this;
}
+ @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 beeb023f49..e2d0450644 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
@@ -46,10 +46,12 @@ class DefaultModelCache implements ModelCache {
this.cache = session.getCache();
}
+ @Override
public Object get(String groupId, String artifactId, String version,
String tag) {
return cache.get(session, new Key(groupId, artifactId, version, tag));
}
+ @Override
public void put(String groupId, String artifactId, String version, String
tag, Object data) {
cache.put(session, new Key(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 55bfa01393..cf4eb1f77e 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
@@ -77,12 +77,13 @@ public class DefaultVersionRangeResolver implements
VersionRangeResolver, Servic
private RepositoryEventDispatcher repositoryEventDispatcher;
+ @Deprecated
public DefaultVersionRangeResolver() {
// enable default constructor
}
@Inject
- DefaultVersionRangeResolver(
+ public DefaultVersionRangeResolver(
MetadataResolver metadataResolver,
SyncContextFactory syncContextFactory,
RepositoryEventDispatcher repositoryEventDispatcher) {
@@ -91,6 +92,7 @@ public class DefaultVersionRangeResolver implements
VersionRangeResolver, Servic
setRepositoryEventDispatcher(repositoryEventDispatcher);
}
+ @Deprecated
public void initService(ServiceLocator locator) {
setMetadataResolver(locator.getService(MetadataResolver.class));
setSyncContextFactory(locator.getService(SyncContextFactory.class));
@@ -114,6 +116,7 @@ public class DefaultVersionRangeResolver implements
VersionRangeResolver, Servic
return this;
}
+ @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 226d1325f5..cccbd9f5ff 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
@@ -86,12 +86,13 @@ public class DefaultVersionResolver implements
VersionResolver, Service {
private RepositoryEventDispatcher repositoryEventDispatcher;
+ @Deprecated
public DefaultVersionResolver() {
// enable no-arg constructor
}
@Inject
- DefaultVersionResolver(
+ public DefaultVersionResolver(
MetadataResolver metadataResolver,
SyncContextFactory syncContextFactory,
RepositoryEventDispatcher repositoryEventDispatcher) {
@@ -100,6 +101,7 @@ public class DefaultVersionResolver implements
VersionResolver, Service {
setRepositoryEventDispatcher(repositoryEventDispatcher);
}
+ @Deprecated
public void initService(ServiceLocator locator) {
setMetadataResolver(locator.getService(MetadataResolver.class));
setSyncContextFactory(locator.getService(SyncContextFactory.class));
@@ -123,6 +125,7 @@ public class DefaultVersionResolver implements
VersionResolver, Service {
}
@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 86c2f1f716..3d1817ce97 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
@@ -73,6 +73,7 @@ final class LocalSnapshotMetadata extends MavenMetadata {
artifacts.add(artifact);
}
+ @Override
public MavenMetadata setFile(File file) {
return new LocalSnapshotMetadata(metadata, file, legacyFormat,
timestamp);
}
@@ -123,18 +124,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 534efd768f..1062548fa6 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
@@ -52,6 +52,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()) {
@@ -68,10 +69,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 799cb5c1ec..63c49d5a39 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;
}
@@ -104,6 +108,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 ea60952bb5..ec8caf6bc7 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
@@ -39,6 +39,7 @@ import org.eclipse.aether.impl.guice.AetherModule;
/**
* 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 f04c2a43be..bebda1079a 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
@@ -69,18 +69,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 f26ace8cd0..360e20bb4c 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, legacyFormat, timestamp);
}
+ @Override
public MavenMetadata setFile(File file) {
return new RemoteSnapshotMetadata(metadata, file, legacyFormat,
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 b2f64f2c5f..87e554787c 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
@@ -65,6 +65,7 @@ class RemoteSnapshotMetadataGenerator implements
MetadataGenerator {
}
}
+ @Override
public Collection<? extends Metadata> prepare(Collection<? extends
Artifact> artifacts) {
for (Artifact artifact : artifacts) {
if (artifact.isSnapshot()) {
@@ -81,6 +82,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);
@@ -93,6 +95,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);
