Address a case where ConnectionDetails is not generated

Author: making

doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java

@@ -39,6 +39,8 @@
 import org.seasar.doma.jdbc.dialect.StandardDialect;
 import org.seasar.doma.jdbc.statistic.DefaultStatisticManager;
 import org.seasar.doma.jdbc.statistic.StatisticManager;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -75,39 +77,41 @@ public class DomaAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public Dialect dialect(JdbcConnectionDetails connectionDetails) {
+	public Dialect dialect(ObjectProvider<JdbcConnectionDetails> connectionDetailsProvider) {
 		DialectType dialectType = domaProperties.getDialect();
 		if (dialectType != null) {
 			return dialectType.create();
 		}
-		String url = connectionDetails.getJdbcUrl();
-		if (url != null) {
-			DatabaseDriver databaseDriver = DatabaseDriver.fromJdbcUrl(url);
-			switch (databaseDriver) {
-			case DB2:
-				return new Db2Dialect();
-			case H2:
-				return new H2Dialect();
-			case HSQLDB:
-				return new HsqldbDialect();
-			case SQLSERVER:
-			case JTDS:
-				return new MssqlDialect();
-			case MYSQL:
-				return new MysqlDialect();
-			case ORACLE:
-				return new OracleDialect();
-			case POSTGRESQL:
-				return new PostgresDialect();
-			case SQLITE:
-				return new SqliteDialect();
-			default:
-				break;
-			}
+		JdbcConnectionDetails connectionDetails = connectionDetailsProvider.getIfAvailable();
+		if (connectionDetails == null) {
+			throw new BeanCreationException(
+					"No connection details available. You will probably have to set 'doma.dialect' explicitly.");
+		}
+		DatabaseDriver databaseDriver = DatabaseDriver.fromJdbcUrl(connectionDetails.getJdbcUrl());
+		switch (databaseDriver) {
+		case DB2:
+			return new Db2Dialect();
+		case H2:
+			return new H2Dialect();
+		case HSQLDB:
+			return new HsqldbDialect();
+		case SQLSERVER:
+		case JTDS:
+			return new MssqlDialect();
+		case MYSQL:
+			return new MysqlDialect();
+		case ORACLE:
+			return new OracleDialect();
+		case POSTGRESQL:
+			return new PostgresDialect();
+		case SQLITE:
+			return new SqliteDialect();
+		default:
+			break;
 		}
 		if (logger.isWarnEnabled()) {
 			logger.warn(
-					"StandardDialect was selected because no explicit configuration and it is not possible to guess from 'spring.datasource.url property'");
+					"StandardDialect was selected because no explicit configuration and it is not possible to guess from the connection details.");
 		}
 		return new StandardDialect();
 	}

doma-spring-boot-autoconfigure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java

@@ -1,12 +1,14 @@
 package org.seasar.doma.boot.autoconfigure;
 
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -55,6 +57,7 @@
 import org.seasar.doma.jdbc.statistic.DefaultStatisticManager;
 import org.seasar.doma.jdbc.statistic.StatisticManager;
 import org.seasar.doma.message.Message;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
@@ -69,6 +72,7 @@
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.QueryTimeoutException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
 
 public class DomaAutoConfigurationTest {
@@ -279,8 +283,6 @@ public void testDialectByJdbConnectionDetails() {
 		sources.addFirst(new MapPropertySource("test",
 				Map.of("doma.exception-translation-enabled",
 						"false"/* prevent database connections */)));
-		EnvironmentTestUtils.addEnvironment(this.context,
-				"doma.exception-translation-enabled:false"); // Prevent database connections
 		this.context.register(DomaAutoConfiguration.class, DataSourceAutoConfiguration.class);
 		this.context.registerBean(JdbcConnectionDetails.class, () -> new JdbcConnectionDetails() {
 			@Override
@@ -303,6 +305,37 @@ public String getJdbcUrl() {
 		assertThat(dialect, is(instanceOf(PostgresDialect.class)));
 	}
 
+	@Test
+	public void testDialectMissingJdbConnectionDetails() {
+		MutablePropertySources sources = context.getEnvironment()
+				.getPropertySources();
+		sources.addFirst(new MapPropertySource("test",
+				Map.of("doma.exception-translation-enabled",
+						"false"/* prevent database connections */)));
+		this.context.register(DomaAutoConfiguration.class, DataSourceAutoConfiguration.class);
+		this.context.registerBean(DataSource.class, SimpleDriverDataSource::new);
+		BeanCreationException exception = assertThrows(BeanCreationException.class,
+				() -> this.context.refresh());
+		assertThat(exception.getMessage(), containsString(
+				"No connection details available. You will probably have to set 'doma.dialect' explicitly."));
+		//Dialect dialect = this.context.getBean(Dialect.class);
+		//assertThat(dialect, is(instanceOf(PostgresDialect.class)));
+	}
+
+	@Test
+	public void testDialectMissingJdbConnectionDetailsExplicitDialect() {
+		MutablePropertySources sources = context.getEnvironment()
+				.getPropertySources();
+		sources.addFirst(new MapPropertySource("test",
+				Map.of("doma.dialect", "POSTGRES", "doma.exception-translation-enabled",
+						"false"/* prevent database connections */)));
+		this.context.register(DomaAutoConfiguration.class, DataSourceAutoConfiguration.class);
+		this.context.registerBean(DataSource.class, SimpleDriverDataSource::new);
+		this.context.refresh();
+		Dialect dialect = this.context.getBean(Dialect.class);
+		assertThat(dialect, is(instanceOf(PostgresDialect.class)));
+	}
+
 	@Test
 	public void testDialectByDomaPropertiesIgnoreDataSourceUrl() {
 		MutablePropertySources sources = context.getEnvironment()