Preserve original MyBatis exception message

Author: emacarron

src/main/java/org/mybatis/spring/DataAccessExceptionTranslator.java renamed to src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java

@@ -19,9 +19,8 @@
 
 import javax.sql.DataSource;
 
-import org.apache.ibatis.exceptions.PersistenceException;
-import org.apache.ibatis.session.SqlSession;
 import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.jdbc.support.SQLExceptionTranslator;
 
@@ -34,10 +33,9 @@
  * first exception is translated.
  *
  * @see DataAccessException
- * @see SqlSession
  * @version $Id$
  */
-public class DataAccessExceptionTranslator implements SqlSessionExceptionTranslator {
+public class MyBatisExceptionTranslator implements PersistenceExceptionTranslator {
 
     private final Object $lock = new Object();
 
@@ -52,7 +50,7 @@ public class DataAccessExceptionTranslator implements SqlSessionExceptionTransla
      * @param exceptionTranslatorLazyInit if true, the translator instantiates internal stuff only the first time will
      *        have the need to translate exceptions.
      */
-    public DataAccessExceptionTranslator(DataSource dataSource, boolean exceptionTranslatorLazyInit) {
+    public MyBatisExceptionTranslator(DataSource dataSource, boolean exceptionTranslatorLazyInit) {
         this.dataSource = dataSource;
 
         if (!exceptionTranslatorLazyInit) {
@@ -63,17 +61,16 @@ public DataAccessExceptionTranslator(DataSource dataSource, boolean exceptionTra
     /**
      * {@inheritDoc}
      */
-   public RuntimeException translateException(PersistenceException e, String statement) {
+    public DataAccessException translateExceptionIfPossible(RuntimeException e) {
         if (e.getCause() instanceof SQLException) {
             if (this.exceptionTranslator == null) {
                 synchronized (this.$lock) {
                     this.initExceptionTranslator();
                 }
             }
-
-            return this.exceptionTranslator.translate("SqlSession operation", statement, (SQLException) e.getCause());
+            return this.exceptionTranslator.translate(e.getMessage() + "\n", null, (SQLException) e.getCause());
         }
-        return new MyBatisSystemException("SqlSession operation", e);
+        return new MyBatisSystemException(e.getMessage(), e);
     }
 
    /**
@@ -82,5 +79,4 @@ public RuntimeException translateException(PersistenceException e, String statem
    private void initExceptionTranslator() {
        this.exceptionTranslator = new SQLErrorCodeSQLExceptionTranslator(this.dataSource);
    }
-
 }

src/main/java/org/mybatis/spring/SqlSessionExceptionTranslator.java

@@ -30,6 +30,7 @@
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.jdbc.support.SQLExceptionTranslator;
 import org.springframework.util.Assert;
 
@@ -46,7 +47,7 @@
  * will be used.
  * <p>
  * This template converts MyBatis PersistenceExceptions into unchecked
- * DataAccessExceptions, using, by default, a {@link DataAccessExceptionTranslator}.
+ * DataAccessExceptions, using, by default, a {@link MyBatisExceptionTranslator}.
  * <p>
  * Because SqlSessionTemplate is thread safe, a single instance can be shared
  * by all DAOs; there should also be a small memory savings by doing this. This
@@ -63,7 +64,7 @@
  * @see SqlSessionFactory
  * @see SqlSession
  * @see ExecutorType
- * @see DataAccessExceptionTranslator
+ * @see MyBatisExceptionTranslator
  * @see SqlSessionExceptionTranslator
  * @version $Id$
  */
@@ -75,7 +76,7 @@ public class SqlSessionTemplate implements SqlSession {
 
     private final SqlSession sqlSessionProxy;
 
-    private final SqlSessionExceptionTranslator exceptionTranslator;
+    private final PersistenceExceptionTranslator exceptionTranslator;
 
     /**
      * Constructs a Spring managed SqlSession with the {@link SqlSessionFactory} 
@@ -98,7 +99,7 @@ public SqlSessionTemplate(SqlSessionFactory sqlSessionFactory) {
      */
     public SqlSessionTemplate(SqlSessionFactory sqlSessionFactory, ExecutorType executorType) {
         this(sqlSessionFactory, executorType, 
-                new DataAccessExceptionTranslator(
+                new MyBatisExceptionTranslator(
                         sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(), true));
     }
 
@@ -117,7 +118,7 @@ public SqlSessionTemplate(SqlSessionFactory sqlSessionFactory, ExecutorType exec
      * @param exceptionTranslator
      */
     public SqlSessionTemplate(SqlSessionFactory sqlSessionFactory, ExecutorType executorType,
-            SqlSessionExceptionTranslator exceptionTranslator) {
+            PersistenceExceptionTranslator exceptionTranslator) {
 
         Assert.notNull(sqlSessionFactory, "Property 'sqlSessionFactory' is required");
         Assert.notNull(executorType, "Property 'executorType' is required");
@@ -139,7 +140,7 @@ public ExecutorType getExecutorType() {
         return this.executorType;
     }
 
-    public SqlSessionExceptionTranslator getExceptionTranslator() {
+    public PersistenceExceptionTranslator getExceptionTranslator() {
         return this.exceptionTranslator;
     }
 
@@ -342,15 +343,9 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
             } catch (Throwable t) {
                 Throwable unwrapped = ExceptionUtil.unwrapThrowable(t);
                 if (SqlSessionTemplate.this.exceptionTranslator != null && unwrapped instanceof PersistenceException) {
-                    String statement = null;
-                    if (args.length > 0 && args[0] instanceof String) {
-                        statement = (String) args[0];
-                    }
-                    throw SqlSessionTemplate.this.exceptionTranslator.translateException(
-                            (PersistenceException) unwrapped, statement);
-                } else {
-                    throw unwrapped;
-                }
+                    unwrapped = SqlSessionTemplate.this.exceptionTranslator.translateExceptionIfPossible((PersistenceException) unwrapped);
+                } 
+                throw unwrapped;
             } finally {
                 SqlSessionUtils.closeSqlSession(sqlSession, SqlSessionTemplate.this.sqlSessionFactory);
             }