remove special flag

h908714124 · h908714124 · commit 8ecd92be047e · 2018-09-20T18:41:05.000+02:00
diff --git a/core/src/main/java/net/jbock/coerce/BasicBooleanCoercion.java b/core/src/main/java/net/jbock/coerce/BasicBooleanCoercion.java
@@ -16,12 +16,6 @@ final CodeBlock map() {
     return CodeBlock.builder().build();
   }
 
-  @Override
-  final boolean special() {
-    // flags only
-    return true;
-  }
-
   @Override
   CodeBlock jsonExpr(String param) {
     return CodeBlock.builder().add("$L", param).build();
diff --git a/core/src/main/java/net/jbock/coerce/Coercion.java b/core/src/main/java/net/jbock/coerce/Coercion.java
@@ -10,27 +10,39 @@
 
 import java.util.Collections;
 import java.util.Objects;
-import java.util.Optional;
 
 public final class Coercion {
 
   private static final ClassName BOOLEAN_CLASS = ClassName.get(Boolean.class);
 
   private final TypeName trigger;
+
+  // helper.build
   private final CodeBlock map;
-  private final boolean special;
+
+  // helper.build
   private final CodeBlock initMapper;
+
+  // toString
   private final CodeBlock jsonExpr;
+
+  // toString
   private final CodeBlock mapJsonExpr;
+
+  // impl constructor
   private final CodeBlock extract;
+
+  // impl constructor
   private final TypeName paramType;
+
+  // impl
   private final FieldSpec field;
+
   private final CoercionKind kind;
 
   Coercion(
       TypeName trigger,
       CodeBlock map,
-      boolean special,
       CodeBlock initMapper,
       CodeBlock jsonExpr,
       CodeBlock mapJsonExpr,
@@ -40,7 +52,6 @@ public final class Coercion {
       CoercionKind kind) {
     this.trigger = trigger;
     this.map = map;
-    this.special = special;
     this.initMapper = initMapper;
     this.jsonExpr = jsonExpr;
     this.mapJsonExpr = mapJsonExpr;
@@ -74,13 +85,6 @@ public CodeBlock mapJsonExpr() {
     return mapJsonExpr;
   }
 
-  /**
-   * Specials can't be in Optional or List
-   */
-  public boolean special() {
-    return special;
-  }
-
   public CodeBlock initMapper() {
     return initMapper;
   }
@@ -94,11 +98,8 @@ public FieldSpec field() {
   }
 
   public boolean flag() {
-    return field.type.equals(TypeName.BOOLEAN) || BOOLEAN_CLASS.equals(field.type);
-  }
-
-  public boolean repeatable() {
-    return kind == CoercionKind.LIST_COMBINATION;
+    return initMapper.isEmpty() &&
+        (TypeName.BOOLEAN.equals(field.type) || BOOLEAN_CLASS.equals(field.type));
   }
 
   public CodeBlock extract() {
@@ -118,22 +119,26 @@ public boolean required() {
   }
 
   Coercion withMapper(CodeBlock map, CodeBlock initMapper) {
-    return new Coercion(trigger, map, special, initMapper, jsonExpr, mapJsonExpr, extract, paramType, field, kind);
+    return new Coercion(trigger, map, initMapper, jsonExpr, mapJsonExpr, extract, paramType, field, kind);
   }
 
   Coercion asOptional() {
     TypeName paramType = Util.optionalOf(this.paramType);
     CodeBlock extract = CodeBlock.builder()
         .add("$T.requireNonNull($N)", Objects.class, ParameterSpec.builder(paramType, field.name).build())
         .build();
-    return new Coercion(trigger, map, special, initMapper, jsonExpr, mapJsonExpr, extract, paramType, field, kind);
+    return new Coercion(trigger, map, initMapper, jsonExpr, mapJsonExpr, extract, paramType, field, kind);
   }
 
   Coercion asList() {
     TypeName paramType = Util.listOf(this.paramType);
     CodeBlock extract = CodeBlock.builder()
         .add("$T.unmodifiableList($N)", Collections.class, ParameterSpec.builder(paramType, field.name).build())
         .build();
-    return new Coercion(trigger, map, special, initMapper, jsonExpr, mapJsonExpr, extract, paramType, field, kind);
+    return new Coercion(trigger, map, initMapper, jsonExpr, mapJsonExpr, extract, paramType, field, kind);
+  }
+
+  public CoercionKind kind() {
+    return kind;
   }
 }
diff --git a/core/src/main/java/net/jbock/coerce/CoercionFactory.java b/core/src/main/java/net/jbock/coerce/CoercionFactory.java
@@ -45,13 +45,6 @@ CodeBlock mapJsonExpr(FieldSpec field) {
     return CodeBlock.builder().add(".map($T::toString).map(quote)", Objects.class).build();
   }
 
-  /**
-   * Specials can't be in Optional or List
-   */
-  boolean special() {
-    return false;
-  }
-
   CodeBlock initMapper() {
     return CodeBlock.builder().build();
   }
@@ -68,7 +61,6 @@ final Coercion getCoercion(
     Coercion coercion = new Coercion(
         trigger,
         map(),
-        special(),
         initMapper(),
         jsonExpr(field.name),
         mapJsonExpr(field),
diff --git a/core/src/main/java/net/jbock/coerce/CoercionKind.java b/core/src/main/java/net/jbock/coerce/CoercionKind.java
@@ -10,7 +10,7 @@ public enum CoercionKind {
   LIST_COMBINATION(true),
   OPTIONAL_COMBINATION(true);
 
-  final boolean combination;
+  public final boolean combination;
 
   CoercionKind(boolean combination) {
     this.combination = combination;
diff --git a/core/src/main/java/net/jbock/coerce/OptionalDoubleCoercion.java b/core/src/main/java/net/jbock/coerce/OptionalDoubleCoercion.java
@@ -15,11 +15,6 @@ class OptionalDoubleCoercion extends BasicDoubleCoercion {
     super(OptionalDouble.class);
   }
 
-  @Override
-  boolean special() {
-    return true;
-  }
-
   @Override
   CodeBlock mapJsonExpr(FieldSpec field) {
     return CodeBlock.builder().add(".map($L -> $L)",
diff --git a/core/src/main/java/net/jbock/coerce/OptionalIntCoercion.java b/core/src/main/java/net/jbock/coerce/OptionalIntCoercion.java
@@ -15,11 +15,6 @@ class OptionalIntCoercion extends BasicIntegerCoercion {
     super(OptionalInt.class);
   }
 
-  @Override
-  boolean special() {
-    return true;
-  }
-
   @Override
   CodeBlock mapJsonExpr(FieldSpec field) {
     return CodeBlock.builder().add(".map($L -> $L)",
diff --git a/core/src/main/java/net/jbock/coerce/OptionalLongCoercion.java b/core/src/main/java/net/jbock/coerce/OptionalLongCoercion.java
@@ -15,11 +15,6 @@ class OptionalLongCoercion extends BasicLongCoercion {
     super(OptionalLong.class);
   }
 
-  @Override
-  boolean special() {
-    return true;
-  }
-
   @Override
   CodeBlock mapJsonExpr(FieldSpec field) {
     return CodeBlock.builder().add(".map($L -> $L)",
diff --git a/core/src/main/java/net/jbock/coerce/PrimitiveByteCoercion.java b/core/src/main/java/net/jbock/coerce/PrimitiveByteCoercion.java
@@ -10,11 +10,6 @@ class PrimitiveByteCoercion extends BasicByteCoercion {
     super(Byte.TYPE);
   }
 
-  @Override
-  boolean special() {
-    return true;
-  }
-
   @Override
   TypeName paramType() {
     return TypeName.get(Byte.class);
diff --git a/core/src/main/java/net/jbock/coerce/PrimitiveCharacterCoercion.java b/core/src/main/java/net/jbock/coerce/PrimitiveCharacterCoercion.java
@@ -10,11 +10,6 @@ class PrimitiveCharacterCoercion extends BasicCharacterCoercion {
     super(Character.TYPE);
   }
 
-  @Override
-  boolean special() {
-    return true;
-  }
-
   @Override
   TypeName paramType() {
     return TypeName.get(Character.class);
diff --git a/core/src/main/java/net/jbock/coerce/PrimitiveDoubleCoercion.java b/core/src/main/java/net/jbock/coerce/PrimitiveDoubleCoercion.java
@@ -10,11 +10,6 @@ class PrimitiveDoubleCoercion extends BasicDoubleCoercion {
     super(Double.TYPE);
   }
 
-  @Override
-  boolean special() {
-    return true;
-  }
-
   @Override
   TypeName paramType() {
     return TypeName.get(Double.class);
diff --git a/core/src/main/java/net/jbock/coerce/PrimitiveFloatCoercion.java b/core/src/main/java/net/jbock/coerce/PrimitiveFloatCoercion.java
@@ -10,11 +10,6 @@ class PrimitiveFloatCoercion extends BasicFloatCoercion {
     super(Float.TYPE);
   }
 
-  @Override
-  boolean special() {
-    return true;
-  }
-
   @Override
   TypeName paramType() {
     return TypeName.get(Float.class);
diff --git a/core/src/main/java/net/jbock/coerce/PrimitiveIntCoercion.java b/core/src/main/java/net/jbock/coerce/PrimitiveIntCoercion.java
@@ -10,11 +10,6 @@ class PrimitiveIntCoercion extends BasicIntegerCoercion {
     super(Integer.TYPE);
   }
 
-  @Override
-  boolean special() {
-    return true;
-  }
-
   @Override
   TypeName paramType() {
     return TypeName.get(Integer.class);
diff --git a/core/src/main/java/net/jbock/coerce/PrimitiveLongCoercion.java b/core/src/main/java/net/jbock/coerce/PrimitiveLongCoercion.java
@@ -10,11 +10,6 @@ class PrimitiveLongCoercion extends BasicLongCoercion {
     super(Long.TYPE);
   }
 
-  @Override
-  boolean special() {
-    return true;
-  }
-
   @Override
   TypeName paramType() {
     return TypeName.get(Long.class);
diff --git a/core/src/main/java/net/jbock/coerce/PrimitiveShortCoercion.java b/core/src/main/java/net/jbock/coerce/PrimitiveShortCoercion.java
@@ -10,11 +10,6 @@ class PrimitiveShortCoercion extends BasicShortCoercion {
     super(Short.TYPE);
   }
 
-  @Override
-  boolean special() {
-    return true;
-  }
-
   @Override
   TypeName paramType() {
     return TypeName.get(Short.class);
diff --git a/core/src/main/java/net/jbock/compiler/OptionType.java b/core/src/main/java/net/jbock/compiler/OptionType.java
@@ -1,5 +1,6 @@
 package net.jbock.compiler;
 
+import net.jbock.coerce.CoercionKind;
 import net.jbock.com.squareup.javapoet.CodeBlock;
 import net.jbock.com.squareup.javapoet.ParameterSpec;
 
@@ -53,15 +54,15 @@ CodeBlock extractExpression(Helper helper, Param param) {
     @Override
     CodeBlock jsonStatement(Impl impl, ParameterSpec joiner, Param param) {
       CodeBlock valueExpr;
-      if (param.required() || param.coercion().special()) {
-        valueExpr = param.coercion().jsonExpr();
-      } else {
+      if (param.coercion().kind() == CoercionKind.OPTIONAL_COMBINATION) {
         valueExpr = CodeBlock.builder()
             .add("$N$L.orElse($S)",
                 param.field(),
                 param.coercion().mapJsonExpr(),
                 "null")
             .build();
+      } else {
+        valueExpr = param.coercion().jsonExpr();
       }
       return CodeBlock.builder()
           .addStatement("$N.add($S + $L)",
diff --git a/core/src/main/java/net/jbock/compiler/Param.java b/core/src/main/java/net/jbock/compiler/Param.java
@@ -3,6 +3,7 @@
 import net.jbock.Parameter;
 import net.jbock.PositionalParameter;
 import net.jbock.coerce.Coercion;
+import net.jbock.coerce.CoercionKind;
 import net.jbock.coerce.CoercionProvider;
 import net.jbock.com.squareup.javapoet.FieldSpec;
 import net.jbock.com.squareup.javapoet.TypeName;
@@ -374,7 +375,7 @@ private static OptionType optionType(Coercion coercion) {
     if (coercion.flag()) {
       return OptionType.FLAG;
     }
-    if (coercion.repeatable()) {
+    if (coercion.kind() == CoercionKind.LIST_COMBINATION) {
       return OptionType.REPEATABLE;
     }
     return OptionType.REGULAR;
diff --git a/examples/src/main/java/net/jbock/examples/CustomMapperArguments.java b/examples/src/main/java/net/jbock/examples/CustomMapperArguments.java
@@ -51,6 +51,12 @@ abstract class CustomMapperArguments {
   @PositionalParameter(mappedBy = BooleanMapper.class)
   abstract List<Boolean> booleanList();
 
+  @PositionalParameter(mappedBy = OptionalIntMapper.class)
+  abstract List<OptionalInt> optionalInts();
+
+  @Parameter(mappedBy = BooleanMapper.class)
+  abstract boolean notFlag(); // if it has a mapper, it's not a flag
+
   static class DateMapper implements Function<String, Date> {
 
     @Override
@@ -107,6 +113,18 @@ public Boolean apply(String s) {
     }
   }
 
+  static class OptionalIntMapper implements Function<String, OptionalInt> {
+
+    @Override
+    public OptionalInt apply(String s) {
+      try {
+        return OptionalInt.of(Integer.parseInt(s));
+      } catch (NumberFormatException e) {
+        return OptionalInt.empty();
+      }
+    }
+  }
+
   enum MyEnum {
     FOO, BAR
   }
diff --git a/examples/src/test/java/net/jbock/examples/CustomMapperArgumentsTest.java b/examples/src/test/java/net/jbock/examples/CustomMapperArgumentsTest.java
@@ -14,6 +14,7 @@
 import static java.util.Collections.singleton;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class CustomMapperArgumentsTest {
 
@@ -28,6 +29,7 @@ void success() {
         "--dateList", "1500000000000",
         "--verbosity", "0x10",
         "--anInt", "50",
+        "--notFlag", "true",
         "--integerList", "1,2,3,4",
         "--enumSet", "FOO",
         "true", "false", "true",
@@ -43,6 +45,7 @@ void success() {
     assertEquals(Arrays.asList(1, 2, 3, 4), parsed.integerList().orElseThrow(AssertionFailedError::new));
     assertEquals(singleton(MyEnum.FOO), parsed.enumSet().orElseThrow(AssertionFailedError::new));
     assertArrayEquals(new String[]{"A"}, parsed.stringArray().orElseThrow(AssertionFailedError::new));
+    assertTrue(parsed.notFlag());
   }
 
   @Test
@@ -58,7 +61,7 @@ void testPrint() {
         "  CustomMapperArguments",
         "",
         "SYNOPSIS",
-        "  CustomMapperArguments [<options>] --date=<DATE> --anInt=<AN_INT> [[--] <boolean_list...>]",
+        "  CustomMapperArguments [<options>] --date=<DATE> --anInt=<AN_INT> --notFlag=<NOT_FLAG> [[--] <boolean_list...>]",
         "",
         "DESCRIPTION",
         "",
@@ -85,6 +88,8 @@ void testPrint() {
         "",
         "  --enumSet <enum_set>",
         "",
+        "  --notFlag <NOT_FLAG>",
+        "",
         "  --help",
         "    Print this help page.",
         "    The help flag may only be passed as the first argument.",
