From 732a25c7c788adb8588577295fc5a6cfe8be47be Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 6 Dec 2021 10:28:06 +0100 Subject: [PATCH] Polishing. Code formatting. Original pull request #2379 --- .../MySqlStoredProcedureIntegrationTests.java | 12 ++++++++---- .../PostgresStoredProcedureIntegrationTests.java | 8 ++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java index 53fccd746..2b93979b5 100644 --- a/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java @@ -186,7 +186,9 @@ public class MySqlStoredProcedureIntegrationTests { List entityListFromNamedProcedure(); } - @EnableJpaRepositories(considerNestedRepositories = true, basePackageClasses = Config.class, + @EnableJpaRepositories( // + considerNestedRepositories = true, // + basePackageClasses = Config.class, // includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = EmployeeRepositoryWithNoCursor.class)) @EnableTransactionManagement static class Config { @@ -194,14 +196,16 @@ public class MySqlStoredProcedureIntegrationTests { @SuppressWarnings("resource") @Bean(initMethod = "start") public MySQLContainer container() { + return new MySQLContainer<>("mysql:8.0.24") // - .withUsername("test") // - .withPassword("test") // - .withConfigurationOverride(""); + .withUsername("test") // + .withPassword("test") // + .withConfigurationOverride(""); } @Bean public DataSource dataSource(MySQLContainer container) { + MysqlDataSource dataSource = new MysqlDataSource(); dataSource.setUrl(container.getJdbcUrl()); dataSource.setUser(container.getUsername()); diff --git a/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureIntegrationTests.java index b67a53b6f..8598d8406 100644 --- a/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureIntegrationTests.java @@ -152,8 +152,10 @@ public class PostgresStoredProcedureIntegrationTests { @Entity @AllArgsConstructor @NoArgsConstructor - @NamedStoredProcedureQuery(name = "get_employees_postgres", procedureName = "get_employees", - parameters = { @StoredProcedureParameter(mode = ParameterMode.REF_CURSOR, type = void.class) }, + @NamedStoredProcedureQuery( // + name = "get_employees_postgres", // + procedureName = "get_employees", // + parameters = { @StoredProcedureParameter(mode = ParameterMode.REF_CURSOR, type = void.class) }, // resultClasses = Employee.class) public static class Employee { @@ -197,12 +199,14 @@ public class PostgresStoredProcedureIntegrationTests { @SuppressWarnings("resource") @Bean(initMethod = "start") public PostgreSQLContainer container() { + return new PostgreSQLContainer<>("postgres:9.6.12") // .withUsername("postgres"); } @Bean public DataSource dataSource(PostgreSQLContainer container) { + PGSimpleDataSource dataSource = new PGSimpleDataSource(); dataSource.setUrl(container.getJdbcUrl()); dataSource.setUser(container.getUsername());