Use code includes and tabs in embedded-database-support.adoc

See gh-22171

framework-docs/modules/ROOT/pages/data-access/jdbc/embedded-database-support.adoc

@@ -16,124 +16,22 @@ lightweight nature. Benefits include ease of configuration, quick startup time,
 testability, and the ability to rapidly evolve your SQL during development.
 
 
-[[jdbc-embedded-database-xml]]
-== Creating an Embedded Database by Using Spring XML
+[[jdbc-embedded-database]]
+== Creating an Embedded Database
 
-If you want to expose an embedded database instance as a bean in a Spring
-`ApplicationContext`, you can use the `embedded-database` tag in the `spring-jdbc` namespace:
+You can expose an embedded database instance as a bean as the following example shows:
 
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<jdbc:embedded-database id="dataSource" generate-name="true">
-		<jdbc:script location="classpath:schema.sql"/>
-		<jdbc:script location="classpath:test-data.sql"/>
-	</jdbc:embedded-database>
-----
+include-code::./JdbcEmbeddedDatabaseConfiguration[tag=snippet,indent=0]
 
-The preceding configuration creates an embedded HSQL database that is populated with SQL from
+The preceding configuration creates an embedded H2 database that is populated with SQL from
 the `schema.sql` and `test-data.sql` resources in the root of the classpath. In addition, as
 a best practice, the embedded database is assigned a uniquely generated name. The
 embedded database is made available to the Spring container as a bean of type
 `javax.sql.DataSource` that can then be injected into data access objects as needed.
 
-
-[[jdbc-embedded-database-java]]
-== Creating an Embedded Database Programmatically
-
-The `EmbeddedDatabaseBuilder` class provides a fluent API for constructing an embedded
-database programmatically. You can use this when you need to create an embedded database in a
-stand-alone environment or in a stand-alone integration test, as in the following example:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes",role="primary"]
-----
-	EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
-			.generateUniqueName(true)
-			.setType(H2)
-			.setScriptEncoding("UTF-8")
-			.ignoreFailedDrops(true)
-			.addScript("schema.sql")
-			.addScripts("user_data.sql", "country_data.sql")
-			.build();
-
-	// perform actions against the db (EmbeddedDatabase extends javax.sql.DataSource)
-
-	db.shutdown()
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
-----
-	val db = EmbeddedDatabaseBuilder()
-			.generateUniqueName(true)
-			.setType(H2)
-			.setScriptEncoding("UTF-8")
-			.ignoreFailedDrops(true)
-			.addScript("schema.sql")
-			.addScripts("user_data.sql", "country_data.sql")
-			.build()
-
-	// perform actions against the db (EmbeddedDatabase extends javax.sql.DataSource)
-
-	db.shutdown()
-----
-======
-
 See the {spring-framework-api}/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.html[javadoc for `EmbeddedDatabaseBuilder`]
 for further details on all supported options.
 
-You can also use the `EmbeddedDatabaseBuilder` to create an embedded database by using Java
-configuration, as the following example shows:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes",role="primary"]
-----
-	@Configuration
-	public class DataSourceConfig {
-
-		@Bean
-		public DataSource dataSource() {
-			return new EmbeddedDatabaseBuilder()
-					.generateUniqueName(true)
-					.setType(H2)
-					.setScriptEncoding("UTF-8")
-					.ignoreFailedDrops(true)
-					.addScript("schema.sql")
-					.addScripts("user_data.sql", "country_data.sql")
-					.build();
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
-----
-	@Configuration
-	class DataSourceConfig {
-
-		@Bean
-		fun dataSource(): DataSource {
-			return EmbeddedDatabaseBuilder()
-					.generateUniqueName(true)
-					.setType(H2)
-					.setScriptEncoding("UTF-8")
-					.ignoreFailedDrops(true)
-					.addScript("schema.sql")
-					.addScripts("user_data.sql", "country_data.sql")
-					.build()
-		}
-	}
-----
-======
-
 
 [[jdbc-embedded-database-types]]
 == Selecting the Embedded Database Type
@@ -245,8 +143,8 @@ can be useful for one-offs when the embedded database does not need to be reused
 classes. However, if you wish to create an embedded database that is shared within a test suite,
 consider using the xref:testing/testcontext-framework.adoc[Spring TestContext Framework] and
 configuring the embedded database as a bean in the Spring `ApplicationContext` as described
-in xref:data-access/jdbc/embedded-database-support.adoc#jdbc-embedded-database-xml[Creating an Embedded Database by Using Spring XML] and xref:data-access/jdbc/embedded-database-support.adoc#jdbc-embedded-database-java[Creating an Embedded Database Programmatically]. The following listing
-shows the test template:
+in xref:data-access/jdbc/embedded-database-support.adoc#jdbc-embedded-database[Creating an Embedded Database].
+The following listing shows the test template:
 
 [tabs]
 ======

framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcembeddeddatabase/JdbcEmbeddedDatabaseConfiguration.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.dataaccess.jdbc.jdbcembeddeddatabase;
+
+import javax.sql.DataSource;
+
+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;
+
+@Configuration
+public class JdbcEmbeddedDatabaseConfiguration {
+
+	// tag::snippet[]
+	@Bean
+	DataSource dataSource() {
+		return new EmbeddedDatabaseBuilder()
+				.generateUniqueName(true)
+				.setType(EmbeddedDatabaseType.H2)
+				.addScripts("schema.sql", "test-data.sql")
+				.build();
+	}
+	// end::snippet[]
+
+}

framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcembeddeddatabase/JdbcEmbeddedDatabaseConfiguration.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.dataaccess.jdbc.jdbcembeddeddatabase
+
+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
+
+@Configuration
+class JdbcEmbeddedDatabaseConfiguration {
+
+	// tag::snippet[]
+	@Bean
+	fun dataSource() = EmbeddedDatabaseBuilder()
+		.generateUniqueName(true)
+		.setType(EmbeddedDatabaseType.H2)
+		.addScripts("schema.sql", "test-data.sql")
+		.build()
+	// end::snippet[]
+
+}

framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcembeddeddatabase/JdbcEmbeddedDatabaseConfiguration.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+	   xsi:schemaLocation="
+			http://www.springframework.org/schema/beans
+			https://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/jdbc
+			https://www.springframework.org/schema/context/spring-jdbc.xsd">
+
+	<!-- tag::snippet[] -->
+	<jdbc:embedded-database id="dataSource" generate-name="true" type="H2">
+		<jdbc:script location="classpath:schema.sql"/>
+		<jdbc:script location="classpath:test-data.sql"/>
+	</jdbc:embedded-database>
+	<!-- end::snippet[] -->
+
+</beans>