Change configuration to set embedded db name in sample

acktsap · web-flow · commit 746f9e85774d · 2025-02-02T04:16:49.000+09:00
Signed-off-by: Taeik Lim &lt;sibera21@gmail.com&gt;
diff --git a/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/customdryrun/JdbcConfig.kt b/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/customdryrun/JdbcConfig.kt
@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
-import java.util.UUID
 import javax.sql.DataSource
 
 @Configuration
@@ -33,9 +32,9 @@ open class JdbcConfig {
     @Bean
     open fun dataSource(): DataSource {
         return EmbeddedDatabaseBuilder()
-            .setName(UUID.randomUUID().toString())
             .setType(EmbeddedDatabaseType.H2)
             .ignoreFailedDrops(true)
+            .generateUniqueName(true)
             .build()
     }
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/dryrun/JdbcConfig.kt b/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/dryrun/JdbcConfig.kt
@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
-import java.util.UUID
 import javax.sql.DataSource
 
 @Configuration
@@ -33,9 +32,9 @@ open class JdbcConfig {
     @Bean
     open fun dataSource(): DataSource {
         return EmbeddedDatabaseBuilder()
-            .setName(UUID.randomUUID().toString())
             .setType(EmbeddedDatabaseType.H2)
             .ignoreFailedDrops(true)
+            .generateUniqueName(true)
             .build()
     }
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/formatter/JdbcConfig.kt b/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/formatter/JdbcConfig.kt
@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
-import java.util.UUID
 import javax.sql.DataSource
 
 @Configuration
@@ -33,9 +32,9 @@ open class JdbcConfig {
     @Bean
     open fun dataSource(): DataSource {
         return EmbeddedDatabaseBuilder()
-            .setName(UUID.randomUUID().toString())
             .setType(EmbeddedDatabaseType.H2)
             .ignoreFailedDrops(true)
+            .generateUniqueName(true)
             .build()
     }
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/jobname/JdbcConfig.kt b/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/jobname/JdbcConfig.kt
@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
-import java.util.UUID
 import javax.sql.DataSource
 
 @Configuration
@@ -33,9 +32,9 @@ open class JdbcConfig {
     @Bean
     open fun dataSource(): DataSource {
         return EmbeddedDatabaseBuilder()
-            .setName(UUID.randomUUID().toString())
             .setType(EmbeddedDatabaseType.H2)
             .ignoreFailedDrops(true)
+            .generateUniqueName(true)
             .build()
     }
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/parametername/JdbcConfig.kt b/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/parametername/JdbcConfig.kt
@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
-import java.util.UUID
 import javax.sql.DataSource
 
 @Configuration
@@ -33,9 +32,9 @@ open class JdbcConfig {
     @Bean
     open fun dataSource(): DataSource {
         return EmbeddedDatabaseBuilder()
-            .setName(UUID.randomUUID().toString())
             .setType(EmbeddedDatabaseType.H2)
             .ignoreFailedDrops(true)
+            .generateUniqueName(true)
             .build()
     }
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/plain/JdbcConfig.kt b/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/plain/JdbcConfig.kt
@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
-import java.util.UUID
 import javax.sql.DataSource
 
 @Configuration
@@ -33,9 +32,9 @@ open class JdbcConfig {
     @Bean
     open fun dataSource(): DataSource {
         return EmbeddedDatabaseBuilder()
-            .setName(UUID.randomUUID().toString())
             .setType(EmbeddedDatabaseType.H2)
             .ignoreFailedDrops(true)
+            .generateUniqueName(true)
             .build()
     }
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/prefix/JdbcConfig.kt b/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/prefix/JdbcConfig.kt
@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
-import java.util.UUID
 import javax.sql.DataSource
 
 @Configuration
@@ -33,10 +32,10 @@ open class JdbcConfig {
     @Bean
     open fun dataSource(): DataSource {
         return EmbeddedDatabaseBuilder()
-            .setName(UUID.randomUUID().toString())
             .setType(EmbeddedDatabaseType.H2)
             .addScript("classpath:sql/schema-h2-custom.sql")
             .ignoreFailedDrops(true)
+            .generateUniqueName(true)
             .build()
     }
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/prefixfromvariable/JdbcConfig.kt b/spring-batch-plus-sample/delete-meta-data-job-kotlin-sample/src/test/kotlin/com/navercorp/spring/batch/plus/sample/deletemedadata/prefixfromvariable/JdbcConfig.kt
@@ -37,6 +37,7 @@ open class JdbcConfig {
             .setType(EmbeddedDatabaseType.H2)
             .addScript("classpath:sql/schema-h2-custom.sql")
             .ignoreFailedDrops(true)
+            .generateUniqueName(true)
             .build()
     }
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/customdryrun/JdbcConfig.java b/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/customdryrun/JdbcConfig.java
@@ -18,8 +18,6 @@
 
 package com.navercorp.spring.batch.plus.sample.deletemetadata.customdryrun;
 
-import java.util.UUID;
-
 import javax.sql.DataSource;
 
 import org.springframework.boot.autoconfigure.batch.BatchDataSource;
@@ -35,9 +33,9 @@ public class JdbcConfig {
 	@Bean
 	public DataSource dataSource() {
 		return new EmbeddedDatabaseBuilder()
-			.setName(UUID.randomUUID().toString())
 			.setType(EmbeddedDatabaseType.H2)
 			.ignoreFailedDrops(true)
+			.generateUniqueName(true)
 			.build();
 	}
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/dryrun/JdbcConfig.java b/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/dryrun/JdbcConfig.java
@@ -18,8 +18,6 @@
 
 package com.navercorp.spring.batch.plus.sample.deletemetadata.dryrun;
 
-import java.util.UUID;
-
 import javax.sql.DataSource;
 
 import org.springframework.boot.autoconfigure.batch.BatchDataSource;
@@ -35,9 +33,9 @@ public class JdbcConfig {
 	@Bean
 	public DataSource dataSource() {
 		return new EmbeddedDatabaseBuilder()
-			.setName(UUID.randomUUID().toString())
 			.setType(EmbeddedDatabaseType.H2)
 			.ignoreFailedDrops(true)
+			.generateUniqueName(true)
 			.build();
 	}
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/formatter/JdbcConfig.java b/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/formatter/JdbcConfig.java
@@ -18,8 +18,6 @@
 
 package com.navercorp.spring.batch.plus.sample.deletemetadata.formatter;
 
-import java.util.UUID;
-
 import javax.sql.DataSource;
 
 import org.springframework.boot.autoconfigure.batch.BatchDataSource;
@@ -35,9 +33,9 @@ public class JdbcConfig {
 	@Bean
 	public DataSource dataSource() {
 		return new EmbeddedDatabaseBuilder()
-			.setName(UUID.randomUUID().toString())
 			.setType(EmbeddedDatabaseType.H2)
 			.ignoreFailedDrops(true)
+			.generateUniqueName(true)
 			.build();
 	}
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/jobname/JdbcConfig.java b/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/jobname/JdbcConfig.java
@@ -18,8 +18,6 @@
 
 package com.navercorp.spring.batch.plus.sample.deletemetadata.jobname;
 
-import java.util.UUID;
-
 import javax.sql.DataSource;
 
 import org.springframework.boot.autoconfigure.batch.BatchDataSource;
@@ -35,9 +33,9 @@ public class JdbcConfig {
 	@Bean
 	public DataSource dataSource() {
 		return new EmbeddedDatabaseBuilder()
-			.setName(UUID.randomUUID().toString())
 			.setType(EmbeddedDatabaseType.H2)
 			.ignoreFailedDrops(true)
+			.generateUniqueName(true)
 			.build();
 	}
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/parametername/JdbcConfig.java b/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/parametername/JdbcConfig.java
@@ -18,8 +18,6 @@
 
 package com.navercorp.spring.batch.plus.sample.deletemetadata.parametername;
 
-import java.util.UUID;
-
 import javax.sql.DataSource;
 
 import org.springframework.boot.autoconfigure.batch.BatchDataSource;
@@ -35,9 +33,9 @@ public class JdbcConfig {
 	@Bean
 	public DataSource dataSource() {
 		return new EmbeddedDatabaseBuilder()
-			.setName(UUID.randomUUID().toString())
 			.setType(EmbeddedDatabaseType.H2)
 			.ignoreFailedDrops(true)
+			.generateUniqueName(true)
 			.build();
 	}
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/plain/JdbcConfig.java b/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/plain/JdbcConfig.java
@@ -18,8 +18,6 @@
 
 package com.navercorp.spring.batch.plus.sample.deletemetadata.plain;
 
-import java.util.UUID;
-
 import javax.sql.DataSource;
 
 import org.springframework.boot.autoconfigure.batch.BatchDataSource;
@@ -35,9 +33,9 @@ public class JdbcConfig {
 	@Bean
 	public DataSource dataSource() {
 		return new EmbeddedDatabaseBuilder()
-			.setName(UUID.randomUUID().toString())
 			.setType(EmbeddedDatabaseType.H2)
 			.ignoreFailedDrops(true)
+			.generateUniqueName(true)
 			.build();
 	}
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/prefix/JdbcConfig.java b/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/prefix/JdbcConfig.java
@@ -18,8 +18,6 @@
 
 package com.navercorp.spring.batch.plus.sample.deletemetadata.prefix;
 
-import java.util.UUID;
-
 import javax.sql.DataSource;
 
 import org.springframework.boot.autoconfigure.batch.BatchDataSource;
@@ -35,10 +33,10 @@ public class JdbcConfig {
 	@Bean
 	public DataSource dataSource() {
 		return new EmbeddedDatabaseBuilder()
-			.setName(UUID.randomUUID().toString())
 			.setType(EmbeddedDatabaseType.H2)
 			.addScript("classpath:sql/schema-h2-custom.sql")
 			.ignoreFailedDrops(true)
+			.generateUniqueName(true)
 			.build();
 	}
 }
diff --git a/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/prefixfromvariable/JdbcConfig.java b/spring-batch-plus-sample/delete-meta-data-job-sample/src/test/java/com/navercorp/spring/batch/plus/sample/deletemetadata/prefixfromvariable/JdbcConfig.java
@@ -18,8 +18,6 @@
 
 package com.navercorp.spring.batch.plus.sample.deletemetadata.prefixfromvariable;
 
-import java.util.UUID;
-
 import javax.sql.DataSource;
 
 import org.springframework.boot.autoconfigure.batch.BatchDataSource;
@@ -35,10 +33,10 @@ public class JdbcConfig {
 	@Bean
 	public DataSource dataSource() {
 		return new EmbeddedDatabaseBuilder()
-			.setName(UUID.randomUUID().toString())
 			.setType(EmbeddedDatabaseType.H2)
 			.addScript("classpath:sql/schema-h2-custom.sql")
 			.ignoreFailedDrops(true)
+			.generateUniqueName(true)
 			.build();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ open class JdbcConfig {`
`37`	`37`	`.setType(EmbeddedDatabaseType.H2)`
`38`	`38`	`.addScript("classpath:sql/schema-h2-custom.sql")`
`39`	`39`	`.ignoreFailedDrops(true)`
	`40`	`+ .generateUniqueName(true)`
`40`	`41`	`.build()`
`41`	`42`	`}`
`42`	`43`	`}`