Polish "Configure Postgres' application_name from the environment"

This commit configure the 'application_name' property of the Postgres
container from the standard 'spring.application.name'.

See gh-42460

Author: snicoll

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -64,7 +64,8 @@ void runCreatesConnectionDetailsApplicationName(JdbcConnectionDetails connection
 		assertThat(connectionDetails.getPassword()).isEqualTo("secret");
 		assertThat(connectionDetails.getJdbcUrl()).startsWith("jdbc:postgresql://")
 			.endsWith("?ApplicationName=spring+boot");
-		checkApplicationName(connectionDetails, "spring boot");
+		assertThat(executeQuery(connectionDetails, "select current_setting('application_name')", String.class))
+			.isEqualTo("spring boot");
 	}
 
 	private void assertConnectionDetails(JdbcConnectionDetails connectionDetails) {
@@ -74,18 +75,12 @@ private void assertConnectionDetails(JdbcConnectionDetails connectionDetails) {
 	}
 
 	private void checkDatabaseAccess(JdbcConnectionDetails connectionDetails) throws ClassNotFoundException {
-		assertThat(queryForObject(connectionDetails, DatabaseDriver.POSTGRESQL.getValidationQuery(), Integer.class))
+		assertThat(executeQuery(connectionDetails, DatabaseDriver.POSTGRESQL.getValidationQuery(), Integer.class))
 			.isEqualTo(1);
 	}
 
-	private void checkApplicationName(JdbcConnectionDetails connectionDetails, String applicationName)
-			throws ClassNotFoundException {
-		assertThat(queryForObject(connectionDetails, "select current_setting('application_name')", String.class))
-			.isEqualTo(applicationName);
-	}
-
 	@SuppressWarnings("unchecked")
-	private <T> T queryForObject(JdbcConnectionDetails connectionDetails, String sql, Class<T> result)
+	private <T> T executeQuery(JdbcConnectionDetails connectionDetails, String sql, Class<T> result)
 			throws ClassNotFoundException {
 		SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
 		dataSource.setUrl(connectionDetails.getJdbcUrl());

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -66,7 +66,8 @@ void runCreatesConnectionDetailsApplicationName(R2dbcConnectionDetails connectio
 		assertConnectionDetails(connectionDetails);
 		ConnectionFactoryOptions options = connectionDetails.getConnectionFactoryOptions();
 		assertThat(options.getValue(Option.valueOf("applicationName"))).isEqualTo("spring boot");
-		checkApplicationName(connectionDetails, "spring boot");
+		assertThat(executeQuery(connectionDetails, "select current_setting('application_name')", String.class))
+			.isEqualTo("spring boot");
 	}
 
 	private void assertConnectionDetails(R2dbcConnectionDetails connectionDetails) {
@@ -80,17 +81,11 @@ private void assertConnectionDetails(R2dbcConnectionDetails connectionDetails) {
 	}
 
 	private void checkDatabaseAccess(R2dbcConnectionDetails connectionDetails) {
-		Integer result = queryForObject(connectionDetails, DatabaseDriver.POSTGRESQL.getValidationQuery(),
-				Integer.class);
-		assertThat(result).isEqualTo(1);
+		assertThat(executeQuery(connectionDetails, DatabaseDriver.POSTGRESQL.getValidationQuery(), Integer.class))
+			.isEqualTo(1);
 	}
 
-	private void checkApplicationName(R2dbcConnectionDetails connectionDetails, String applicationName) {
-		assertThat(queryForObject(connectionDetails, "select current_setting('application_name')", String.class))
-			.isEqualTo(applicationName);
-	}
-
-	private <T> T queryForObject(R2dbcConnectionDetails connectionDetails, String sql, Class<T> result) {
+	private <T> T executeQuery(R2dbcConnectionDetails connectionDetails, String sql, Class<T> result) {
 		ConnectionFactoryOptions connectionFactoryOptions = connectionDetails.getConnectionFactoryOptions();
 		return DatabaseClient.create(ConnectionFactories.get(connectionFactoryOptions))
 			.sql(sql)