Skip to content

Catching exceptions during property evaluation #1684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
netvl wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −2
Open

Catching exceptions during property evaluation #1684

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions pkl-gradle/src/main/java/org/pkl/gradle/task/EvalTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.io.File;
import java.util.Collections;
import java.util.Set;
import java.util.concurrent.Callable;
import javax.annotation.Nullable;
import org.gradle.api.file.DirectoryProperty;
import org.gradle.api.file.FileCollection;
Expand Down Expand Up @@ -74,7 +75,12 @@ private CliEvaluator createCliEvaluator() {
public FileCollection getEffectiveOutputFiles() {
return getObjects()
.fileCollection()
.from(getProviders().provider(() -> nullToEmpty(createCliEvaluator().getOutputFiles())));
.from(
getProviders()
.provider(
() ->
exceptionToEmpty(
() -> nullToEmpty(createCliEvaluator().getOutputFiles()))));
}

@OutputDirectories
Expand All @@ -84,13 +90,24 @@ public FileCollection getEffectiveOutputDirs() {
.fileCollection()
.from(
getProviders()
.provider(() -> nullToEmpty(createCliEvaluator().getOutputDirectories())));
.provider(
() ->
exceptionToEmpty(
() -> nullToEmpty(createCliEvaluator().getOutputDirectories()))));
}

private static <T> Set<T> nullToEmpty(@Nullable Set<T> set) {
return set == null ? Collections.emptySet() : set;
}

private static <T> Set<T> exceptionToEmpty(Callable<? extends Set<T>> provider) {
try {
return provider.call();
} catch (Exception e) {
return Collections.emptySet();
}
}

@Override
protected void doRunTask() {
//noinspection ResultOfMethodCallIgnored
Expand Down
Loading