Skip to content

Modify to use the SQLErrorCodeSQLExceptionTranslator #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 5, 2016
Merged

Modify to use the SQLErrorCodeSQLExceptionTranslator #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0feaf89
Modify to use the SQLErrorCodeSQLExceptionTranslator
kazuki43zoo Mar 5, 2016
f5f9ab8
Fix typo in test case comment
kazuki43zoo Mar 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.dao.support.PersistenceExceptionTranslator;
import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;

import javax.sql.DataSource;

Expand All @@ -40,6 +41,7 @@
* Auto-configuration} for Doma.
*
* @author Toshiaki Maki
* @author Kazuki Shimizu
*/
@Configuration
@ConditionalOnClass(Config.class)
Expand All @@ -57,8 +59,8 @@ public Dialect dialect() {

@Bean
@ConditionalOnProperty(prefix = DomaProperties.DOMA_PREFIX, name = "exception-translation-enabled", matchIfMissing = true)
public PersistenceExceptionTranslator exceptionTranslator() {
return new DomaPersistenceExceptionTranslator();
public PersistenceExceptionTranslator exceptionTranslator(Config config) {
return new DomaPersistenceExceptionTranslator(new SQLErrorCodeSQLExceptionTranslator(config.getDataSource()));
}

@Bean
Expand Down
9 changes: 7 additions & 2 deletions .../src/main/java/org/seasar/doma/boot/autoconfigure/DomaPersistenceExceptionTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,20 @@
import org.seasar.doma.jdbc.*;
import org.springframework.dao.*;
import org.springframework.dao.support.PersistenceExceptionTranslator;
import org.springframework.jdbc.support.SQLExceptionSubclassTranslator;
import org.springframework.jdbc.support.SQLExceptionTranslator;

/**
* Converts Doma's {@link JdbcException} into Spring's {@link DataAccessException}.
* @author Toshiaki Maki
* @author Kazuki Shimizu
*/
public class DomaPersistenceExceptionTranslator implements PersistenceExceptionTranslator {
private final SQLExceptionTranslator translator = new SQLExceptionSubclassTranslator();

private final SQLExceptionTranslator translator;

public DomaPersistenceExceptionTranslator(SQLExceptionTranslator sqlExceptionTranslator) {
this.translator = sqlExceptionTranslator;
}

@Override
public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
Expand Down
41 changes: 41 additions & 0 deletions ...configure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,23 @@
import org.seasar.doma.jdbc.dialect.MysqlDialect;
import org.seasar.doma.jdbc.dialect.PostgresDialect;
import org.seasar.doma.jdbc.dialect.StandardDialect;
import org.seasar.doma.message.Message;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.dao.CannotAcquireLockException;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.dao.QueryTimeoutException;
import org.springframework.dao.support.PersistenceExceptionTranslator;
import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;

import javax.sql.DataSource;

import java.sql.SQLException;
import java.sql.SQLTimeoutException;

import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.*;

Expand All @@ -56,6 +65,8 @@ public void testAutoRegisteredConfig() {
is(instanceOf(GreedyCacheSqlFileRepository.class)));
assertThat(config.getNaming(), is(Naming.DEFAULT));
assertThat(config.getJdbcLogger(), is(instanceOf(UtilLoggingJdbcLogger.class)));
PersistenceExceptionTranslator translator = this.context.getBean(PersistenceExceptionTranslator.class);
assertThat(translator,is(instanceOf(DomaPersistenceExceptionTranslator.class)));
}

@Test
Expand All @@ -72,6 +83,8 @@ public void testConfigWithDomaConfigBuilder() {
is(instanceOf(NoCacheSqlFileRepository.class)));
assertThat(config.getNaming(), is(Naming.SNAKE_UPPER_CASE));
assertThat(config.getJdbcLogger(), is(instanceOf(UtilLoggingJdbcLogger.class)));
PersistenceExceptionTranslator translator = this.context.getBean(PersistenceExceptionTranslator.class);
assertThat(translator,is(instanceOf(DomaPersistenceExceptionTranslator.class)));
}

@Test
Expand All @@ -88,6 +101,34 @@ public void testConfigWithConfig() {
is(instanceOf(NoCacheSqlFileRepository.class)));
assertThat(config.getNaming(), is(Naming.SNAKE_LOWER_CASE));
assertThat(config.getJdbcLogger(), is(instanceOf(UtilLoggingJdbcLogger.class)));
PersistenceExceptionTranslator translator = this.context.getBean(PersistenceExceptionTranslator.class);
assertThat(translator,is(instanceOf(DomaPersistenceExceptionTranslator.class)));
}

@Test
public void testSQLExceptionTranslator() {
this.context.register(DomaAutoConfiguration.class,
DataSourceAutoConfiguration.class);
this.context.refresh();
PersistenceExceptionTranslator translator = this.context.getBean(PersistenceExceptionTranslator.class);
{
// Translated by SQLErrorCodeSQLExceptionTranslator
DataAccessException dataAccessException = translator.translateExceptionIfPossible(
new JdbcException(Message.DOMA2008, new SQLException("Acquire Lock on H2", "SqlState", 50200, null)));
assertThat(dataAccessException, is(instanceOf(CannotAcquireLockException.class)));
}
{
// Translated by SQLExceptionSubclassTranslator(fallback)
DataAccessException dataAccessException = translator.translateExceptionIfPossible(
new JdbcException(Message.DOMA2008, new SQLTimeoutException("Timeout", "SqlState", -1, null)));
assertThat(dataAccessException, is(instanceOf(QueryTimeoutException.class)));
}
{
// Translated by SQLStateSQLExceptionTranslator (fallback)
DataAccessException dataAccessException = translator.translateExceptionIfPossible(
new JdbcException(Message.DOMA2008, new SQLException("With check violation", "44", -1, null)));
assertThat(dataAccessException, is(instanceOf(DataIntegrityViolationException.class)));
}
}

@After
Expand Down