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 a261bc03c9d350d3c085e168685bd64833721dd0 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Dec 17 17:32:10 2014 +0100 Review some builder method names --- .../nuiton/topia/persistence/TopiaConfigurationBuilder.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java index 1c063c9..1fc1dfc 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java @@ -71,7 +71,7 @@ public class TopiaConfigurationBuilder { public static BeanTopiaConfiguration forTest(Class<?> testClass, String methodName) { JdbcConfiguration jdbcConfiguration = JdbcConfigurationBuilder.forTest(testClass, methodName); - BeanTopiaConfiguration configuration = forDatabase(jdbcConfiguration).doNotUseConnectionPooling().dontTouchTheSchema().build(); + BeanTopiaConfiguration configuration = forDatabase(jdbcConfiguration).doNotUseConnectionPooling().onlyCreateSchemaIfDatabaseIsEmpty().build(); return copyOf(configuration); } @@ -112,21 +112,30 @@ public class TopiaConfigurationBuilder { this.beanTopiaConfiguration = beanTopiaConfiguration; } - public BuildStep dontTouchTheSchema() { + public BuildStep onlyCreateSchemaIfDatabaseIsEmpty() { + beanTopiaConfiguration.setInitSchema(true); + return new BuildStep(beanTopiaConfiguration); + } + + public BuildStep useAlreadyExistingDatabaseAsIs() { + beanTopiaConfiguration.setInitSchema(false); return new BuildStep(beanTopiaConfiguration); } public BuildStep useHibernateUpdate() { + beanTopiaConfiguration.setInitSchema(true); beanTopiaConfiguration.addDeclaredService("migration", org.nuiton.topia.persistence.HibernateTopiaMigrationService.class, Collections.<String, String>emptyMap()); return new BuildStep(beanTopiaConfiguration); } public BuildStep useFlyway() { + beanTopiaConfiguration.setInitSchema(true); beanTopiaConfiguration.addDeclaredService("migration", "org.nuiton.topia.flyway.TopiaFlywayServiceImpl", Collections.<String, String>emptyMap()); return new BuildStep(beanTopiaConfiguration); } public BuildStep useLiquibase() { + beanTopiaConfiguration.setInitSchema(true); beanTopiaConfiguration.addDeclaredService("migration", "org.nuiton.topia.flyway.TopiaLiquibaseServiceImpl", Collections.<String, String>emptyMap()); return new BuildStep(beanTopiaConfiguration); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.