improve error messages

Author: h908714124

core/src/main/java/net/jbock/coerce/CoercionProvider.java

@@ -57,7 +57,7 @@ public Coercion findCoercion(
       return handle(optionalInfo, basicInfo, paramName, mapperClass, collectorClass);
     } catch (TmpException e) {
       throw e.asValidationException(sourceMethod);
-    } catch (SearchHintException e) {
+    } catch (UnknownTypeException e) {
       Optional<String> hint = HintProvider.instance().findHint(optionalInfo, basicInfo);
       throw hint.map(m -> e.asValidationException(sourceMethod, m))
           .orElseGet(() -> e.asValidationException(sourceMethod));
@@ -69,7 +69,7 @@ private Coercion handle(
       BasicInfo basicInfo,
       String paramName,
       TypeElement mapperClass,
-      TypeElement collectorClass) throws TmpException, SearchHintException {
+      TypeElement collectorClass) throws TmpException, UnknownTypeException {
     boolean auto = mapperClass == null;
     if (basicInfo.repeatable) {
       if (auto) {
@@ -89,7 +89,7 @@ private Coercion handle(
   // no mapper, not repeatable
   private Coercion handleSingleAuto(
       Optional<TypeMirror> optionalInfo,
-      BasicInfo basicInfo) throws TmpException, SearchHintException {
+      BasicInfo basicInfo) throws TmpException, UnknownTypeException {
     CoercionFactory factory = findCoercion(optionalInfo.orElse(basicInfo.returnType()));
     return factory.getCoercion(basicInfo, optionalInfo, Optional.empty());
   }
@@ -122,20 +122,20 @@ private Coercion handleRepeatable(
   // repeatable without mapper
   private Coercion handleRepeatableAuto(
       TypeElement collectorClass,
-      BasicInfo basicInfo) throws TmpException, SearchHintException {
+      BasicInfo basicInfo) throws TmpException, UnknownTypeException {
     CollectorInfo collectorInfo = collectorInfo(basicInfo.returnType(), collectorClass);
     CoercionFactory coercion = findCoercion(collectorInfo.inputType);
     return coercion.getCoercion(basicInfo, Optional.empty(), collectorInfo.collectorType());
   }
 
-  private CoercionFactory findCoercion(TypeMirror mirror) throws TmpException, SearchHintException {
+  private CoercionFactory findCoercion(TypeMirror mirror) throws TmpException, UnknownTypeException {
     CoercionFactory standardCoercion = StandardCoercions.get(mirror);
     if (standardCoercion != null) {
       return standardCoercion;
     }
     boolean isEnum = isEnumType(mirror);
     if (!isEnum) {
-      throw SearchHintException.create("Unknown parameter type. Define a custom mapper.");
+      throw UnknownTypeException.create();
     }
     return EnumCoercion.create(mirror);
   }
@@ -166,11 +166,11 @@ private CollectorInfo collectorInfo(
     }
     TypeTool tool = TypeTool.get();
     if (!tool.isSameErasure(returnType, List.class)) {
-      throw TmpException.create("Either define a custom collector, or return List");
+      throw TmpException.create("Either define a custom collector, or return List.");
     }
     List<? extends TypeMirror> typeParameters = tool.typeargs(returnType);
     if (typeParameters.isEmpty()) {
-      throw TmpException.create("Either define a custom collector, or return List");
+      throw TmpException.create("Add a type parameter.");
     }
     return CollectorInfo.listCollector(typeParameters.get(0));
   }

core/src/main/java/net/jbock/coerce/CollectorInfo.java

@@ -3,7 +3,7 @@
 import javax.lang.model.type.TypeMirror;
 import java.util.Optional;
 
-public class CollectorInfo {
+class CollectorInfo {
 
   final TypeMirror inputType;
 

core/src/main/java/net/jbock/coerce/Extension.java

@@ -3,7 +3,7 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
 
-public class Extension {
+class Extension {
 
   private final TypeElement baseClass;
   private final DeclaredType extensionClass;
@@ -13,11 +13,11 @@ public class Extension {
     this.extensionClass = extensionClass;
   }
 
-  public TypeElement baseClass() {
+  TypeElement baseClass() {
     return baseClass;
   }
 
-  public DeclaredType extensionClass() {
+  DeclaredType extensionClass() {
     return extensionClass;
   }
 

core/src/main/java/net/jbock/coerce/LiftedType.java

@@ -11,7 +11,7 @@
 import java.util.OptionalLong;
 import java.util.function.Function;
 
-public final class LiftedType {
+final class LiftedType {
 
   private final TypeMirror originalType;
 

core/src/main/java/net/jbock/coerce/SuppliedClassValidator.java

@@ -18,7 +18,7 @@ static void commonChecks(TypeElement classToCheck, String name) throws TmpExcept
       throw TmpException.create(
           String.format("The %s class may not be private.", name));
     }
-    if (!Util.checkDefaultConstructorExists(classToCheck)) {
+    if (!Util.hasDefaultConstructor(classToCheck)) {
       throw TmpException.create(
           String.format("The %s class must have a default constructor", name));
     }

core/src/main/java/net/jbock/coerce/SearchHintException.java renamed to core/src/main/java/net/jbock/coerce/UnknownTypeException.java

@@ -4,14 +4,16 @@
 
 import javax.lang.model.element.ExecutableElement;
 
-class SearchHintException extends Exception {
+class UnknownTypeException extends Exception {
 
-  static SearchHintException create(String message) {
-    return new SearchHintException(message);
+  private static final String DEFAULT_MESSAGE = "Unknown parameter type. Define a custom mapper.";
+
+  static UnknownTypeException create() {
+    return new UnknownTypeException();
   }
 
-  private SearchHintException(String message) {
-    super(message);
+  private UnknownTypeException() {
+    super(DEFAULT_MESSAGE);
   }
 
   ValidationException asValidationException(ExecutableElement sourceMethod) {

core/src/main/java/net/jbock/coerce/hint/ArrayHint.java

@@ -3,10 +3,10 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-public class ArrayHint extends Hint {
+class ArrayHint extends Hint {
 
   @Override
-  public String message(TypeMirror type, boolean repeatable) {
+  String message(TypeMirror type, boolean repeatable) {
     if (type.getKind() == TypeKind.ARRAY) {
       if (!repeatable) {
         return "Declare this parameter repeatable.";

core/src/main/java/net/jbock/coerce/hint/CollectionHint.java

@@ -5,10 +5,10 @@
 import javax.lang.model.type.TypeMirror;
 import java.util.List;
 
-public class CollectionHint extends Hint {
+class CollectionHint extends Hint {
 
   @Override
-  public String message(TypeMirror type, boolean repeatable) {
+  String message(TypeMirror type, boolean repeatable) {
     if (TypeTool.get().isSameErasure(type, List.class)) {
       if (!repeatable) {
         return "Declare this parameter repeatable.";

core/src/main/java/net/jbock/coerce/hint/DateHint.java

@@ -8,10 +8,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-public class DateHint extends PreciseTypeHint {
+class DateHint extends PreciseTypeHint {
 
   @Override
-  public Set<TypeName> types() {
+  Set<TypeName> types() {
     return Stream.of(
         java.util.Date.class,
         java.sql.Date.class,
@@ -20,7 +20,7 @@ public Set<TypeName> types() {
   }
 
   @Override
-  public String message(TypeName typeName) {
+  String message(TypeName typeName) {
     return typeName + " is not supported. Use a type from java.time instead.";
   }
 }

core/src/main/java/net/jbock/coerce/hint/Hint.java

@@ -2,7 +2,7 @@
 
 import javax.lang.model.type.TypeMirror;
 
-public abstract class Hint {
+abstract class Hint {
 
-  public abstract String message(TypeMirror type, boolean repeatable);
+  abstract String message(TypeMirror type, boolean repeatable);
 }