jlengrand/jreleaser
1
0
Fork 0
mirror of https://github.com/jlengrand/jreleaser.git synced 2026-03-10 08:31:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[chore] Refactor artifact transform resolution.

Browse Source
This commit is contained in:
Andres Almiray
2021-09-23 22:14:51 +02:00
parent 257f8a6419
commit 0751a892d9
2 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/jreleaser-model/src/main/java/org/jreleaser/model/Artifact.java
View File

@@ -31,7 +31,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import static java.nio.file.Files.exists;
import static org.jreleaser.model.util.Artifacts.copyFile;
import static org.jreleaser.model.util.Artifacts.checkAndCopyFile;
import static org.jreleaser.util.MustacheUtils.applyTemplate;
import static org.jreleaser.util.StringUtils.isBlank;
import static org.jreleaser.util.StringUtils.isNotBlank;
@@ -73,61 +73,19 @@ public class Artifact implements Domain, ExtraProperties {
public Path getEffectivePath(JReleaserContext context) {
Path rp = getResolvedPath(context);
Path tp = getResolvedTransform(context);
if (null == tp) return rp;
if (!java.nio.file.Files.exists(tp)) {
context.getLogger().debug("transformed artifact does not exist: {}",
context.relativizeToBasedir(tp));
copyFile(context, rp, tp);
} else if (rp.toFile().lastModified() > tp.toFile().lastModified()) {
context.getLogger().debug("{} is newer than {}",
context.relativizeToBasedir(rp),
context.relativizeToBasedir(tp));
copyFile(context, rp, tp);
}
return tp;
return checkAndCopyFile(context, rp, tp);
}
public Path getEffectivePath(JReleaserContext context, Distribution distribution) {
Path rp = getResolvedPath(context, distribution);
Path tp = getResolvedTransform(context, distribution);
if (null == tp) return rp;
if (!java.nio.file.Files.exists(tp)) {
context.getLogger().debug("transformed artifact does not exist: {}",
context.relativizeToBasedir(tp));
copyFile(context, rp, tp);
} else if (rp.toFile().lastModified() > tp.toFile().lastModified()) {
context.getLogger().debug("{} is newer than {}",
context.relativizeToBasedir(rp),
context.relativizeToBasedir(tp));
copyFile(context, rp, tp);
}
return tp;
return checkAndCopyFile(context, rp, tp);
}
public Path getEffectivePath(JReleaserContext context, Assembler assembler) {
Path rp = getResolvedPath(context, assembler);
Path tp = getResolvedTransform(context, assembler);
if (null == tp) return rp;
if (!java.nio.file.Files.exists(tp)) {
context.getLogger().debug("transformed artifact does not exist: {}",
context.relativizeToBasedir(tp));
copyFile(context, rp, tp);
} else if (rp.toFile().lastModified() > tp.toFile().lastModified()) {
context.getLogger().debug("{} is newer than {}",
context.relativizeToBasedir(rp),
context.relativizeToBasedir(tp));
copyFile(context, rp, tp);
}
return tp;
return checkAndCopyFile(context, rp, tp);
}
public Path getResolvedPath(JReleaserContext context, Path basedir, boolean checkIfExists) {
@@ -357,7 +315,7 @@ public class Artifact implements Domain, ExtraProperties {
};
}
public static Artifact of(Path resolvedPath, Map<String,Object> props) {
public static Artifact of(Path resolvedPath, Map<String, Object> props) {
Artifact artifact = new Artifact();
artifact.path = resolvedPath.toAbsolutePath().toString();
artifact.resolvedPath = resolvedPath;

17
core/jreleaser-model/src/main/java/org/jreleaser/model/util/Artifacts.java
View File

@@ -50,6 +50,23 @@ import static org.jreleaser.util.MustacheUtils.applyTemplate;
* @since 0.1.0
*/
public class Artifacts {
public static Path checkAndCopyFile(JReleaserContext context, Path src, Path dest) throws JReleaserException {
if (null == dest) return src;
if (!java.nio.file.Files.exists(dest)) {
context.getLogger().debug("artifact does not exist: {}",
context.relativizeToBasedir(dest));
copyFile(context, src, dest);
} else if (src.toFile().lastModified() > dest.toFile().lastModified()) {
context.getLogger().debug("{} is newer than {}",
context.relativizeToBasedir(src),
context.relativizeToBasedir(dest));
copyFile(context, src, dest);
}
return dest;
}
public static void copyFile(JReleaserContext context, Path src, Path dest) throws JReleaserException {
try {
java.nio.file.Files.createDirectories(dest.getParent());