Replace init method for arguments with custom converter and default provider

Author: Donnerbart

src/main/java/de/donnerbart/split/Arguments.java

@@ -1,14 +1,14 @@
 package de.donnerbart.split;
 
+import com.beust.jcommander.IDefaultProvider;
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.Parameter;
+import com.beust.jcommander.converters.PathConverter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.Objects;
 
 class Arguments {
 
@@ -54,7 +54,8 @@ class Arguments {
     @NotNull NewTestTimeOption newTestTimeOption = NewTestTimeOption.AVERAGE;
 
     @Parameter(names = {"--working-directory", "-w"},
-               description = "The working directory. Defaults to the current directory.")
+               description = "The working directory. Defaults to the current directory.",
+               converter = WorkingDirectoryOptionConverter.class)
     @SuppressWarnings("NotNullFieldNotInitialized")
     @NotNull Path workingDirectory;
 
@@ -69,12 +70,6 @@ class Arguments {
     @Parameter(names = {"--debug", "-d"}, description = "Enables debug logging.")
     boolean debug = false;
 
-    void init() {
-        workingDirectory = Objects.requireNonNullElse(workingDirectory, Paths.get(System.getProperty("user.dir")))
-                .toAbsolutePath()
-                .normalize();
-    }
-
     public static class FormatOptionConverter implements IStringConverter<FormatOption> {
 
         @Override
@@ -96,4 +91,27 @@ public static class NewTestTimeOptionConverter implements IStringConverter<NewTe
                     .orElseThrow();
         }
     }
+
+    public static class WorkingDirectoryOptionConverter extends PathConverter {
+
+        public WorkingDirectoryOptionConverter(final @NotNull String optionName) {
+            super(optionName);
+        }
+
+        @Override
+        public @NotNull Path convert(final @NotNull String value) {
+            return super.convert(value).toAbsolutePath().normalize();
+        }
+    }
+
+    public static class DefaultProvider implements IDefaultProvider {
+
+        @Override
+        public @Nullable String getDefaultValueFor(final @NotNull String optionName) {
+            if (optionName.equals("--working-directory")) {
+                return System.getProperty("user.dir");
+            }
+            return null;
+        }
+    }
 }

src/main/java/de/donnerbart/split/TestSplitMain.java

@@ -55,9 +55,9 @@ public static void main(final @Nullable String @NotNull [] args) throws Exceptio
             final @NotNull Consumer<Integer> exitConsumer,
             final @Nullable String @NotNull [] args) throws Exception {
         final var arguments = new Arguments();
-        final var jCommander = JCommander.newBuilder().addObject(arguments).build();
+        final var defaultProvider = new Arguments.DefaultProvider();
+        final var jCommander = JCommander.newBuilder().addObject(arguments).defaultProvider(defaultProvider).build();
         jCommander.parse(args);
-        arguments.init();
         if (arguments.help) {
             jCommander.usage();
             exitConsumer.accept(0);