Merge pull request #16516 from geoand/remove-null-file

Remove NULL_FILE usage now that we moved to Java 11
quarkusio · Apr 14, 2021 · 3d6d3e9 · 3d6d3e9
2 parents d702b24 + 9a4bf00
commit 3d6d3e9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java
@@ -47,7 +47,8 @@ private String doGetEffectiveCommand() {
                     List<String> command = new ArrayList<>(1 + markerArgs.size());
                     command.add(defaultCommand);
                     command.addAll(markerArgs);
-                    new ProcessBuilder(command).redirectError(IdeUtil.NULL_FILE).redirectOutput(IdeUtil.NULL_FILE).start()
+                    new ProcessBuilder(command).redirectError(ProcessBuilder.Redirect.DISCARD.file())
+                            .redirectOutput(ProcessBuilder.Redirect.DISCARD.file()).start()
                             .waitFor(10,
                                     TimeUnit.SECONDS);
                     return defaultCommand;

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeUtil.java
@@ -1,14 +1,9 @@
 package io.quarkus.deployment.ide;
 
-import java.io.File;
 import java.util.Locale;
 
 final class IdeUtil {
 
-    // copied from Java 9
-    // TODO remove when we move to Java 11
-    static final File NULL_FILE = new File(isWindows() ? "NUL" : "/dev/null");
-
     private IdeUtil() {
     }
 

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java
@@ -7,7 +7,6 @@
 
 import java.io.BufferedInputStream;
 import java.io.BufferedWriter;
-import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -728,8 +727,8 @@ private boolean decompile(Path fernflowerJar, Path decompiledOutputDir, Path jar
             if (log.isDebugEnabled()) {
                 processBuilder.inheritIO();
             } else {
-                processBuilder.redirectError(NULL_FILE);
-                processBuilder.redirectOutput(NULL_FILE);
+                processBuilder.redirectError(ProcessBuilder.Redirect.DISCARD.file())
+                        .redirectOutput(ProcessBuilder.Redirect.DISCARD.file());
             }
             exitCode = processBuilder.start().waitFor();
         } catch (Exception e) {
@@ -1313,9 +1312,4 @@ public boolean test(Path path, BasicFileAttributes basicFileAttributes) {
             return basicFileAttributes.isRegularFile() && path.toString().endsWith(".json");
         }
     }
-
-    // copied from Java 9
-    // TODO remove when we move to Java 11
-
-    private static final File NULL_FILE = new File(SystemUtils.IS_OS_WINDOWS ? "NUL" : "/dev/null");
 }