From 0a7166234d673fc89bb970988e0062ac9951688b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 5 Sep 2023 14:52:22 +0200
Subject: [PATCH] Polishing

---
 framework-api/framework-api.gradle            |  2 +-
 framework-docs/framework-docs.gradle          |  4 +---
 .../SimpleJdbcInsertIntegrationTests.java     | 23 ++++++++-----------
 .../AbstractJmsListenerContainerFactory.java  |  5 ++--
 .../test/context/BootstrapUtilsTests.java     |  2 +-
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/framework-api/framework-api.gradle b/framework-api/framework-api.gradle
index c551d6aa0e..b88413dc9b 100644
--- a/framework-api/framework-api.gradle
+++ b/framework-api/framework-api.gradle
@@ -115,4 +115,4 @@ publishing {
 			artifact schemaZip
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/framework-docs/framework-docs.gradle b/framework-docs/framework-docs.gradle
index 576f7709ad..c8e4232045 100644
--- a/framework-docs/framework-docs.gradle
+++ b/framework-docs/framework-docs.gradle
@@ -8,7 +8,6 @@ description = "Spring Framework Docs"
 
 apply from: "${rootDir}/gradle/publications.gradle"
 
-
 antora {
 	version = '3.2.0-alpha.2'
 	playbook = 'cached-antora-playbook.yml'
@@ -34,7 +33,6 @@ antora {
 	]
 }
 
-
 tasks.named("generateAntoraYml") {
 	asciidocAttributes = project.provider( {
 		return  ["spring-version": project.version ]
@@ -68,4 +66,4 @@ dependencies {
 
 	implementation(project(":spring-core-test"))
 	implementation("org.assertj:assertj-core")
-}
\ No newline at end of file
+}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertIntegrationTests.java
index 8f18bea2ad..77483b4f0e 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertIntegrationTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertIntegrationTests.java
@@ -154,34 +154,25 @@ class SimpleJdbcInsertIntegrationTests {
 
 		protected EmbeddedDatabase embeddedDatabase;
 
-
-		protected abstract String getSchemaScript();
-
-		protected abstract String getUsersTableName();
-
-		protected EmbeddedDatabase createEmbeddedDatabase() {
-			return new EmbeddedDatabaseBuilder(new ClassRelativeResourceLoader(DatabasePopulator.class))
+		@BeforeEach
+		void createDatabase() {
+			this.embeddedDatabase = new EmbeddedDatabaseBuilder(new ClassRelativeResourceLoader(DatabasePopulator.class))
 					.setType(EmbeddedDatabaseType.H2)
 					.addScript(getSchemaScript())
 					.addScript("users-data.sql")
 					.build();
-		}
 
-
-		@BeforeEach
-		void checkDatabaseSetup() {
-			this.embeddedDatabase = createEmbeddedDatabase();
 			assertNumUsers(1);
 		}
 
 		@AfterEach
-		void shutdown() {
+		void shutdownDatabase() {
 			this.embeddedDatabase.shutdown();
 		}
 
 		protected void assertNumUsers(long count) {
 			JdbcClient jdbcClient = JdbcClient.create(this.embeddedDatabase);
-			long numUsers = jdbcClient.sql("select count(*) from " + getUsersTableName()).query().singleValue();
+			long numUsers = jdbcClient.sql("select count(*) from " + getUsersTableName()).query(Long.class).single();
 			assertThat(numUsers).isEqualTo(count);
 		}
 
@@ -190,6 +181,10 @@ class SimpleJdbcInsertIntegrationTests {
 			assertNumUsers(2);
 		}
 
+		protected abstract String getSchemaScript();
+
+		protected abstract String getUsersTableName();
+
 	}
 
 }
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
index 2c1062f933..94ea31a798 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
@@ -199,8 +199,9 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
 
 	/**
 	 * Set the {@link ObservationRegistry} to be used for recording
-	 * {@link io.micrometer.core.instrument.binder.jms.JmsObservationDocumentation#JMS_MESSAGE_PROCESS JMS message processing observations}.
-	 * Defaults to no-op observations if the registry is not set.
+	 * {@linkplain io.micrometer.core.instrument.binder.jms.JmsObservationDocumentation#JMS_MESSAGE_PROCESS
+	 * JMS message processing observations}.
+	 * <p>Defaults to no-op observations if the registry is not set.
 	 * @since 6.1
 	 * @see AbstractMessageListenerContainer#setObservationRegistry(ObservationRegistry)
 	 */
diff --git a/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java
index 45f00717ca..b9f36be058 100644
--- a/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java
@@ -144,8 +144,8 @@ class BootstrapUtilsTests {
 	private void assertBootstrapper(Class<?> testClass, Class<?> expectedBootstrapper) {
 		BootstrapContext bootstrapContext = BootstrapTestUtils.buildBootstrapContext(testClass, delegate);
 		TestContextBootstrapper bootstrapper = resolveTestContextBootstrapper(bootstrapContext);
-		assertThat(bootstrapper).isNotNull();
 		assertThat(bootstrapper.getClass()).isEqualTo(expectedBootstrapper);
+		assertThat(bootstrapper).isExactlyInstanceOf(expectedBootstrapper);
 	}
 
 	// -------------------------------------------------------------------