branch feature/2892 updated (b70dfa1 -> fc608df)
This is an automated email from the git hooks/post-receive script. New change to branch feature/2892 in repository topia. See http://git.nuiton.org/topia.git from b70dfa1 Fix build of topia migration service new fc608df Remove TopiaSchemaHelper class which content has been moved into TopiaItMappingTopiaApplicationContext#createSchema() The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fc608dfc8a6400497910e8b55ae7ceea46ff3858 Author: Arnaud Thimel <thimel@codelutin.com> Date: Wed Dec 17 14:31:24 2014 +0100 Remove TopiaSchemaHelper class which content has been moved into TopiaItMappingTopiaApplicationContext#createSchema() Summary of changes: .../org/nuiton/topia/it/TopiaSchemaHelper.java | 55 ---------------------- .../TopiaItMappingTopiaApplicationContext.java | 34 +++++++++++++ .../topia/it/mapping/AbstractMappingTest.java | 2 - .../persistence/TopiaConfigurationBuilder.java | 6 +-- .../TopiaServiceFlywayInitOnCreateSchemaTest.java | 9 ---- .../topia/migration/TopiaMigrationEngineTest.java | 7 --- 6 files changed, 37 insertions(+), 76 deletions(-) delete mode 100644 topia-it/src/main/java/org/nuiton/topia/it/TopiaSchemaHelper.java create mode 100644 topia-it/src/main/java/org/nuiton/topia/it/mapping/TopiaItMappingTopiaApplicationContext.java -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 fc608dfc8a6400497910e8b55ae7ceea46ff3858 Author: Arnaud Thimel <thimel@codelutin.com> Date: Wed Dec 17 14:31:24 2014 +0100 Remove TopiaSchemaHelper class which content has been moved into TopiaItMappingTopiaApplicationContext#createSchema() --- .../org/nuiton/topia/it/TopiaSchemaHelper.java | 55 ---------------------- .../TopiaItMappingTopiaApplicationContext.java | 34 +++++++++++++ .../topia/it/mapping/AbstractMappingTest.java | 2 - .../persistence/TopiaConfigurationBuilder.java | 6 +-- .../TopiaServiceFlywayInitOnCreateSchemaTest.java | 9 ---- .../topia/migration/TopiaMigrationEngineTest.java | 7 --- 6 files changed, 37 insertions(+), 76 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 deleted file mode 100644 index 09831d1..0000000 --- a/topia-it/src/main/java/org/nuiton/topia/it/TopiaSchemaHelper.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.nuiton.topia.it; - -/* - * #%L - * ToPIA :: IT - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2014 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; -import org.nuiton.topia.persistence.jdbc.JdbcHelper; - -/** - * Created on 7/6/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.0 - */ -public class TopiaSchemaHelper { - - private static final Log log = LogFactory.getLog(TopiaSchemaHelper.class); - - /** - * The mapping database use two extra schema (A and B) see test17. - * - * @param jdbcConfiguration database connection configuration - */ - public static void createMappingDataBaseSchemas(JdbcConfiguration jdbcConfiguration) { - - JdbcHelper jdbcHelper = new JdbcHelper(jdbcConfiguration); - jdbcHelper.createSchema("A"); - jdbcHelper.createSchema("B"); - - } - -} diff --git a/topia-it/src/main/java/org/nuiton/topia/it/mapping/TopiaItMappingTopiaApplicationContext.java b/topia-it/src/main/java/org/nuiton/topia/it/mapping/TopiaItMappingTopiaApplicationContext.java new file mode 100644 index 0000000..79fb0c1 --- /dev/null +++ b/topia-it/src/main/java/org/nuiton/topia/it/mapping/TopiaItMappingTopiaApplicationContext.java @@ -0,0 +1,34 @@ +package org.nuiton.topia.it.mapping; + +import java.util.Map; +import java.util.Properties; +import org.nuiton.topia.persistence.TopiaConfiguration; +import org.nuiton.topia.persistence.jdbc.JdbcHelper; + +public class TopiaItMappingTopiaApplicationContext extends AbstractTopiaItMappingTopiaApplicationContext { + + @Deprecated + public TopiaItMappingTopiaApplicationContext(Properties properties) { + super(properties); + } + + @Deprecated + public TopiaItMappingTopiaApplicationContext(Map<String, String> configuration) { + super(configuration); + } + + public TopiaItMappingTopiaApplicationContext(TopiaConfiguration topiaConfiguration) { + super(topiaConfiguration); + } + + @Override + public void createSchema() { + + // Create DB schemas A and B for some of the entities + JdbcHelper jdbcHelper = new JdbcHelper(configuration); + jdbcHelper.createSchema("A"); + jdbcHelper.createSchema("B"); + + super.createSchema(); + } +} //TopiaItMappingTopiaApplicationContext 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 f274604..206371d 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 @@ -26,7 +26,6 @@ package org.nuiton.topia.it.mapping; */ 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.TopiaDao; @@ -48,7 +47,6 @@ public abstract class AbstractMappingTest { @Override protected TopiaItMappingTopiaApplicationContext createApplicationContext(TopiaConfiguration topiaConfiguration) { - TopiaSchemaHelper.createMappingDataBaseSchemas(topiaConfiguration); return new TopiaItMappingTopiaApplicationContext(topiaConfiguration); } }; 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 334f2f2..1c063c9 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 @@ -82,7 +82,7 @@ public class TopiaConfigurationBuilder { return copy; } - protected static class ConfigureConnectionPoolingStep { + public static class ConfigureConnectionPoolingStep { protected BeanTopiaConfiguration beanTopiaConfiguration; @@ -104,7 +104,7 @@ public class TopiaConfigurationBuilder { } - protected static class ConfigureInitSchemaStep { + public static class ConfigureInitSchemaStep { protected BeanTopiaConfiguration beanTopiaConfiguration; @@ -133,7 +133,7 @@ public class TopiaConfigurationBuilder { } - protected static class BuildStep { + public static class BuildStep { protected BeanTopiaConfiguration beanTopiaConfiguration; 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 bd08009..6c224f8 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 @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; 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.persistence.BeanTopiaConfiguration; import org.nuiton.topia.persistence.TopiaConfigurationBuilder; @@ -59,8 +58,6 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { Assert.assertFalse(jdbcH2Helper.isTableExist("schema_version")); Assert.assertFalse(jdbcH2Helper.isTableExist("A6")); - TopiaSchemaHelper.createMappingDataBaseSchemas(config); - // new application context will init database schema because of topia.persistence.initSchema=true TopiaItMappingTopiaApplicationContext applicationContext = new TopiaItMappingTopiaApplicationContext(config); @@ -86,8 +83,6 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { Assert.assertFalse(jdbcH2Helper.isTableExist("schema_version")); Assert.assertFalse(jdbcH2Helper.isTableExist("A6")); - TopiaSchemaHelper.createMappingDataBaseSchemas(config); - // new application context will init database schema because of topia.persistence.initSchema=true TopiaItMappingTopiaApplicationContext applicationContext = new TopiaItMappingTopiaApplicationContext(config); @@ -120,8 +115,6 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { Assert.assertFalse(jdbcH2Helper.isTableExist("schema_version")); Assert.assertFalse(jdbcH2Helper.isTableExist("A6")); - TopiaSchemaHelper.createMappingDataBaseSchemas(config); - // new application context will init database schema because of topia.persistence.initSchema=true TopiaItMappingTopiaApplicationContext applicationContext = new TopiaItMappingTopiaApplicationContext(config); @@ -148,8 +141,6 @@ public class TopiaServiceFlywayInitOnCreateSchemaTest { TopiaFlywayService.FLYWAY_INIT_VERSION, "1.2.42" )); - TopiaSchemaHelper.createMappingDataBaseSchemas(config); - // new application context will init database schema because of topia.persistence.initSchema=true new TopiaItMappingTopiaApplicationContext(config); 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 3b7f414..121ca58 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 @@ -28,7 +28,6 @@ import com.google.common.collect.ImmutableMap; import org.hibernate.HibernateException; import org.junit.Assert; import org.junit.Test; -import org.nuiton.topia.it.TopiaSchemaHelper; import org.nuiton.topia.it.mapping.TopiaItMappingTopiaApplicationContext; import org.nuiton.topia.it.mapping.TopiaItMappingTopiaPersistenceContext; import org.nuiton.topia.persistence.BeanTopiaConfiguration; @@ -70,9 +69,6 @@ public class TopiaMigrationEngineTest { config.addDeclaredService("migration", TopiaMigrationEngine.class, ImmutableMap.of(TopiaMigrationService.MIGRATION_CALLBACK, TestMigrationCallbackCreateWhateverTable.class.getName())); - // Create schemas for tables A.A and B.B - TopiaSchemaHelper.createMappingDataBaseSchemas(config); - { // Create database Assert.assertFalse(isTableExist(config, "TMS_VERSION")); @@ -128,9 +124,6 @@ public class TopiaMigrationEngineTest { // new application context will init database schema because of topia.persistence.initSchema=true BeanTopiaConfiguration config = TopiaConfigurationBuilder.forTest(getClass(), "testValidateAfterMigration"); - // Create schemas for tables A.A and B.B - TopiaSchemaHelper.createMappingDataBaseSchemas(config); - TopiaItMappingTopiaApplicationContext applicationContext = new TopiaItMappingTopiaApplicationContext(config); Assert.assertFalse(isTableExist(config, "TMS_VERSION")); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm