reject unknown tokens if OtherTokens is not present

Author: h908714124

README.md

@@ -68,7 +68,9 @@ abstract class CurlArguments {
   @Description({
       "@OtherTokens to capture all other tokens in the input.",
       "In this case, everything that isn't a '-v' flag",
-      "or immediately follows after a '-H' or '-X' token."})
+      "or immediately follows after a '-H' or '-X' token.",
+      "If no method carries the @OtherTokens annotation,",
+      "such a token will trigger an IllegalArgumentException."})
   abstract List<String> urls();
 }
 ````
@@ -129,7 +131,7 @@ and then deleting this file using `rm`.
 <dependency>
   <groupId>com.github.h908714124</groupId>
   <artifactId>jbock</artifactId>
-  <version>2.2</version>
+  <version>2.2.1</version>
   <scope>provided</scope>
 </dependency>
 ````
@@ -152,7 +154,7 @@ For Java 9 users, one more config is currently necessary until
       <dependency>
         <groupId>com.github.h908714124</groupId>
         <artifactId>jbock</artifactId>
-        <version>2.2</version>
+        <version>2.2.1</version>
       </dependency>
     </annotationProcessorPaths>
 

core/src/main/java/net/jbock/compiler/Analyser.java

@@ -106,7 +106,7 @@ private Analyser(Processor.Context context) {
         .addModifiers(PRIVATE, FINAL)
         .build();
     this.readOption = readOptionMethod(keysClass, longNames, shortNames, option.optionClass);
-    this.read = readMethod(keysClass, readOption, readArgument, optMapType, sMapType, flagsType,
+    this.read = readMethod(context, keysClass, readOption, readArgument, optMapType, sMapType, flagsType,
         option.optionClass, optionType, optionTypeClass, removeFirstFlag);
   }
 
@@ -258,6 +258,7 @@ private static MethodSpec readArgumentMethod() {
   }
 
   private static MethodSpec readMethod(
+      Context context,
       ClassName keysClass,
       MethodSpec readOption,
       MethodSpec readArgument,
@@ -281,14 +282,27 @@ private static MethodSpec readMethod(
     ParameterSpec token = ParameterSpec.builder(STRING, "token").build();
     ParameterSpec option = ParameterSpec.builder(optionClass, "option").build();
     ParameterSpec ignore = ParameterSpec.builder(optionClass, "__").build();
-    //@formatter:off
+
     CodeBlock.Builder builder = CodeBlock.builder()
         .addStatement("$T $N = $N", STRING, token, originalToken)
-        .addStatement("$T $N = $N($N, $N)", option.type, option, readOption, names, token)
-        .beginControlFlow("if ($N == null)", option)
-          .addStatement("$N.add($N)", otherTokens, token)
-          .addStatement("return")
-          .endControlFlow()
+        .addStatement("$T $N = $N($N, $N)", option.type, option, readOption, names, token);
+
+    // @formatter:off
+    // handle "other" token
+        builder.beginControlFlow("if ($N == null)", option);
+        if (context.otherTokens) {
+          builder.addStatement("$N.add($N)", otherTokens, token)
+          .addStatement("return");
+        } else {
+          builder.addStatement("throw new $T($S + $N)", IllegalArgumentException.class,
+                "Unknown token: ", originalToken);
+        }
+        builder.endControlFlow();
+    // @formatter:on
+
+    // @formatter:off
+    // handle flag or option group
+        builder
         .beginControlFlow("while ($N.$N == $T.$L)", option, optionType, optionTypeClass, OptionType.FLAG)
           .beginControlFlow("if (!$N.add($N))", flags, option)
             .add(repetitionErrorInGroup(option, originalToken))
@@ -302,7 +316,12 @@ private static MethodSpec readMethod(
             .addStatement("throw new $T($S + $N)", IllegalArgumentException.class,
                 "Missing value after token: ", originalToken)
             .endControlFlow()
-          .endControlFlow()
+          .endControlFlow();
+    // @formatter:on
+
+    // @formatter:off
+    // handle option
+        builder
         .addStatement("$T $N = $N($N, $N)", argument.type, argument, readArgument, token, it)
         .beginControlFlow("if ($N.$N == $T.$L)", option, optionType, optionTypeClass, OptionType.OPTIONAL)
           .beginControlFlow("if ($N.containsKey($N))", sMap, option)
@@ -321,8 +340,8 @@ private static MethodSpec readMethod(
               bucket.type, bucket, optMap, option, ignore, ArrayList.class)
           .addStatement("$N.add($N)", bucket, argument)
           .endControlFlow();
+    // @formatter:on
 
-    //@formatter:on
     return MethodSpec.methodBuilder("read")
         .addParameters(Arrays.asList(originalToken, names, optMap, sMap, flags, otherTokens, it))
         .addModifiers(STATIC, PRIVATE)

core/src/main/java/net/jbock/compiler/Param.java

@@ -21,7 +21,7 @@ final class Param {
 
   private final String longName;
   private final String shortName;
-  private final OptionType optionType;
+  final OptionType optionType;
 
   private final String stopword;
 

core/src/main/java/net/jbock/compiler/Processor.java

@@ -233,24 +233,27 @@ static final class Context {
     final ClassName generatedClass;
     final List<Param> parameters;
     final String stopword;
+    final boolean otherTokens;
 
     private Context(
         TypeElement sourceType,
         ClassName generatedClass,
         List<Param> parameters,
-        String stopword) {
+        String stopword, boolean otherTokens) {
       this.sourceType = sourceType;
       this.generatedClass = generatedClass;
       this.parameters = parameters;
       this.stopword = stopword;
+      this.otherTokens = otherTokens;
     }
 
     private static Context create(
         TypeElement sourceType,
         List<Param> parameters,
         String stopword) {
       ClassName generatedClass = peer(ClassName.get(asType(sourceType)), SUFFIX);
-      return new Context(sourceType, generatedClass, parameters, stopword);
+      boolean otherTokens = parameters.stream().anyMatch(p -> p.optionType == OptionType.OTHER_TOKENS);
+      return new Context(sourceType, generatedClass, parameters, stopword, otherTokens);
     }
 
     TypeName returnType() {

examples/src/test/java/net/zerobuilder/examples/gradle/NoNameTest.java

@@ -3,12 +3,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Optional;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 public class NoNameTest {
 
+  @Rule
+  public final ExpectedException exception = ExpectedException.none();
+
   @Test
-  public void test() throws Exception {
+  public void test() {
     NoName noName = NoName_Parser.parse(new String[]{"--message=m", "--file=f", "--file=o",
         "--file=o", "--cmos"});
     assertThat(noName.cmos()).isEqualTo(true);
@@ -18,4 +23,11 @@ public void test() throws Exception {
     assertThat(noName.file().get(1)).isEqualTo("o");
     assertThat(noName.file().get(2)).isEqualTo("o");
   }
+
+  @Test
+  public void errorUnknownToken() {
+    exception.expect(IllegalArgumentException.class);
+    exception.expectMessage("Unknown token: blabla");
+    NoName noName = NoName_Parser.parse(new String[]{"blabla"});
+  }
 }