annotation update

Author: h908714124

annotations/src/main/java/net/jbock/Parameter.java

@@ -4,7 +4,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.function.Supplier;
 
 /**
  * <h3>Marker for parameter methods</h3>
@@ -56,8 +55,8 @@
    * <h3>Optional custom mapper</h3>
    *
    * <p>
-   * The mapper is a {@link java.util.function.Supplier Supplier} that returns a
-   * {@link java.util.function.Function Function&lt;String, X&gt;}.
+   * The mapper is a either a {@link java.util.function.Function Function&lt;String, X&gt;}
+   * or a {@link java.util.function.Supplier Supplier} that returns such a function.
    * The return value {@code X} is called the <em>mapper type</em>.
    * The parameter method must return {@code X}, or {@code Optional<X>} if the
    * parameter is {@link #optional()}, or {@code List<X>} if the parameter is
@@ -69,58 +68,57 @@
    * </p>
    *
    * <pre>{@code
-   * class PositiveNumberMapper implements Supplier&lt;Function&lt;String, Integer&gt;&gt; {
-   *
-   *   public Function&lt;String, Integer&gt; get() {
-   *     return s -> {
-   *       Integer r = Integer.valueOf(s);
-   *       if (r <= 0) {
-   *         throw new IllegalArgumentException("Positive number expected");
-   *       }
-   *       return r;
+   * class PositiveNumberMapper implements Function<String, Integer> {
+   *
+   *   public Integer apply(String s) {
+   *     Integer r = Integer.valueOf(s);
+   *     if (r <= 0) {
+   *       throw new IllegalArgumentException("Positive number expected");
    *     }
+   *     return r;
    *   }
    * }
    * }</pre>
    *
-   * @return an optional mapper class
+   * @return a mapper class
    */
-  Class<?> mappedBy() default Supplier.class;
+  Class<?> mappedBy() default Object.class;
 
   /**
    * <h3>Optional custom collector</h3>
    *
    * <p>
-   * The supplier must return a {@link java.util.stream.Collector Collector&lt;M, ?, X&gt;}
-   * where {@code X} is the parameter type, and {@code M} is the <em>mapper type</em>.
+   * This is either a {@link java.util.stream.Collector Collector&lt;M, ?, X&gt;}
+   * where {@code X} is the parameter type and {@code M} is the <em>mapper type</em>,
+   * or a {@link java.util.function.Supplier Supplier} that returns such a collector.
    * </p>
    *
    * <p>
    * For example, the following collector creates a {@code Set}:
    * </p>
    *
    * <pre>{@code
-   * class ToSetCollector&lt;E&gt; implements Supplier&lt;Collector&lt;E, ?, Set&lt;E&gt;&gt;&gt; {
+   * class ToSetCollector<E>; implements Supplier<Collector<E, ?, Set<E>>> {
    *
-   *   public Collector&lt;E, ?, Set&lt;E&gt;&gt; get() {
+   *   public Collector<E, ?, Set<E>> get() {
    *     return Collectors.toSet();
    *   }
    * }
    * }</pre>
    *
-   * @return an optional collector class
+   * @return an collector class
    */
-  Class<?> collectedBy() default Supplier.class;
+  Class<?> collectedBy() default Object.class;
 
   /**
-   * <p>Declares this parameter repeatable.</p>
+   * <p>Declares this parameter as repeatable.</p>
    *
    * @return true if this parameter is repeatable
    */
   boolean repeatable() default false;
 
   /**
-   * <p>Declares this parameter optional.</p>
+   * <p>Declares this parameter as optional.</p>
    *
    * <p>
    * <em>Note:</em>
@@ -135,7 +133,7 @@
 
   /**
    * <p>Declares a parameter that doesn't take an argument.
-   * For example, the following shell command contains a flag:</p>
+   * For example, the following shell command contains the flag {@code -l}:</p>
    *
    * <pre>{@code
    * ls -l
@@ -159,3 +157,4 @@
    */
   String bundleKey() default "";
 }
+

annotations/src/main/java/net/jbock/PositionalParameter.java

@@ -53,28 +53,28 @@
    * Optional custom mapper.
    * See {@link Parameter#mappedBy()}.
    *
-   * @return an optional mapper class
+   * @return a mapper class
    */
-  Class<? extends Supplier> mappedBy() default Supplier.class;
+  Class<?> mappedBy() default Object.class;
 
   /**
    * Optional custom collector.
    * See {@link Parameter#collectedBy()}.
    *
-   * @return an optional collector class
+   * @return a collector class
    */
-  Class<? extends Supplier> collectedBy() default Supplier.class;
+  Class<?> collectedBy() default Object.class;
 
   /**
-   * Declares this parameter repeatable.
+   * Declares this parameter as repeatable.
    * See {@link Parameter#repeatable()}.
    *
    * @return true if this parameter is repeatable
    */
   boolean repeatable() default false;
 
   /**
-   * Declares this parameter optional.
+   * Declares this parameter as optional.
    * See {@link Parameter#optional()}.
    *
    * @return true if this parameter is optional
@@ -89,3 +89,4 @@
    */
   String bundleKey() default "";
 }
+

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

@@ -5,9 +5,12 @@
 import javax.lang.model.element.AnnotationValueVisitor;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.TypeVisitor;
 import javax.lang.model.util.SimpleAnnotationValueVisitor8;
+import javax.lang.model.util.SimpleTypeVisitor8;
 import java.util.Map;
 
 final class AnnotationUtil {
@@ -37,6 +40,20 @@ public TypeMirror visitType(TypeMirror mirror, AnnotationUtilContext utilContext
     }
   };
 
+  private static final TypeVisitor<Boolean, TypeTool> IS_JAVA_LANG_OBJECT = new SimpleTypeVisitor8<Boolean, TypeTool>() {
+    @Override
+    protected Boolean defaultAction(TypeMirror e, TypeTool tool) {
+      return false;
+    }
+
+    @Override
+    public Boolean visitDeclared(DeclaredType type, TypeTool tool) {
+      TypeElement element = tool.asTypeElement(type.asElement());
+      return "java.lang.Object".equals(element.getQualifiedName().toString());
+    }
+  };
+
+
   private static TypeElement get(
       ExecutableElement sourceMethod,
       Class<?> annotationClass,
@@ -52,11 +69,16 @@ private static TypeElement get(
       return null;
     }
     TypeMirror typeMirror = annotationValue.accept(GET_TYPE, new AnnotationUtilContext(sourceMethod, attributeName));
+    TypeTool tool = TypeTool.get();
+    if (typeMirror.accept(IS_JAVA_LANG_OBJECT, tool)) {
+      // if the default value is not overridden
+      return null;
+    }
     if (typeMirror.getKind() != TypeKind.DECLARED) {
       throw ValidationException.create(sourceMethod,
           String.format("Invalid value of '%s'.", attributeName));
     }
-    return TypeTool.get().asTypeElement(typeMirror);
+    return tool.asTypeElement(typeMirror);
   }