Objects.requireNonNullElse

ash211 · ash211 · commit bb18ad9388a4 · 2024-01-24T21:20:03.000-08:00
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/Main.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/Main.java
@@ -28,6 +28,7 @@
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -219,10 +220,10 @@ public static CommandLineOptions processArgs(String... args) throws UsageExcepti
         try {
             parameters = CommandLineOptionsParser.parse(Arrays.asList(args));
         } catch (IllegalArgumentException e) {
-            throw new UsageException(Optional.ofNullable(e.getMessage()).orElse("null"));
+            throw new UsageException(Objects.requireNonNullElse(e.getMessage(), "null"));
         } catch (Throwable t) {
             t.printStackTrace();
-            throw new UsageException(Optional.ofNullable(t.getMessage()).orElse("null"));
+            throw new UsageException(Objects.requireNonNullElse(t.getMessage(), "null"));
         }
         int filesToFormat = parameters.files().size();
         if (parameters.stdin()) {
