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 a3a33ad8474d1ca4257dc453d7fd98c4a964ba1a Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 30 16:35:13 2015 +0100 Remove TopiaConfiguration.builder --- .../legacy/framework/TopiaConnectionProviderTest.java | 3 ++- .../it/legacy/framework/TopiaContextReplicateTest.java | 5 +++-- .../nuiton/topia/it/legacy/framework/TopiaUtilTest.java | 3 ++- .../nuiton/topia/junit/AbstractDatabaseResource.java | 2 +- .../nuiton/topia/persistence/TopiaConfiguration.java | 17 ++++++++++------- .../topia/persistence/TopiaConfigurationBuilder.java | 8 -------- .../internal/AbstractTopiaApplicationContext.java | 7 ++++--- .../topia/persistence/jdbc/JdbcConfiguration.java | 7 +++++++ .../persistence/TopiaConfigurationBuilderTest.java | 10 +++++----- .../TopiaServiceFlywayInitOnCreateSchemaTest.java | 9 +++++---- .../topia/migration/TopiaMigrationEngineTest.java | 5 +++-- .../AbstractTopiaReplicationServiceTest.java | 2 +- 12 files changed, 43 insertions(+), 35 deletions(-) diff --git a/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java b/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java index c7dafad..2626ee9 100644 --- a/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java +++ b/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java @@ -36,6 +36,7 @@ import org.nuiton.topia.it.legacy.test.entities.PersonTopiaDao; import org.nuiton.topia.it.legacy.topiatest.Personne; import org.nuiton.topia.persistence.BeanTopiaConfiguration; import org.nuiton.topia.persistence.TopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.internal.TopiaConnectionProvider; @@ -60,7 +61,7 @@ public class TopiaConnectionProviderTest { @Override protected TopiaItLegacyTopiaApplicationContext createApplicationContext(TopiaConfiguration topiaConfiguration) { - BeanTopiaConfiguration configuration = TopiaConfiguration.builder.copyOf(topiaConfiguration); + BeanTopiaConfiguration configuration = new TopiaConfigurationBuilder().copyOf(topiaConfiguration); Map<String, String> extraConf = configuration.getHibernateExtraConfiguration(); diff --git a/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java b/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java index a954c78..fbc6a63 100644 --- a/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java +++ b/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java @@ -36,6 +36,7 @@ import org.nuiton.topia.it.legacy.test.entities.Pet; import org.nuiton.topia.it.legacy.test.entities.PetTopiaDao; import org.nuiton.topia.persistence.TopiaConfiguration; import org.nuiton.topia.persistence.BeanTopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; /** * To test replication sugin TopiaContext. @@ -52,7 +53,7 @@ public class TopiaContextReplicateTest { @Override protected TopiaItLegacyTopiaApplicationContext createApplicationContext(TopiaConfiguration topiaConfiguration) { BeanTopiaConfiguration configuration = - TopiaConfiguration.builder.copyOf(topiaConfiguration); + new TopiaConfigurationBuilder().copyOf(topiaConfiguration); configuration.setJdbcConnectionUrl(topiaConfiguration.getJdbcConnectionUrl() + "-source"); return super.createApplicationContext(configuration); } @@ -65,7 +66,7 @@ public class TopiaContextReplicateTest { @Override protected TopiaItLegacyTopiaApplicationContext createApplicationContext(TopiaConfiguration topiaConfiguration) { BeanTopiaConfiguration configuration = - TopiaConfiguration.builder.copyOf(topiaConfiguration); + new TopiaConfigurationBuilder().copyOf(topiaConfiguration); configuration.setJdbcConnectionUrl(topiaConfiguration.getJdbcConnectionUrl() + "-target"); return super.createApplicationContext(configuration); } diff --git a/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaUtilTest.java b/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaUtilTest.java index 6054230..be1d8db 100644 --- a/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaUtilTest.java +++ b/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaUtilTest.java @@ -33,6 +33,7 @@ import org.nuiton.topia.it.legacy.test.entities.PersonImpl; import org.nuiton.topia.it.legacy.topiatest.Personne; import org.nuiton.topia.persistence.BeanTopiaConfiguration; import org.nuiton.topia.persistence.TopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; import org.nuiton.topia.persistence.util.TopiaUtil; import java.util.regex.Matcher; @@ -58,7 +59,7 @@ public class TopiaUtilTest { @Override protected TopiaItLegacyTopiaApplicationContext createApplicationContext(TopiaConfiguration topiaConfiguration) { - BeanTopiaConfiguration configuration = TopiaConfiguration.builder.copyOf(topiaConfiguration); + BeanTopiaConfiguration configuration = new TopiaConfigurationBuilder().copyOf(topiaConfiguration); configuration.setInitSchema(false); return super.createApplicationContext(configuration); } diff --git a/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java b/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java index eb399c7..98cbd3e 100644 --- a/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java +++ b/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java @@ -71,7 +71,7 @@ public abstract class AbstractDatabaseResource<PersistenceContext extends TopiaP @Override protected void starting(Description description) { - TopiaConfigurationBuilder topiaConfigurationBuilder = TopiaConfiguration.builder; + TopiaConfigurationBuilder topiaConfigurationBuilder = new TopiaConfigurationBuilder(); TopiaConfiguration topiaConfiguration = topiaConfigurationBuilder.forTest( description.getTestClass(), 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 2a15d5d..0ae7ae4 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 @@ -5,14 +5,17 @@ import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import java.util.Map; /** - * Configuration needed to instantiate a {@link org.nuiton.topia.persistence.TopiaApplicationContext} + * Configuration needed to instantiate a {@link org.nuiton.topia.persistence.TopiaApplicationContext}. + * <p/> + * Please use an instance of {@link org.nuiton.topia.persistence.TopiaConfigurationBuilder} to build a new + * TopiaConfiguration. * + * @author Brendan Le Ny (Code Lutin) + * @author Arnaud Thimel (Code Lutin) * @since 3.0 */ public interface TopiaConfiguration extends JdbcConfiguration { - TopiaConfigurationBuilder builder = TopiaConfigurationBuilder.instance(); - /** * You can set it to false if you don't want Topia to deal with the schema (you keep it * up to date with your own sql file). @@ -35,20 +38,20 @@ public interface TopiaConfiguration extends JdbcConfiguration { * Topia will automatically generate an Hibernate configuration for you based * on the different element of this TopiaConfiguration. However, you can tune Hibernate * by adding Hibernate configuration directive to this Map. - * + * <p/> * We highly recommend you to use constants in {@link org.nuiton.topia.persistence.HibernateAvailableSettings} * as keys of the map. - * + * <p/> * You <strong>MUST NOT</strong> pass {@link HibernateAvailableSettings#HBM2DDL_AUTO} since * ToPIA will use validate. If you want use it, have a look at {@link org.nuiton.topia.persistence.HibernateTopiaMigrationService} * * @return a map containing hibernate configuration directives that ToPIA will use when it - * will instantiate Hibernate. + * will instantiate Hibernate. */ Map<String, String> getHibernateExtraConfiguration(); Map<String, Class<? extends TopiaService>> getDeclaredServices(); - Map<String, Map<String,String>> getDeclaredServicesConfiguration(); + Map<String, Map<String, String>> getDeclaredServicesConfiguration(); } 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 488d995..5d8fb0e 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 @@ -5,8 +5,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.AvailableSettings; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import org.nuiton.topia.persistence.jdbc.JdbcConfigurationBuilder; @@ -29,8 +27,6 @@ import java.util.Properties; */ public class TopiaConfigurationBuilder { - private static final Log log = LogFactory.getLog(TopiaConfigurationBuilder.class); - protected JdbcConfigurationBuilder jdbcConfigurationBuilder = new JdbcConfigurationBuilder(); protected static final String TOPIA_SERVICE_CONFIGURATION_PREFIX = "topia.service."; @@ -57,10 +53,6 @@ public class TopiaConfigurationBuilder { protected static final ImmutableSet<String> MAIN_CONFIGURATION = ImmutableSet.of(CONFIG_DRIVER, CONFIG_URL, CONFIG_USER, CONFIG_PASS); - public static TopiaConfigurationBuilder instance() { - return new TopiaConfigurationBuilder(); - } - /** * Do nothing but throws {@link TopiaMisconfigurationException} if there is a problem in * given configuration. diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaApplicationContext.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaApplicationContext.java index 6a50c57..4ec861e 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaApplicationContext.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaApplicationContext.java @@ -35,6 +35,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.TopiaApplicationContextCache; import org.nuiton.topia.persistence.TopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaIdFactory; @@ -100,7 +101,7 @@ public abstract class AbstractTopiaApplicationContext<K extends TopiaPersistence */ @Deprecated public AbstractTopiaApplicationContext(Properties properties) { - this(TopiaConfiguration.builder.readProperties(properties)); + this(new TopiaConfigurationBuilder().readProperties(properties)); } /** @@ -108,7 +109,7 @@ public abstract class AbstractTopiaApplicationContext<K extends TopiaPersistence */ @Deprecated public AbstractTopiaApplicationContext(Map<String, String> map) { - this(TopiaConfiguration.builder.readMap(map)); + this(new TopiaConfigurationBuilder().readMap(map)); } public AbstractTopiaApplicationContext(TopiaConfiguration configuration) { @@ -118,7 +119,7 @@ public abstract class AbstractTopiaApplicationContext<K extends TopiaPersistence protected void init() { - TopiaConfiguration.builder.check(configuration); + new TopiaConfigurationBuilder().check(configuration); topiaFiresSupport = new TopiaFiresSupport(); sessionRegistry = new TopiaHibernateSessionRegistry(); 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 index a057ddd..f031552 100644 --- 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 @@ -4,6 +4,13 @@ import java.io.Serializable; import java.sql.Driver; /** + * Jdbc part of the configuration needed to instantiate a {@link org.nuiton.topia.persistence.TopiaApplicationContext}. + * <p/> + * Please use an instance of {@link org.nuiton.topia.persistence.jdbc.JdbcConfigurationBuilder} to build a new + * JdbcTopiaConfiguration. + * + * @author Brendan Le Ny (Code Lutin) + * @author Arnaud Thimel (Code Lutin) * @since 3.0 */ public interface JdbcConfiguration extends Serializable { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaConfigurationBuilderTest.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaConfigurationBuilderTest.java index a1f3d38..a5b363a 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaConfigurationBuilderTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaConfigurationBuilderTest.java @@ -44,7 +44,7 @@ public class TopiaConfigurationBuilderTest { public void build() { TopiaConfiguration topiaConfiguration = - TopiaConfiguration.builder.forTestDatabase(getClass(), "build") + new TopiaConfigurationBuilder().forTestDatabase(getClass(), "build") .useHibernateUpdate() .build(); @@ -55,14 +55,14 @@ public class TopiaConfigurationBuilderTest { @Test public void forTest() { - TopiaConfiguration.builder.forTest(getClass(), "forTest"); + new TopiaConfigurationBuilder().forTest(getClass(), "forTest"); } @Test public void testReadProperties() { - BeanTopiaConfiguration topiaConfiguration = TopiaConfiguration.builder.readProperties(properties); + BeanTopiaConfiguration topiaConfiguration = new TopiaConfigurationBuilder().readProperties(properties); Assert.assertTrue(topiaConfiguration.getHibernateExtraConfiguration().containsValue(org.hibernate.cfg.ImprovedNamingStrategy.class.getName())); @@ -71,9 +71,9 @@ public class TopiaConfigurationBuilderTest { @Test public void testToMap() { - TopiaConfiguration topiaConfiguration = TopiaConfiguration.builder.readProperties(properties); + TopiaConfiguration topiaConfiguration = new TopiaConfigurationBuilder().readProperties(properties); - Map<String, String> map = TopiaConfiguration.builder.toMap(topiaConfiguration); + Map<String, String> map = new TopiaConfigurationBuilder().toMap(topiaConfiguration); if (log.isDebugEnabled()) { log.debug("generated map is " + map); 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 99f37db..f700941 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 @@ -31,6 +31,7 @@ import org.junit.Test; import org.nuiton.topia.it.mapping.TopiaItMappingTopiaApplicationContext; import org.nuiton.topia.persistence.BeanTopiaConfiguration; import org.nuiton.topia.persistence.TopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; /** @@ -50,7 +51,7 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { @Test public void testInitWithUseModelVersion() throws Exception { - BeanTopiaConfiguration config = TopiaConfiguration.builder.forTest(getClass(), "testInitWithUseModelVersion"); + BeanTopiaConfiguration config = new TopiaConfigurationBuilder().forTest(getClass(), "testInitWithUseModelVersion"); config.addDeclaredService("migration", TopiaFlywayServiceImpl.class.getName(), ImmutableMap.of(TopiaFlywayService.USE_MODEL_VERSION, "true")); JdbcH2Helper jdbcH2Helper = new JdbcH2Helper(config); @@ -75,7 +76,7 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { @Test public void testInitWithoutUseModelVersion() throws Exception { - BeanTopiaConfiguration config = TopiaConfiguration.builder.forTest(getClass(), "testInitWithoutUseModelVersion"); + BeanTopiaConfiguration config = new TopiaConfigurationBuilder().forTest(getClass(), "testInitWithoutUseModelVersion"); config.addDeclaredService("migration", TopiaFlywayServiceImpl.class.getName(), ImmutableMap.of(TopiaFlywayService.USE_MODEL_VERSION, "false")); JdbcH2Helper jdbcH2Helper = new JdbcH2Helper(config); @@ -101,7 +102,7 @@ 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 { - BeanTopiaConfiguration config = TopiaConfiguration.builder.forTest(getClass(), "testInitWithFlywayInitVersion"); + BeanTopiaConfiguration config = new TopiaConfigurationBuilder().forTest(getClass(), "testInitWithFlywayInitVersion"); config.addDeclaredService( "migration", TopiaFlywayServiceImpl.class.getName(), @@ -131,7 +132,7 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { @Test(expected = IllegalStateException.class) public void testInitWithInvalidConf() throws Exception { - BeanTopiaConfiguration config = TopiaConfiguration.builder.forTest(getClass(), "testInitWithInvalidConf"); + BeanTopiaConfiguration config = new TopiaConfigurationBuilder().forTest(getClass(), "testInitWithInvalidConf"); config.addDeclaredService( "migration", 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 5a77436..0f50f2c 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 @@ -32,6 +32,7 @@ import org.nuiton.topia.it.mapping.TopiaItMappingTopiaApplicationContext; import org.nuiton.topia.it.mapping.TopiaItMappingTopiaPersistenceContext; import org.nuiton.topia.persistence.BeanTopiaConfiguration; import org.nuiton.topia.persistence.TopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; import org.nuiton.topia.persistence.jdbc.JdbcHelper; @@ -65,7 +66,7 @@ public class TopiaMigrationEngineTest { @Test public void testMigrationHasRan() throws Exception { - BeanTopiaConfiguration config = TopiaConfiguration.builder.forTest(getClass(), "testMigrationHasRan"); + BeanTopiaConfiguration config = new TopiaConfigurationBuilder().forTest(getClass(), "testMigrationHasRan"); config.addDeclaredService("migration", TopiaMigrationEngine.class, ImmutableMap.of(TopiaMigrationService.MIGRATION_CALLBACK, TestMigrationCallbackCreateWhateverTable.class.getName())); @@ -122,7 +123,7 @@ public class TopiaMigrationEngineTest { public void testValidateAfterMigration() throws Exception { // new application context will init database schema because of topia.persistence.initSchema=true - BeanTopiaConfiguration config = TopiaConfiguration.builder.forTest(getClass(), "testValidateAfterMigration"); + BeanTopiaConfiguration config = new TopiaConfigurationBuilder().forTest(getClass(), "testValidateAfterMigration"); TopiaItMappingTopiaApplicationContext applicationContext = new TopiaItMappingTopiaApplicationContext(config); diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java index 608700f..898ad47 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java @@ -85,7 +85,7 @@ public abstract class AbstractTopiaReplicationServiceTest extends Assert { private static final String TEST_BASEDIR = "target%1$ssurefire-tests%1$s%2$td_%2$tm_%2$tY%1$s%2$tH_%2$tM_%2$tS"; protected TopiaItLegacyTopiaApplicationContext newTopiaItLegacyTopiaApplicationContext(String name) { - TopiaConfigurationBuilder topiaConfigurationBuilder = TopiaConfiguration.builder; + TopiaConfigurationBuilder topiaConfigurationBuilder = new TopiaConfigurationBuilder(); TopiaConfiguration topiaConfiguration = topiaConfigurationBuilder.forTest(getClass(), name); BeanTopiaConfiguration beanTopiaConfiguration = topiaConfigurationBuilder.copyOf(topiaConfiguration); beanTopiaConfiguration.addDeclaredService("replication", TopiaReplicationServiceImpl.class, Collections.<String, String>emptyMap()); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.