Skip to content

Commit 1ac8be5

Browse files
cstamascstamas
authored
[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
1 parent c482de8 commit 1ac8be5

16 files changed

+58
-9
lines changed

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
/**
4646
* Populates Aether {@link ArtifactDescriptorResult} from Maven project {@link Model}.
47-
*
47+
* <p/>
4848
* <strong>Note:</strong> This class is part of work in progress and can be changed or removed without notice.
4949
* @since 3.2.4
5050
*/
@@ -96,7 +96,7 @@ private Dependency convert(org.apache.maven.model.Dependency dependency, Artifac
9696
}
9797

9898
boolean system =
99-
dependency.getSystemPath() != null && dependency.getSystemPath().length() > 0;
99+
dependency.getSystemPath() != null && !dependency.getSystemPath().isEmpty();
100100

101101
Map<String, String> props = null;
102102
if (system) {
@@ -136,7 +136,7 @@ private void setArtifactProperties(ArtifactDescriptorResult result, Model model)
136136
if (distMgmt != null) {
137137
downloadUrl = distMgmt.getDownloadUrl();
138138
}
139-
if (downloadUrl != null && downloadUrl.length() > 0) {
139+
if (downloadUrl != null && !downloadUrl.isEmpty()) {
140140
Artifact artifact = result.getArtifact();
141141
Map<String, String> props = new HashMap<>(artifact.getProperties());
142142
props.put(ArtifactProperties.DOWNLOAD_URL, downloadUrl);

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class ArtifactDescriptorUtils {
3535
public static Artifact toPomArtifact(Artifact artifact) {
3636
Artifact pomArtifact = artifact;
3737

38-
if (pomArtifact.getClassifier().length() > 0 || !"pom".equals(pomArtifact.getExtension())) {
38+
if (!pomArtifact.getClassifier().isEmpty() || !"pom".equals(pomArtifact.getExtension())) {
3939
pomArtifact =
4040
new DefaultArtifact(artifact.getGroupId(), artifact.getArtifactId(), "pom", artifact.getVersion());
4141
}

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,13 @@ public class DefaultArtifactDescriptorReader implements ArtifactDescriptorReader
9191
private final ArtifactDescriptorReaderDelegate artifactDescriptorReaderDelegate =
9292
new ArtifactDescriptorReaderDelegate();
9393

94+
@Deprecated
9495
public DefaultArtifactDescriptorReader() {
9596
// enable no-arg constructor
9697
}
9798

9899
@Inject
99-
DefaultArtifactDescriptorReader(
100+
public DefaultArtifactDescriptorReader(
100101
RemoteRepositoryManager remoteRepositoryManager,
101102
VersionResolver versionResolver,
102103
VersionRangeResolver versionRangeResolver,
@@ -113,6 +114,7 @@ public DefaultArtifactDescriptorReader() {
113114
setModelCacheFactory(modelCacheFactory);
114115
}
115116

117+
@Deprecated
116118
public void initService(ServiceLocator locator) {
117119
setRemoteRepositoryManager(locator.getService(RemoteRepositoryManager.class));
118120
setVersionResolver(locator.getService(VersionResolver.class));
@@ -165,6 +167,7 @@ public DefaultArtifactDescriptorReader setModelCacheFactory(ModelCacheFactory mo
165167
return this;
166168
}
167169

170+
@Override
168171
public ArtifactDescriptorResult readArtifactDescriptor(
169172
RepositorySystemSession session, ArtifactDescriptorRequest request) throws ArtifactDescriptorException {
170173
ArtifactDescriptorResult result = new ArtifactDescriptorResult(request);

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java

+2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ private DefaultModelCache(RepositorySystemSession session) {
4646
this.cache = session.getCache();
4747
}
4848

49+
@Override
4950
public Object get(String groupId, String artifactId, String version, String tag) {
5051
return cache.get(session, new Key(groupId, artifactId, version, tag));
5152
}
5253

54+
@Override
5355
public void put(String groupId, String artifactId, String version, String tag, Object data) {
5456
cache.put(session, new Key(groupId, artifactId, version, tag), data);
5557
}

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,13 @@ public class DefaultVersionRangeResolver implements VersionRangeResolver, Servic
7777

7878
private RepositoryEventDispatcher repositoryEventDispatcher;
7979

80+
@Deprecated
8081
public DefaultVersionRangeResolver() {
8182
// enable default constructor
8283
}
8384

8485
@Inject
85-
DefaultVersionRangeResolver(
86+
public DefaultVersionRangeResolver(
8687
MetadataResolver metadataResolver,
8788
SyncContextFactory syncContextFactory,
8889
RepositoryEventDispatcher repositoryEventDispatcher) {
@@ -91,6 +92,7 @@ public DefaultVersionRangeResolver() {
9192
setRepositoryEventDispatcher(repositoryEventDispatcher);
9293
}
9394

95+
@Deprecated
9496
public void initService(ServiceLocator locator) {
9597
setMetadataResolver(locator.getService(MetadataResolver.class));
9698
setSyncContextFactory(locator.getService(SyncContextFactory.class));
@@ -114,6 +116,7 @@ public DefaultVersionRangeResolver setRepositoryEventDispatcher(
114116
return this;
115117
}
116118

119+
@Override
117120
public VersionRangeResult resolveVersionRange(RepositorySystemSession session, VersionRangeRequest request)
118121
throws VersionRangeResolutionException {
119122
VersionRangeResult result = new VersionRangeResult(request);

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,13 @@ public class DefaultVersionResolver implements VersionResolver, Service {
8686

8787
private RepositoryEventDispatcher repositoryEventDispatcher;
8888

89+
@Deprecated
8990
public DefaultVersionResolver() {
9091
// enable no-arg constructor
9192
}
9293

9394
@Inject
94-
DefaultVersionResolver(
95+
public DefaultVersionResolver(
9596
MetadataResolver metadataResolver,
9697
SyncContextFactory syncContextFactory,
9798
RepositoryEventDispatcher repositoryEventDispatcher) {
@@ -100,6 +101,7 @@ public DefaultVersionResolver() {
100101
setRepositoryEventDispatcher(repositoryEventDispatcher);
101102
}
102103

104+
@Deprecated
103105
public void initService(ServiceLocator locator) {
104106
setMetadataResolver(locator.getService(MetadataResolver.class));
105107
setSyncContextFactory(locator.getService(SyncContextFactory.class));
@@ -123,6 +125,7 @@ public DefaultVersionResolver setRepositoryEventDispatcher(RepositoryEventDispat
123125
}
124126

125127
@SuppressWarnings("checkstyle:methodlength")
128+
@Override
126129
public VersionResult resolveVersion(RepositorySystemSession session, VersionRequest request)
127130
throws VersionResolutionException {
128131
RequestTrace trace = RequestTrace.newChild(request.getTrace(), request);

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java

+5
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public void bind(Artifact artifact) {
7373
artifacts.add(artifact);
7474
}
7575

76+
@Override
7677
public MavenMetadata setFile(File file) {
7778
return new LocalSnapshotMetadata(metadata, file, legacyFormat, timestamp);
7879
}
@@ -123,18 +124,22 @@ private String getKey(String classifier, String extension) {
123124
return classifier + ':' + extension;
124125
}
125126

127+
@Override
126128
public String getGroupId() {
127129
return metadata.getGroupId();
128130
}
129131

132+
@Override
130133
public String getArtifactId() {
131134
return metadata.getArtifactId();
132135
}
133136

137+
@Override
134138
public String getVersion() {
135139
return metadata.getVersion();
136140
}
137141

142+
@Override
138143
public Nature getNature() {
139144
return Nature.SNAPSHOT;
140145
}

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class LocalSnapshotMetadataGenerator implements MetadataGenerator {
5252
snapshots = new LinkedHashMap<>();
5353
}
5454

55+
@Override
5556
public Collection<? extends Metadata> prepare(Collection<? extends Artifact> artifacts) {
5657
for (Artifact artifact : artifacts) {
5758
if (artifact.isSnapshot()) {
@@ -68,10 +69,12 @@ public Collection<? extends Metadata> prepare(Collection<? extends Artifact> art
6869
return Collections.emptyList();
6970
}
7071

72+
@Override
7173
public Artifact transformArtifact(Artifact artifact) {
7274
return artifact;
7375
}
7476

77+
@Override
7578
public Collection<? extends Metadata> finish(Collection<? extends Artifact> artifacts) {
7679
return snapshots.values();
7780
}

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java

+5
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,17 @@ protected MavenMetadata(Metadata metadata, File file, Date timestamp) {
5757
this.timestamp = timestamp;
5858
}
5959

60+
@Override
6061
public String getType() {
6162
return MAVEN_METADATA_XML;
6263
}
6364

65+
@Override
6466
public File getFile() {
6567
return file;
6668
}
6769

70+
@Override
6871
public void merge(File existing, File result) throws RepositoryException {
6972
Metadata recessive = read(existing);
7073

@@ -75,6 +78,7 @@ public void merge(File existing, File result) throws RepositoryException {
7578
merged = true;
7679
}
7780

81+
@Override
7882
public boolean isMerged() {
7983
return merged;
8084
}
@@ -104,6 +108,7 @@ private void write(File metadataFile, Metadata metadata) throws RepositoryExcept
104108
}
105109
}
106110

111+
@Override
107112
public Map<String, String> getProperties() {
108113
return Collections.emptyMap();
109114
}

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenResolverModule.java

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
/**
4040
* MavenResolverModule
4141
*/
42+
@Deprecated
4243
public final class MavenResolverModule extends AbstractModule {
4344

4445
@Override

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java

+4
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,22 @@ protected String getKey(String classifier, String extension) {
6969
return classifier + ':' + extension;
7070
}
7171

72+
@Override
7273
public String getGroupId() {
7374
return metadata.getGroupId();
7475
}
7576

77+
@Override
7678
public String getArtifactId() {
7779
return metadata.getArtifactId();
7880
}
7981

82+
@Override
8083
public String getVersion() {
8184
return metadata.getVersion();
8285
}
8386

87+
@Override
8488
public Nature getNature() {
8589
return Nature.SNAPSHOT;
8690
}

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java

+8
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public final class RelocatedArtifact extends AbstractArtifact {
4949
this.message = (message != null && message.length() > 0) ? message : null;
5050
}
5151

52+
@Override
5253
public String getGroupId() {
5354
if (groupId != null) {
5455
return groupId;
@@ -57,6 +58,7 @@ public String getGroupId() {
5758
}
5859
}
5960

61+
@Override
6062
public String getArtifactId() {
6163
if (artifactId != null) {
6264
return artifactId;
@@ -65,6 +67,7 @@ public String getArtifactId() {
6567
}
6668
}
6769

70+
@Override
6871
public String getVersion() {
6972
if (version != null) {
7073
return version;
@@ -101,22 +104,27 @@ public Artifact setProperties(Map<String, String> properties) {
101104
return new RelocatedArtifact(artifact.setProperties(properties), groupId, artifactId, version, message);
102105
}
103106

107+
@Override
104108
public String getClassifier() {
105109
return artifact.getClassifier();
106110
}
107111

112+
@Override
108113
public String getExtension() {
109114
return artifact.getExtension();
110115
}
111116

117+
@Override
112118
public File getFile() {
113119
return artifact.getFile();
114120
}
115121

122+
@Override
116123
public String getProperty(String key, String defaultValue) {
117124
return artifact.getProperty(key, defaultValue);
118125
}
119126

127+
@Override
120128
public Map<String, String> getProperties() {
121129
return artifact.getProperties();
122130
}

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ private RemoteSnapshotMetadata(Metadata metadata, File file, boolean legacyForma
5252
super(metadata, file, legacyFormat, timestamp);
5353
}
5454

55+
@Override
5556
public MavenMetadata setFile(File file) {
5657
return new RemoteSnapshotMetadata(metadata, file, legacyFormat, timestamp);
5758
}

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java

+3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ class RemoteSnapshotMetadataGenerator implements MetadataGenerator {
6565
}
6666
}
6767

68+
@Override
6869
public Collection<? extends Metadata> prepare(Collection<? extends Artifact> artifacts) {
6970
for (Artifact artifact : artifacts) {
7071
if (artifact.isSnapshot()) {
@@ -81,6 +82,7 @@ public Collection<? extends Metadata> prepare(Collection<? extends Artifact> art
8182
return snapshots.values();
8283
}
8384

85+
@Override
8486
public Artifact transformArtifact(Artifact artifact) {
8587
if (artifact.isSnapshot() && artifact.getVersion().equals(artifact.getBaseVersion())) {
8688
Object key = RemoteSnapshotMetadata.getKey(artifact);
@@ -93,6 +95,7 @@ public Artifact transformArtifact(Artifact artifact) {
9395
return artifact;
9496
}
9597

98+
@Override
9699
public Collection<? extends Metadata> finish(Collection<? extends Artifact> artifacts) {
97100
return Collections.emptyList();
98101
}

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java

+5
Original file line numberDiff line numberDiff line change
@@ -93,22 +93,27 @@ public static Object getKey(Artifact artifact) {
9393
return artifact.getGroupId() + ':' + artifact.getArtifactId();
9494
}
9595

96+
@Override
9697
public MavenMetadata setFile(File file) {
9798
return new VersionsMetadata(artifact, file, timestamp);
9899
}
99100

101+
@Override
100102
public String getGroupId() {
101103
return artifact.getGroupId();
102104
}
103105

106+
@Override
104107
public String getArtifactId() {
105108
return artifact.getArtifactId();
106109
}
107110

111+
@Override
108112
public String getVersion() {
109113
return "";
110114
}
111115

116+
@Override
112117
public Nature getNature() {
113118
return artifact.isSnapshot() ? Nature.RELEASE_OR_SNAPSHOT : Nature.RELEASE;
114119
}

0 commit comments

Comments
 (0)