Merge pull request #45 from domaframework/update-domaconfigbuilder

Update DomaConfigBuilder

Author: backpaper0

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

@@ -50,7 +50,7 @@
 @AutoConfigureAfter(DataSourceAutoConfiguration.class)
 public class DomaAutoConfiguration {
 	@Autowired
-	DomaProperties domaProperties;
+	private DomaProperties domaProperties;
 
 	@Bean
 	@ConditionalOnMissingBean
@@ -96,15 +96,15 @@ public EntityListenerProvider tryLookupEntityListenerProvider() {
 	@Bean
 	@ConditionalOnMissingBean
 	public DomaConfigBuilder domaConfigBuilder() {
-		return new DomaConfigBuilder();
+		return new DomaConfigBuilder(domaProperties);
 	}
 
 	@Bean
 	@ConditionalOnMissingBean(Config.class)
 	public DomaConfig config(DataSource dataSource, Dialect dialect,
 			SqlFileRepository sqlFileRepository, Naming naming,
 			EntityListenerProvider entityListenerProvider,
-			DomaConfigBuilder domaConfigBuilder, DomaProperties domaProperties) {
+			DomaConfigBuilder domaConfigBuilder) {
 		if (domaConfigBuilder.dataSource() == null) {
 			domaConfigBuilder.dataSource(dataSource);
 		}
@@ -120,7 +120,10 @@ public DomaConfig config(DataSource dataSource, Dialect dialect,
 		if (domaConfigBuilder.entityListenerProvider() == null) {
 			domaConfigBuilder.entityListenerProvider(entityListenerProvider);
 		}
-		return domaConfigBuilder.build(domaProperties);
+		if (domaConfigBuilder.domaProperties() == null) {
+			return domaConfigBuilder.build(domaProperties);
+		}
+		return domaConfigBuilder.build();
 	}
 
 }

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

@@ -27,6 +27,7 @@
  * @author Toshiaki Maki
  */
 public class DomaConfigBuilder {
+	private DomaProperties domaProperties;
 	private DataSource dataSource;
 	/**
 	 * Default value is set in {@link DomaProperties}
@@ -50,6 +51,18 @@ public class DomaConfigBuilder {
 	private Commenter commenter = ConfigSupport.defaultCommenter;
 	private EntityListenerProvider entityListenerProvider;
 
+	@Deprecated
+	public DomaConfigBuilder() {
+	}
+
+	public DomaConfigBuilder(DomaProperties domaProperties) {
+		this.domaProperties = domaProperties;
+	}
+
+	DomaProperties domaProperties() {
+		return domaProperties;
+	}
+
 	public DataSource dataSource() {
 		return dataSource;
 	}
@@ -179,7 +192,13 @@ public DomaConfigBuilder entityListenerProvider(
 		return this;
 	}
 
+	@Deprecated
 	public DomaConfig build(DomaProperties domaProperties) {
+		this.domaProperties = domaProperties;
+		return build();
+	}
+
+	public DomaConfig build() {
 		return new DomaConfig(this, domaProperties);
 	}
 }

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

@@ -164,7 +164,7 @@ public void setBatchSize(int batchSize) {
 	}
 
 	public DomaConfigBuilder initializeDomaConfigBuilder() {
-		return new DomaConfigBuilder().dialect(dialect.create())
+		return new DomaConfigBuilder(this).dialect(dialect.create())
 				.sqlFileRepository(sqlFileRepository.create()).naming(naming.naming());
 	}
 

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

@@ -204,8 +204,8 @@ public void tearDown() {
 	@Configuration
 	public static class ConfigBuilderConfigure {
 		@Bean
-		DomaConfigBuilder myDomaConfigBuilder() {
-			return new DomaConfigBuilder().dialect(new MysqlDialect())
+		DomaConfigBuilder myDomaConfigBuilder(DomaProperties domaProperties) {
+			return new DomaConfigBuilder(domaProperties).dialect(new MysqlDialect())
 					.sqlFileRepository(new NoCacheSqlFileRepository())
 					.naming(Naming.SNAKE_UPPER_CASE)
 					.entityListenerProvider(new TestEntityListenerProvider());