natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

URL-based resolvers should accept query parameters in publish patterns

This commit is contained in:
Gintas Grigelionis 2018-06-09 20:48:53 +02:00
parent 95c076bf47
commit bf3e9dcbea
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
View File

@ -20,6 +20,8 @@ package org.apache.ivy.plugins.resolver;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
@ -249,9 +251,9 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver {
try {
FileUtil.copy(new ByteArrayInputStream(ChecksumHelper.computeAsString(src, algorithm)
.getBytes()), csFile, null);
repository.put(
DefaultArtifact.cloneWithAnotherTypeAndExt(artifact, algorithm, artifact.getExt()
+ "." + algorithm), csFile, dest + "." + algorithm, overwrite);
repository.put(DefaultArtifact.cloneWithAnotherTypeAndExt(artifact, algorithm,
artifact.getExt() + "." + algorithm), csFile,
chopQuery(dest, algorithm), overwrite);
} finally {
csFile.delete();
}
@ -269,15 +271,30 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver {
try {
gen.sign(src, tempFile);
repository.put(
DefaultArtifact.cloneWithAnotherTypeAndExt(artifact, gen.getExtension(),
repository.put(DefaultArtifact.cloneWithAnotherTypeAndExt(artifact, gen.getExtension(),
artifact.getExt() + "." + gen.getExtension()), tempFile,
dest + "." + gen.getExtension(), overwrite);
chopQuery(dest, gen.getExtension()), overwrite);
} finally {
tempFile.delete();
}
}
private String chopQuery(String dest, String algorithm) {
if (!dest.contains("?")) {
return dest + "." + algorithm;
}
try {
URL url = new URL(dest);
String query = url.getQuery();
if (query == null ) {
query = "";
}
return dest.replace("?" + query, "") + "." + algorithm;
} catch (MalformedURLException e) {
throw new IllegalArgumentException(e);
}
}
@Override
public DownloadReport download(Artifact[] artifacts, DownloadOptions options) {
EventManager eventManager = getEventManager();