Skip to content

Properly check empty native image options for Maven and Gradle #5112

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

Merged
merged 1 commit into from
Nov 1, 2019
Merged

Properly check empty native image options for Maven and Gradle #5112

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public void accept(ConfigBuilder configBuilder) {

configs.add("quarkus.native.add-all-charsets", addAllCharsets);

if (additionalBuildArgs != null) {
if (additionalBuildArgs != null && !additionalBuildArgs.isEmpty()) {
configs.add("quarkus.native.additional-build-args",
additionalBuildArgs.stream()
.map(val -> val.replace("\\", "\\\\"))
Expand All @@ -448,9 +448,9 @@ public void accept(ConfigBuilder configBuilder) {

configs.add("quarkus.native.debug-symbols", debugSymbols);
configs.add("quarkus.native.enable-reports", enableReports);
if (containerRuntime != null) {
if (containerRuntime != null && !containerRuntime.trim().isEmpty()) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might not be entirely necessary but I wanted to be extra sure.

configs.add("quarkus.native.container-runtime", containerRuntime);
} else if (dockerBuild != null) {
} else if (dockerBuild != null && !dockerBuild.trim().isEmpty()) {
if (!dockerBuild.isEmpty() && !dockerBuild.toLowerCase().equals("false")) {
if (dockerBuild.toLowerCase().equals("true")) {
configs.add("quarkus.native.container-runtime", "docker");
Expand All @@ -459,7 +459,7 @@ public void accept(ConfigBuilder configBuilder) {
}
}
}
if (containerRuntimeOptions != null) {
if (containerRuntimeOptions != null && !containerRuntimeOptions.trim().isEmpty()) {
configs.add("quarkus.native.container-runtime-options", containerRuntimeOptions);
}
configs.add("quarkus.native.dump-proxies", dumpProxies);
Expand All @@ -479,10 +479,10 @@ public void accept(ConfigBuilder configBuilder) {

configs.add("quarkus.native.full-stack-traces", fullStackTraces);

if (graalvmHome != null) {
if (graalvmHome != null && !graalvmHome.trim().isEmpty()) {
configs.add("quarkus.native.graalvm-home", graalvmHome);
}
if (nativeImageXmx != null) {
if (nativeImageXmx != null && !nativeImageXmx.trim().isEmpty()) {
configs.add("quarkus.native.native-image-xmx", nativeImageXmx);
}
configs.add("quarkus.native.report-errors-at-runtime", reportErrorsAtRuntime);
Expand Down
16 changes: 8 additions & 8 deletions devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ public void accept(ConfigBuilder configBuilder) {
if (addAllCharsets != null) {
configs.add("quarkus.native.add-all-charsets", addAllCharsets.toString());
}
if (additionalBuildArgs != null) {
if (additionalBuildArgs != null && !additionalBuildArgs.isEmpty()) {
configs.add("quarkus.native.additional-build-args", additionalBuildArgs);
}
if (autoServiceLoaderRegistration != null) {
Expand All @@ -345,18 +345,18 @@ public void accept(ConfigBuilder configBuilder) {
if (enableReports != null) {
configs.add("quarkus.native.enable-reports", enableReports.toString());
}
if (containerRuntime != null) {
if (containerRuntime != null && !containerRuntime.trim().isEmpty()) {
configs.add("quarkus.native.container-runtime", containerRuntime);
} else if (dockerBuild != null) {
if (!dockerBuild.isEmpty() && !dockerBuild.toLowerCase().equals("false")) {
} else if (dockerBuild != null && !dockerBuild.trim().isEmpty()) {
if (!dockerBuild.toLowerCase().equals("false")) {
if (dockerBuild.toLowerCase().equals("true")) {
configs.add("quarkus.native.container-runtime", "docker");
} else {
configs.add("quarkus.native.container-runtime", dockerBuild);
}
}
}
if (containerRuntimeOptions != null) {
if (containerRuntimeOptions != null && !containerRuntimeOptions.trim().isEmpty()) {
configs.add("quarkus.native.container-runtime-options", containerRuntimeOptions);
}
if (dumpProxies != null) {
Expand Down Expand Up @@ -395,13 +395,13 @@ public void accept(ConfigBuilder configBuilder) {
if (fullStackTraces != null) {
configs.add("quarkus.native.full-stack-traces", fullStackTraces.toString());
}
if (graalvmHome != null) {
if (graalvmHome != null && !graalvmHome.trim().isEmpty()) {
configs.add("quarkus.native.graalvm-home", graalvmHome.toString());
}
if (javaHome != null) {
if (javaHome != null && !javaHome.toString().isEmpty()) {
configs.add("quarkus.native.java-home", javaHome.toString());
}
if (nativeImageXmx != null) {
if (nativeImageXmx != null && !nativeImageXmx.trim().isEmpty()) {
configs.add("quarkus.native.native-image-xmx", nativeImageXmx.toString());
}
if (reportErrorsAtRuntime != null) {
Expand Down