Improve error messages

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/MappedObjectProvider.java

@@ -7,12 +7,14 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
+import org.seasar.doma.DomaException;
 import org.seasar.doma.internal.jdbc.command.AbstractObjectProvider;
 import org.seasar.doma.jdbc.JdbcMappingVisitor;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.statement.Row;
 import org.seasar.doma.jdbc.entity.Property;
 import org.seasar.doma.jdbc.query.Query;
+import org.seasar.doma.message.Message;
 
 public class MappedObjectProvider<RESULT> extends AbstractObjectProvider<RESULT> {
   private final Function<Row, RESULT> mapper;
@@ -42,8 +44,7 @@ public RESULT get(ResultSet resultSet) throws SQLException {
           public <PROPERTY> PROPERTY get(PropertyDef<PROPERTY> propertyDef) {
             Integer index = indexMap.get(propertyDef);
             if (index == null) {
-              throw new IllegalArgumentException(
-                  "The propertyDef is unknown. " + propertyDef.getName());
+              throw new DomaException(Message.DOMA6002, propertyDef.getName());
             }
             Property<?, ?> property = propertyDef.asType().createProperty();
             try {

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SelectFromDeclaration.java

@@ -5,6 +5,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import org.seasar.doma.DomaException;
 import org.seasar.doma.internal.util.Pair;
 import org.seasar.doma.jdbc.criteria.context.ForUpdate;
 import org.seasar.doma.jdbc.criteria.context.Join;
@@ -14,6 +15,7 @@
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.statement.Row;
+import org.seasar.doma.message.Message;
 
 public class SelectFromDeclaration {
 
@@ -106,12 +108,10 @@ public <ENTITY1, ENTITY2> void associate(
     Objects.requireNonNull(second);
     Objects.requireNonNull(associator);
     if (!context.getEntityDefs().contains(first)) {
-      throw new IllegalStateException(
-          "The first is unknown. Ensure that you have added its constructor to the from function or the join functions.");
+      throw new DomaException(Message.DOMA6001, "first");
     }
     if (!context.getEntityDefs().contains(second)) {
-      throw new IllegalStateException(
-          "The second is unknown. Ensure that you have added its constructor to the from function or the join functions.");
+      throw new DomaException(Message.DOMA6001, "second");
     }
     //noinspection unchecked
     context.associations.put(new Pair<>(first, second), (BiConsumer<Object, Object>) associator);

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/BuilderSupport.java

@@ -4,6 +4,7 @@
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import org.seasar.doma.DomaException;
 import org.seasar.doma.internal.jdbc.sql.PreparedSqlBuilder;
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.InParameter;
@@ -16,6 +17,7 @@
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 import org.seasar.doma.jdbc.entity.EntityPropertyType;
 import org.seasar.doma.jdbc.entity.EntityType;
+import org.seasar.doma.message.Message;
 
 public class BuilderSupport {
   private final Config config;
@@ -46,7 +48,7 @@ public void table(EntityDef<?> entityDef) {
       buf.appendSql(" ");
       String alias = aliasManager.getAlias(entityDef);
       if (alias == null) {
-        throw new IllegalStateException("The alias is not found. " + entityType.getName());
+        throw new DomaException(Message.DOMA6003, entityType.getName());
       }
       buf.appendSql(alias);
     }
@@ -65,7 +67,7 @@ public void column(PropertyDef<?> propertyDef) {
             if (aliasManager != null) {
               String alias = aliasManager.getAlias(p);
               if (alias == null) {
-                throw new IllegalStateException("The alias is not found. " + p.getName());
+                throw new DomaException(Message.DOMA6004, p.getName());
               }
               buf.appendSql(alias);
               buf.appendSql(".");

doma-core/src/main/java/org/seasar/doma/message/Message.java

@@ -923,6 +923,14 @@ public enum Message implements MessageResource {
           + "If the JDBC driver is not loaded automatically, load it explicitly using Class.forName. "
           + "ex) Class.forName(\"oracle.jdbc.driver.OracleDriver\")"),
   DOMA5002("The url property is not specified."),
+
+  // criteria
+  DOMA6001(
+      "The parameter \"{0}\" is unknown. Ensure that you have passed it to the \"from\" method or the \"join\" method."),
+  DOMA6002(
+      "The propertyDef \"{0}\" is unknown. Ensure that you have passed it to the \"select\" method."),
+  DOMA6003("The table alias is not found for the entityDef \"{0}\"."),
+  DOMA6004("The column alias is not found for the propertyDef \"{0}\"."),
   ;
 
   private final String messagePattern;