refactoring

Author: h908714124

compiler/src/main/java/net/jbock/context/ParseOrExitMethod.java

@@ -58,8 +58,7 @@ MethodSpec define() {
                     .addStatement("$T.exit(0)", System.class)
                     .endControlFlow();
         }
-        code.add("$1T $2N = $1T.standardBuilder($3N)\n", ParseRequest.class, request, args).indent();
-        code.addStatement(".build()").unindent();
+        code.addStatement("$1T $2N = $1T.maybeExpand($3N)", ParseRequest.class, request, args);
         code.add("return $N($N)", parseMethod.get(), request)
                 .add(".orElseThrow($N -> {\n", notSuccess).indent()
                 .addStatement("$T.builder().build().handle($N)",

core/src/main/java/net/jbock/util/ParseRequest.java

@@ -8,49 +8,17 @@
 /**
  * Input for the generated parser.
  */
-public final class ParseRequest {
-
-    private final Optional<Path> path; // if empty, no @-file expansion will be performed
-    private final List<String> args; // command line arguments, excluding path
-
-    private ParseRequest(Optional<Path> path, List<String> args) {
-        this.path = path;
-        this.args = args;
-    }
+public abstract class ParseRequest {
 
     /**
-     * A builder for {@link ParseRequest}.
-     */
-    public static final class Builder {
-
-        private final Optional<Path> path;
-        private final List<String> rest;
-
-        private Builder(Optional<Path> path, List<String> rest) {
-            this.path = path;
-            this.rest = rest;
-        }
-
-        /**
-         * Creates the parse request.
-         *
-         * @return a parse request
-         */
-        public ParseRequest build() {
-            return new ParseRequest(path, rest);
-        }
-    }
-
-    /**
-     * Creates a builder.
-     *
-     * <p>{@code @file} expansion will be enabled if the input is not empty,
+     * Creates a {@code ParseRequest}.
+     * {@code @-file} expansion will be enabled if the input array is nonempty,
      * and the first token starts with an {@code "@"} character.
      *
      * @param args command line input
-     * @return the options in the file, or an error report
+     * @return a parse request
      */
-    public static Builder standardBuilder(String[] args) {
+    public static ParseRequest maybeExpand(String[] args) {
         if (args.length >= 1
                 && args[0].length() >= 2
                 && args[0].startsWith("@")) {
@@ -62,44 +30,41 @@ public static Builder standardBuilder(String[] args) {
     }
 
     /**
-     * Creates a builder with {@code @file} expansion set to {@code false}.
+     * Creates a {@code ParseRequest} that indicates {@code @-file} expansion should
+     * not be performed.
      *
      * @param args command line input
-     * @return a builder
+     * @return a parse request
      */
-    public static Builder simple(List<String> args) {
-        return new Builder(Optional.empty(), args);
+    public static ParseRequest simple(List<String> args) {
+        return new ParseRequestSimple(args);
     }
 
     /**
-     * Creates a builder with {@code @file} expansion set to {@code true}.
+     * Creates a {@code ParseRequest} that indicates {@code @-file} expansion should
+     * be performed.
      *
-     * @param atFile source for {@code @file} expansion
-     * @param rest the remaining command line arguments, possibly none
-     * @return a builder
+     * @param atFile the {@code @-file}
+     * @param rest additional command line arguments
+     * @return a parse request
      */
-    public static Builder expand(Path atFile, List<String> rest) {
-        return new Builder(Optional.of(atFile), rest);
+    public static ParseRequest expand(Path atFile, List<String> rest) {
+        return new ParseRequestExpand(atFile, rest);
     }
 
     /**
-     * Returns the {@code path} to be used as input for {@code @file} expansion.
-     * If it is empty, {@code @file} expansion should not be performed.
+     * Returns the path of the {@code @-file}, or an empty
+     * {@code Optional} if {@code @-file} expansion is
+     * not requested.
      *
-     * @return input for {@code @file} expansion
+     * @return path of the {@code @-file}, or {@code empty}
      */
-    public Optional<Path> path() {
-        return path;
-    }
+    public abstract Optional<Path> path();
 
     /**
-     * If {@link #path} is empty, contains the command line arguments.
-     * If {@link #path} is nonempty, contains any remaining argument after
-     * the {@code @file} parameter.
+     * Returns the command line arguments, excluding the {@code @-file}.
      *
      * @return command line arguments
      */
-    public List<String> args() {
-        return args;
-    }
+    public abstract List<String> args();
 }

core/src/main/java/net/jbock/util/ParseRequestExpand.java

@@ -0,0 +1,26 @@
+package net.jbock.util;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
+final class ParseRequestExpand extends ParseRequest {
+
+    private final Path path;
+    private final List<String> args;
+
+    ParseRequestExpand(Path path, List<String> args) {
+        this.path = path;
+        this.args = args;
+    }
+
+    @Override
+    public Optional<Path> path() {
+        return Optional.of(path);
+    }
+
+    @Override
+    public List<String> args() {
+        return args;
+    }
+}

core/src/main/java/net/jbock/util/ParseRequestSimple.java

@@ -0,0 +1,24 @@
+package net.jbock.util;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
+final class ParseRequestSimple extends ParseRequest {
+
+    private final List<String> args;
+
+    ParseRequestSimple(List<String> args) {
+        this.args = args;
+    }
+
+    @Override
+    public Optional<Path> path() {
+        return Optional.empty();
+    }
+
+    @Override
+    public List<String> args() {
+        return args;
+    }
+}

examples/src/test/java/net/jbock/examples/CpArgumentsTest.java

@@ -119,7 +119,7 @@ void testAtFileSyntax() throws IOException {
         Path path = foo.resolve("hello.txt");
         Files.write(path, List.of("-r", "\"a\"", "\"'b'\"", "--backup=\\", "'SIMPLE'", ""), StandardCharsets.UTF_8);
         Either<ParsingFailed, CpArguments> result = parser.parse(
-                ParseRequest.expand(path, List.of()).build());
+                ParseRequest.expand(path, List.of()));
         f.assertThat(result)
                 .has(CpArguments::source, "a")
                 .has(CpArguments::dest, "'b'")

examples/src/test/java/net/jbock/examples/HelplessArgumentsTest.java

@@ -18,8 +18,7 @@ class HelplessArgumentsTest {
     @Test
     void testHelpIsAcceptedAsNormalOption() {
         Either<ParsingFailed, HelplessArguments> result =
-                parser.parse(ParseRequest.simple(List.of("--help", "x"))
-                        .build());
+                parser.parse(ParseRequest.simple(List.of("--help", "x")));
         f.assertThat(result)
                 .has(HelplessArguments::required, "x")
                 .has(HelplessArguments::help, true);
@@ -28,17 +27,15 @@ void testHelpIsAcceptedAsNormalOption() {
     @Test
     void errorNoArguments() {
         Either<ParsingFailed, HelplessArguments> result =
-                parser.parse(ParseRequest.simple(List.of(/* empty */))
-                        .build());
+                parser.parse(ParseRequest.simple(List.of(/* empty */)));
         f.assertThat(result)
                 .fails("Missing required parameter REQUIRED");
     }
 
     @Test
     void errorHelpDisabled() {
         Either<ParsingFailed, HelplessArguments> result =
-                parser.parse(ParseRequest.simple(List.of("--help"))
-                        .build());
+                parser.parse(ParseRequest.simple(List.of("--help")));
         f.assertThat(result)
                 .fails("Missing required parameter REQUIRED");
     }

examples/src/test/java/net/jbock/examples/HelplessSuperArgumentsTest.java

@@ -19,8 +19,7 @@ class HelplessSuperArgumentsTest {
     @Test
     void testHelp() {
         Either<ParsingFailed, SuperResult<HelplessSuperArguments>> result =
-                parser.parse(ParseRequest.simple(List.of("--help"))
-                        .build());
+                parser.parse(ParseRequest.simple(List.of("--help")));
         f.assertThat(result).fails("Invalid option: --help");
     }
 }

examples/src/test/java/net/jbock/examples/fixture/ParserTestFixture.java

@@ -45,7 +45,7 @@ public static <E> ParserTestFixture<E> create(Function<ParseRequest, Either<Pars
     }
 
     public AssertionBuilder<E> assertThat(String... args) {
-        ParseRequest request = ParseRequest.simple(List.of(args)).build();
+        ParseRequest request = ParseRequest.simple(List.of(args));
         Either<ParsingFailed, E> instance = parser.apply(request);
         return new AssertionBuilder<>(instance);
     }
@@ -69,8 +69,7 @@ public void assertPrintsHelp(
     }
 
     public E parse(String... args) {
-        ParseRequest request = ParseRequest.simple(List.of(args))
-                .build();
+        ParseRequest request = ParseRequest.simple(List.of(args));
         return parser.apply(request)
                 .orElseThrow(l -> new RuntimeException("expecting success but found " + l.getClass()));
     }