Merge pull request #523 from jeffgbutler/i18n

i18n for Exception Messages

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/configuration/GlobalConfiguration.java

@@ -20,6 +20,7 @@
 import java.util.Properties;
 
 import org.mybatis.dynamic.sql.exception.DynamicSqlException;
+import org.mybatis.dynamic.sql.util.Messages;
 
 public class GlobalConfiguration {
     public static final String CONFIGURATION_FILE_PROPERTY = "mybatis-dynamic-sql.configurationFile"; //$NON-NLS-1$
@@ -57,7 +58,7 @@ void loadProperties(InputStream inputStream, String propertyFile) {
         try {
             properties.load(inputStream);
         } catch (IOException e) {
-            throw new DynamicSqlException("IOException reading property file \"" + propertyFile + "\"", e);
+            throw new DynamicSqlException(Messages.getString("ERROR.3", propertyFile), e); //$NON-NLS-1$
         }
     }
 

src/main/java/org/mybatis/dynamic/sql/exception/DuplicateTableAliasException.java

@@ -18,6 +18,7 @@
 import java.util.Objects;
 
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.util.Messages;
 
 /**
  * This exception is thrown when a query is built that attempts to specify more than one
@@ -33,16 +34,15 @@
  */
 public class DuplicateTableAliasException extends DynamicSqlException {
 
+    private static final long serialVersionUID = -2631664872557787391L;
+
     public DuplicateTableAliasException(SqlTable table, String newAlias, String existingAlias) {
         super(generateMessage(Objects.requireNonNull(table),
                 Objects.requireNonNull(newAlias),
                 Objects.requireNonNull(existingAlias)));
     }
 
     private static String generateMessage(SqlTable table, String newAlias, String existingAlias) {
-        return "Table \"" + table.tableNameAtRuntime() //$NON-NLS-1$
-                + "\" with requested alias \"" + newAlias //$NON-NLS-1$
-                + "\" is already aliased in this query with alias \"" + existingAlias //$NON-NLS-1$
-                + "\". Attempting to re-alias a table in the same query is not supported."; //$NON-NLS-1$
+        return Messages.getString("ERROR.1", table.tableNameAtRuntime(), newAlias, existingAlias); //$NON-NLS-1$
     }
 }

src/main/java/org/mybatis/dynamic/sql/exception/DynamicSqlException.java

@@ -16,6 +16,8 @@
 package org.mybatis.dynamic.sql.exception;
 
 public class DynamicSqlException extends RuntimeException {
+    private static final long serialVersionUID = 349021672061361244L;
+
     public DynamicSqlException(String message) {
         super(message);
     }

src/main/java/org/mybatis/dynamic/sql/exception/InvalidSqlException.java

@@ -16,6 +16,8 @@
 package org.mybatis.dynamic.sql.exception;
 
 public class InvalidSqlException extends DynamicSqlException {
+    private static final long serialVersionUID = 1666851020951347843L;
+
     public InvalidSqlException(String message) {
         super(message);
     }

src/main/java/org/mybatis/dynamic/sql/exception/NonRenderingWhereClauseException.java

@@ -17,6 +17,7 @@
 
 import org.mybatis.dynamic.sql.configuration.GlobalConfiguration;
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
+import org.mybatis.dynamic.sql.util.Messages;
 
 /**
  * This exception is thrown when the where clause in a statement will not render.
@@ -39,7 +40,9 @@
  * @author Jeff Butler
  */
 public class NonRenderingWhereClauseException extends DynamicSqlException {
+    private static final long serialVersionUID = 6619119078542625135L;
+
     public NonRenderingWhereClauseException() {
-        super("A where clause was specified, but failed to render."); //$NON-NLS-1$
+        super(Messages.getString("ERROR.2")); //$NON-NLS-1$
     }
 }

src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertModel.java

@@ -22,13 +22,17 @@
 import org.mybatis.dynamic.sql.insert.render.BatchInsert;
 import org.mybatis.dynamic.sql.insert.render.BatchInsertRenderer;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.util.Messages;
 
 public class BatchInsertModel<T> extends AbstractMultiRowInsertModel<T> {
 
     private BatchInsertModel(Builder<T> builder) {
         super(builder);
+        if (records().isEmpty()) {
+            throw new InvalidSqlException(Messages.getString("ERROR.19")); //$NON-NLS-1$
+        }
         if (columnMappings.isEmpty()) {
-            throw new InvalidSqlException("Batch insert statements must have at least one column mapping");
+            throw new InvalidSqlException(Messages.getString("ERROR.5")); //$NON-NLS-1$
         }
     }
 

src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertModel.java

@@ -28,6 +28,7 @@
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
+import org.mybatis.dynamic.sql.util.Messages;
 
 public class GeneralInsertModel {
 
@@ -37,7 +38,7 @@ public class GeneralInsertModel {
     private GeneralInsertModel(Builder builder) {
         table = Objects.requireNonNull(builder.table);
         if (builder.insertMappings.isEmpty()) {
-            throw new InvalidSqlException("General insert statements must have at least one column mapping");
+            throw new InvalidSqlException(Messages.getString("ERROR.6")); //$NON-NLS-1$
         }
         insertMappings = builder.insertMappings;
     }

src/main/java/org/mybatis/dynamic/sql/insert/InsertColumnListModel.java

@@ -23,14 +23,15 @@
 
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.exception.InvalidSqlException;
+import org.mybatis.dynamic.sql.util.Messages;
 
 public class InsertColumnListModel {
     private final List<SqlColumn<?>> columns = new ArrayList<>();
 
     private InsertColumnListModel(List<SqlColumn<?>> columns) {
         Objects.requireNonNull(columns);
         if (columns.isEmpty()) {
-            throw new InvalidSqlException("Insert select statements require at least one column in the column list");
+            throw new InvalidSqlException(Messages.getString("ERROR.4")); //$NON-NLS-1$
         }
 
         this.columns.addAll(columns);

src/main/java/org/mybatis/dynamic/sql/insert/InsertModel.java

@@ -28,6 +28,7 @@
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
+import org.mybatis.dynamic.sql.util.Messages;
 
 public class InsertModel<T> {
     private final SqlTable table;
@@ -39,7 +40,7 @@ private InsertModel(Builder<T> builder) {
         row = Objects.requireNonNull(builder.row);
         columnMappings = Objects.requireNonNull(builder.columnMappings);
         if (columnMappings.isEmpty()) {
-            throw new InvalidSqlException("Insert statements must have at least one column mapping"); // $NON-NLS-1$
+            throw new InvalidSqlException(Messages.getString("ERROR.7")); //$NON-NLS-1$
         }
     }
 

src/main/java/org/mybatis/dynamic/sql/insert/MultiRowInsertModel.java

@@ -22,13 +22,17 @@
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertRenderer;
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.util.Messages;
 
 public class MultiRowInsertModel<T> extends AbstractMultiRowInsertModel<T> {
 
     private MultiRowInsertModel(Builder<T> builder) {
         super(builder);
+        if (records().isEmpty()) {
+            throw new InvalidSqlException(Messages.getString("ERROR.20")); //$NON-NLS-1$
+        }
         if (columnMappings.isEmpty()) {
-            throw new InvalidSqlException("Multi row insert statements must have at least one column mapping");
+            throw new InvalidSqlException(Messages.getString("ERROR.8")); //$NON-NLS-1$
         }
     }