diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index ef922909523..f731c7e9902 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/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 @@ class PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests { 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 @@ class PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests { } 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 queryForObject(JdbcConnectionDetails connectionDetails, String sql, Class result) + private T executeQuery(JdbcConnectionDetails connectionDetails, String sql, Class result) throws ClassNotFoundException { SimpleDriverDataSource dataSource = new SimpleDriverDataSource(); dataSource.setUrl(connectionDetails.getJdbcUrl()); diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index c415217ac62..0fe577a1bb3 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/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 @@ class PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests { 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 @@ class PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests { } 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 queryForObject(R2dbcConnectionDetails connectionDetails, String sql, Class result) { + private T executeQuery(R2dbcConnectionDetails connectionDetails, String sql, Class result) { ConnectionFactoryOptions connectionFactoryOptions = connectionDetails.getConnectionFactoryOptions(); return DatabaseClient.create(ConnectionFactories.get(connectionFactoryOptions)) .sql(sql)