[Topia-commits] 01/03: Introduce JdbcConfiguration contract, use it when appropriate, make topia-service-flyway build

This is an automated email from the git hooks/post-receive script. New commit to branch feature/2892 in repository topia. See http://git.nuiton.org/topia.git commit 858464bac96f07b29c2c3c3ffd832af179defe71 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 16 08:30:56 2014 +0100 Introduce JdbcConfiguration contract, use it when appropriate, make topia-service-flyway build --- .../org/nuiton/topia/it/TopiaSchemaHelper.java | 18 +++-- .../topia/it/mapping/AbstractMappingTest.java | 10 +-- .../topia/it/mapping/test17/FixAno3280Test.java | 4 +- .../topia/persistence/TopiaConfiguration.java | 12 +-- .../topia/persistence/jdbc/JdbcConfiguration.java | 16 ++++ .../topia/flyway/TopiaFlywayServiceImpl.java | 4 +- .../TopiaServiceFlywayInitOnCreateSchemaTest.java | 91 +++++++++------------- .../topia/liquibase/TopiaLiquibaseServiceImpl.java | 4 +- .../topia/migration/TopiaMigrationEngineTest.java | 38 ++++----- 9 files changed, 91 insertions(+), 106 deletions(-) diff --git a/topia-it/src/main/java/org/nuiton/topia/it/TopiaSchemaHelper.java b/topia-it/src/main/java/org/nuiton/topia/it/TopiaSchemaHelper.java index cdb1ee4..f1683b0 100644 --- a/topia-it/src/main/java/org/nuiton/topia/it/TopiaSchemaHelper.java +++ b/topia-it/src/main/java/org/nuiton/topia/it/TopiaSchemaHelper.java @@ -28,12 +28,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import java.sql.CallableStatement; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; +import java.util.HashMap; import java.util.Map; /** @@ -78,7 +80,7 @@ public class TopiaSchemaHelper { * @throws Exception if could not create schema * @since 3.0 */ - public static void createSchema(Map<String, String> config, String schemaName) { + protected static void createSchema(Map<String, String> config, String schemaName) { Connection connection = null; CallableStatement callableStatement = null; try { @@ -100,13 +102,17 @@ public class TopiaSchemaHelper { /** * The mapping database use two extra schema (A and B) see test17. * - * @param config database connection configuration - * @throws Exception if could not create schemas on database + * @param jdbcConfiguration database connection configuration */ - public static void createMappingDataBaseSchemas(Map<String, String> config) { + public static void createMappingDataBaseSchemas(JdbcConfiguration jdbcConfiguration) { - createSchema(config, "A"); - createSchema(config, "B"); + Map<String, String> map = new HashMap<String, String>(); + map.put(TopiaConfigurationConstants.CONFIG_URL, jdbcConfiguration.getJdbcConnectionUrl()); + map.put(TopiaConfigurationConstants.CONFIG_USER, jdbcConfiguration.getJdbcConnectionUser()); + map.put(TopiaConfigurationConstants.CONFIG_PASS, jdbcConfiguration.getJdbcConnectionPassword()); + + createSchema(map, "A"); + createSchema(map, "B"); } diff --git a/topia-it/src/test/java/org/nuiton/topia/it/mapping/AbstractMappingTest.java b/topia-it/src/test/java/org/nuiton/topia/it/mapping/AbstractMappingTest.java index 0acf2fc..f274604 100644 --- a/topia-it/src/test/java/org/nuiton/topia/it/mapping/AbstractMappingTest.java +++ b/topia-it/src/test/java/org/nuiton/topia/it/mapping/AbstractMappingTest.java @@ -29,14 +29,10 @@ import org.junit.Rule; import org.nuiton.topia.it.TopiaSchemaHelper; import org.nuiton.topia.junit.AbstractDatabaseResource; import org.nuiton.topia.persistence.TopiaConfiguration; -import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaException; -import java.util.HashMap; -import java.util.Map; - /** * Base test for all tests using the {@code mapping} model. @@ -52,11 +48,7 @@ public abstract class AbstractMappingTest { @Override protected TopiaItMappingTopiaApplicationContext createApplicationContext(TopiaConfiguration topiaConfiguration) { - Map<String, String> map = new HashMap<String, String>(); - map.put(TopiaConfigurationConstants.CONFIG_URL, topiaConfiguration.getJdbcConnectionUrl()); - map.put(TopiaConfigurationConstants.CONFIG_USER, topiaConfiguration.getJdbcConnectionUser()); - map.put(TopiaConfigurationConstants.CONFIG_PASS, topiaConfiguration.getJdbcConnectionPassword()); - TopiaSchemaHelper.createMappingDataBaseSchemas(map); + TopiaSchemaHelper.createMappingDataBaseSchemas(topiaConfiguration); return new TopiaItMappingTopiaApplicationContext(topiaConfiguration); } }; diff --git a/topia-it/src/test/java/org/nuiton/topia/it/mapping/test17/FixAno3280Test.java b/topia-it/src/test/java/org/nuiton/topia/it/mapping/test17/FixAno3280Test.java index f513c8c..5a6f387 100644 --- a/topia-it/src/test/java/org/nuiton/topia/it/mapping/test17/FixAno3280Test.java +++ b/topia-it/src/test/java/org/nuiton/topia/it/mapping/test17/FixAno3280Test.java @@ -28,7 +28,7 @@ import org.h2.Driver; import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.it.mapping.AbstractMappingTest; -import org.nuiton.topia.persistence.TopiaConfiguration; +import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import java.sql.Connection; import java.sql.DriverManager; @@ -60,7 +60,7 @@ public class FixAno3280Test extends AbstractMappingTest { // TODO brendan 12/12/14 move this generic code somewhere public boolean isTableExist(String schema, String tableName) throws SQLException { - TopiaConfiguration configuration = db.getApplicationContext().getConfiguration(); + JdbcConfiguration configuration = db.getApplicationContext().getConfiguration(); Connection connection = null; try { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfiguration.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfiguration.java index 51c8ca3..7a85cc9 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfiguration.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfiguration.java @@ -1,5 +1,7 @@ package org.nuiton.topia.persistence; +import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; + import java.util.Map; /** @@ -7,7 +9,7 @@ import java.util.Map; * * @since 3.0 */ -public interface TopiaConfiguration { +public interface TopiaConfiguration extends JdbcConfiguration { boolean isInitSchema(); @@ -15,14 +17,6 @@ public interface TopiaConfiguration { String getSchemaName(); - String getJdbcDriverClassName(); - - String getJdbcConnectionUrl(); - - String getJdbcConnectionUser(); - - String getJdbcConnectionPassword(); - Map<String, String> getHibernateExtraConfiguration(); boolean isConnectionPoolingEnabled(); diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcConfiguration.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcConfiguration.java new file mode 100644 index 0000000..4566cd4 --- /dev/null +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcConfiguration.java @@ -0,0 +1,16 @@ +package org.nuiton.topia.persistence.jdbc; + +/** + * @since 3.0 + */ +public interface JdbcConfiguration { + + String getJdbcConnectionUrl(); + + String getJdbcConnectionUser(); + + String getJdbcConnectionPassword(); + + String getJdbcDriverClassName(); + +} diff --git a/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java b/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java index bab14a1..42affba 100644 --- a/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java +++ b/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java @@ -37,9 +37,9 @@ import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; import org.flywaydb.core.internal.util.Location; import org.nuiton.topia.persistence.TopiaApplicationContext; -import org.nuiton.topia.persistence.TopiaConfiguration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaMigrationServiceException; +import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import java.io.IOException; import java.net.URL; @@ -118,7 +118,7 @@ public class TopiaFlywayServiceImpl implements TopiaFlywayService { */ protected void setDataSource(Flyway flyway, TopiaApplicationContext topiaApplicationContext) { - TopiaConfiguration configuration = topiaApplicationContext.getConfiguration(); + JdbcConfiguration configuration = topiaApplicationContext.getConfiguration(); String url = configuration.getJdbcConnectionUrl(); String user = configuration.getJdbcConnectionUser(); diff --git a/topia-service-flyway/src/test/java/org/nuiton/topia/flyway/TopiaServiceFlywayInitOnCreateSchemaTest.java b/topia-service-flyway/src/test/java/org/nuiton/topia/flyway/TopiaServiceFlywayInitOnCreateSchemaTest.java index 6298ff6..f4ce7d4 100644 --- a/topia-service-flyway/src/test/java/org/nuiton/topia/flyway/TopiaServiceFlywayInitOnCreateSchemaTest.java +++ b/topia-service-flyway/src/test/java/org/nuiton/topia/flyway/TopiaServiceFlywayInitOnCreateSchemaTest.java @@ -22,26 +22,23 @@ package org.nuiton.topia.flyway; * #L% */ -import java.io.File; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.Map; - +import com.google.common.collect.ImmutableMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.h2.Driver; -import org.hibernate.dialect.H2Dialect; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.it.TopiaSchemaHelper; import org.nuiton.topia.it.mapping.TopiaItMappingTopiaApplicationContext; -import org.nuiton.topia.junit.ConfigurationHelper; -import org.nuiton.topia.persistence.TopiaConfigurationConstants; +import org.nuiton.topia.persistence.BeanTopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; +import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; -import com.google.common.collect.Maps; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; /** * @author Arnaud Thimel (Code Lutin) @@ -55,14 +52,14 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { * <p/> * This method is designed for H2 only. */ - protected boolean isTableExist(Map<String, String> config, String tableName) throws Exception { + protected boolean isTableExist(JdbcConfiguration config, String tableName) throws Exception { Connection connection = null; try { DriverManager.registerDriver(new Driver()); connection = DriverManager.getConnection( - config.get(TopiaConfigurationConstants.CONFIG_URL), - config.get(TopiaConfigurationConstants.CONFIG_USER), - config.get(TopiaConfigurationConstants.CONFIG_PASS)); + config.getJdbcConnectionUrl(), + config.getJdbcConnectionUser(), + config.getJdbcConnectionPassword()); boolean result = connection.getMetaData().getTables(null, null, tableName.toUpperCase(), null).next() || connection.getMetaData().getTables(null, null, tableName.toLowerCase(), null).next() || @@ -75,14 +72,14 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { } } - protected String runSelectOnString(Map<String, String> config, String sql) throws Exception { + protected String runSelectOnString(JdbcConfiguration config, String sql) throws Exception { Connection connection = null; try { DriverManager.registerDriver(new Driver()); connection = DriverManager.getConnection( - config.get(TopiaConfigurationConstants.CONFIG_URL), - config.get(TopiaConfigurationConstants.CONFIG_USER), - config.get(TopiaConfigurationConstants.CONFIG_PASS)); + config.getJdbcConnectionUrl(), + config.getJdbcConnectionUser(), + config.getJdbcConnectionPassword()); PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement.executeQuery(); @@ -97,38 +94,17 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { } } - protected String readVersion(Map<String, String> config) throws Exception { + protected String readVersion(JdbcConfiguration config) throws Exception { // Be careful, H2 is case sensitive and Flyway uses double quotes (") in table/column names return runSelectOnString(config, " SELECT MAX(\"version\") FROM \"PUBLIC\".\"schema_version\" "); } - protected Map<String, String> getTestConfig(String testName) { - - File testSpecificDirectory = ConfigurationHelper.getTestSpecificDirectory(TopiaServiceFlywayInitOnCreateSchemaTest.class, testName); - - String dbPath = new File(testSpecificDirectory, "db").getAbsolutePath(); - if (log.isDebugEnabled()) { - log.debug("dbPath = " + dbPath); - } - - Map<String, String> config = Maps.newHashMap(); - config.put(TopiaConfigurationConstants.CONFIG_DRIVER, Driver.class.getName()); - config.put(TopiaConfigurationConstants.CONFIG_DIALECT, H2Dialect.class.getName()); - config.put(TopiaConfigurationConstants.CONFIG_USER, "sa"); - config.put(TopiaConfigurationConstants.CONFIG_PASS, ""); - config.put(TopiaConfigurationConstants.CONFIG_URL, "jdbc:h2:file:" + dbPath); - config.put(TopiaConfigurationConstants.CONFIG_HBM2DDL_AUTO, "validate"); - config.put(TopiaConfigurationConstants.CONFIG_PERSISTENCE_INIT_SCHEMA, "true"); - return config; - } - @Test public void testInitWithUseModelVersion() throws Exception { - Map<String, String> config = getTestConfig("testInitWithUseModelVersion"); + BeanTopiaConfiguration config = TopiaConfigurationBuilder.forTest(getClass(), "testInitWithUseModelVersion"); - config.put("topia.service.migration", TopiaFlywayServiceImpl.class.getName()); - config.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "true"); + config.addDeclaredService("migration", TopiaFlywayServiceImpl.class.getName(), ImmutableMap.of(TopiaFlywayService.USE_MODEL_VERSION, "true")); Assert.assertFalse(isTableExist(config, "schema_version")); Assert.assertFalse(isTableExist(config, "a6")); @@ -152,10 +128,9 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { @Test public void testInitWithoutUseModelVersion() throws Exception { - Map<String, String> config = getTestConfig("testInitWithoutUseModelVersion"); + BeanTopiaConfiguration config = TopiaConfigurationBuilder.forTest(getClass(), "testInitWithoutUseModelVersion"); - config.put("topia.service.migration", TopiaFlywayServiceImpl.class.getName()); - config.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "false"); + config.addDeclaredService("migration", TopiaFlywayServiceImpl.class.getName(), ImmutableMap.of(TopiaFlywayService.USE_MODEL_VERSION, "false")); Assert.assertFalse(isTableExist(config, "schema_version")); Assert.assertFalse(isTableExist(config, "a6")); @@ -180,11 +155,15 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { @Ignore // This test won't work since it is not possible to give flyway another test dir than 'db/migration" public void testInitWithFlywayInitVersion() throws Exception { - Map<String, String> config = getTestConfig("testInitWithFlywayInitVersion"); + BeanTopiaConfiguration config = TopiaConfigurationBuilder.forTest(getClass(), "testInitWithFlywayInitVersion"); - config.put("topia.service.migration", TopiaFlywayServiceImpl.class.getName()); - config.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "false"); - config.put("topia.service.migration." + TopiaFlywayService.FLYWAY_INIT_VERSION, "1.2.42"); + config.addDeclaredService( + "migration", + TopiaFlywayServiceImpl.class.getName(), + ImmutableMap.of( + TopiaFlywayService.USE_MODEL_VERSION, "false", + TopiaFlywayService.FLYWAY_INIT_VERSION, "1.2.42" + )); Assert.assertFalse(isTableExist(config, "schema_version")); Assert.assertFalse(isTableExist(config, "a6")); @@ -207,11 +186,15 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { @Test(expected = IllegalStateException.class) public void testInitWithInvalidConf() throws Exception { - Map<String, String> config = getTestConfig("testInitWithInvalidConf"); + BeanTopiaConfiguration config = TopiaConfigurationBuilder.forTest(getClass(), "testInitWithInvalidConf"); - config.put("topia.service.migration", TopiaFlywayServiceImpl.class.getName()); - config.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "true"); - config.put("topia.service.migration." + TopiaFlywayService.FLYWAY_INIT_VERSION, "1.2.42"); + config.addDeclaredService( + "migration", + TopiaFlywayServiceImpl.class.getName(), + ImmutableMap.of( + TopiaFlywayService.USE_MODEL_VERSION, "true", + TopiaFlywayService.FLYWAY_INIT_VERSION, "1.2.42" + )); TopiaSchemaHelper.createMappingDataBaseSchemas(config); diff --git a/topia-service-liquibase/src/main/java/org/nuiton/topia/liquibase/TopiaLiquibaseServiceImpl.java b/topia-service-liquibase/src/main/java/org/nuiton/topia/liquibase/TopiaLiquibaseServiceImpl.java index 116a676..973bea5 100644 --- a/topia-service-liquibase/src/main/java/org/nuiton/topia/liquibase/TopiaLiquibaseServiceImpl.java +++ b/topia-service-liquibase/src/main/java/org/nuiton/topia/liquibase/TopiaLiquibaseServiceImpl.java @@ -37,8 +37,8 @@ import liquibase.resource.ResourceAccessor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaApplicationContext; -import org.nuiton.topia.persistence.TopiaConfiguration; import org.nuiton.topia.persistence.TopiaMigrationServiceException; +import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import java.util.Map; @@ -151,7 +151,7 @@ public class TopiaLiquibaseServiceImpl implements TopiaLiquibaseService { } protected Database openDatabase(TopiaApplicationContext topiaApplicationContext, ResourceAccessor resourceAccessor) { - TopiaConfiguration configuration = topiaApplicationContext.getConfiguration(); + JdbcConfiguration configuration = topiaApplicationContext.getConfiguration(); String url = configuration.getJdbcConnectionUrl(); String user = configuration.getJdbcConnectionUser(); String password = configuration.getJdbcConnectionPassword(); diff --git a/topia-service-migration/src/test/java/org/nuiton/topia/migration/TopiaMigrationEngineTest.java b/topia-service-migration/src/test/java/org/nuiton/topia/migration/TopiaMigrationEngineTest.java index b36d312..8e51d9e 100644 --- a/topia-service-migration/src/test/java/org/nuiton/topia/migration/TopiaMigrationEngineTest.java +++ b/topia-service-migration/src/test/java/org/nuiton/topia/migration/TopiaMigrationEngineTest.java @@ -39,14 +39,12 @@ import org.nuiton.topia.junit.AbstractDatabaseResource; import org.nuiton.topia.persistence.BeanTopiaConfiguration; import org.nuiton.topia.persistence.TopiaConfiguration; import org.nuiton.topia.persistence.TopiaConfigurationBuilder; -import org.nuiton.topia.persistence.TopiaConfigurationConstants; +import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.util.HashMap; -import java.util.Map; /** * @author Arnaud Thimel (Code Lutin) @@ -61,11 +59,7 @@ public class TopiaMigrationEngineTest { @Override protected TopiaItMappingTopiaApplicationContext createApplicationContext(TopiaConfiguration topiaConfiguration) { - Map<String, String> map = new HashMap<String, String>(); - map.put(TopiaConfigurationConstants.CONFIG_URL, topiaConfiguration.getJdbcConnectionUrl()); - map.put(TopiaConfigurationConstants.CONFIG_USER, topiaConfiguration.getJdbcConnectionUser()); - map.put(TopiaConfigurationConstants.CONFIG_PASS, topiaConfiguration.getJdbcConnectionPassword()); - TopiaSchemaHelper.createMappingDataBaseSchemas(map); + TopiaSchemaHelper.createMappingDataBaseSchemas(topiaConfiguration); return new TopiaItMappingTopiaApplicationContext(topiaConfiguration); } }; @@ -75,14 +69,14 @@ public class TopiaMigrationEngineTest { * * This method is designed for H2 only. */ - protected boolean isTableExist(TopiaConfiguration topiaConfiguration, String tableName) throws Exception { + protected boolean isTableExist(JdbcConfiguration jdbcConfiguration, String tableName) throws Exception { Connection connection = null; try { DriverManager.registerDriver(new Driver()); connection = DriverManager.getConnection( - topiaConfiguration.getJdbcConnectionUrl(), - topiaConfiguration.getJdbcConnectionUser(), - topiaConfiguration.getJdbcConnectionPassword()); + jdbcConfiguration.getJdbcConnectionUrl(), + jdbcConfiguration.getJdbcConnectionUser(), + jdbcConfiguration.getJdbcConnectionPassword()); ResultSet rset = connection.getMetaData().getTables(null, null, tableName.toUpperCase(), null); boolean result = rset.next(); return result; @@ -93,14 +87,14 @@ public class TopiaMigrationEngineTest { } } - protected String runSelectOnString(TopiaConfiguration topiaConfiguration, String sql) throws Exception { + protected String runSelectOnString(JdbcConfiguration jdbcConfiguration, String sql) throws Exception { Connection connection = null; try { DriverManager.registerDriver(new Driver()); connection = DriverManager.getConnection( - topiaConfiguration.getJdbcConnectionUrl(), - topiaConfiguration.getJdbcConnectionUser(), - topiaConfiguration.getJdbcConnectionPassword()); + jdbcConfiguration.getJdbcConnectionUrl(), + jdbcConfiguration.getJdbcConnectionUser(), + jdbcConfiguration.getJdbcConnectionPassword()); PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement.executeQuery(); @@ -115,14 +109,14 @@ public class TopiaMigrationEngineTest { } } - protected int runUpdate(TopiaConfiguration topiaConfiguration, String sql) throws Exception { + protected int runUpdate(JdbcConfiguration jdbcConfiguration, String sql) throws Exception { Connection connection = null; try { DriverManager.registerDriver(new Driver()); connection = DriverManager.getConnection( - topiaConfiguration.getJdbcConnectionUrl(), - topiaConfiguration.getJdbcConnectionUser(), - topiaConfiguration.getJdbcConnectionPassword()); + jdbcConfiguration.getJdbcConnectionUrl(), + jdbcConfiguration.getJdbcConnectionUser(), + jdbcConfiguration.getJdbcConnectionPassword()); PreparedStatement preparedStatement = connection.prepareStatement(sql); int result = preparedStatement.executeUpdate(); return result; @@ -133,8 +127,8 @@ public class TopiaMigrationEngineTest { } } - protected String readVersion(TopiaConfiguration topiaConfiguration) throws Exception { - return runSelectOnString(topiaConfiguration, "SELECT VERSION FROM TMS_VERSION"); + protected String readVersion(JdbcConfiguration jdbcConfiguration) throws Exception { + return runSelectOnString(jdbcConfiguration, "SELECT VERSION FROM TMS_VERSION"); } // @Test -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.