branch feature/7464 updated (faf26bd -> 756f064)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7464 in repository observe. See http://git.codelutin.com/observe.git from faf26bd Suppression TopiaException new 756f064 Taiste 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 756f064d67af884e3e64b5108121b10e86acf82b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 21 11:45:44 2015 +0200 Taiste Summary of changes: .../observe/ObserveTopiaApplicationContext.java | 24 +++++++++++++ .../java/fr/ird/observe/ObserveTopiaIdFactory.java | 23 ++++++++++++ .../observe/ObserveTopiaPersistenceContext.java | 11 ++++++ .../fr/ird/observe/entities/OpenableEntities.java | 12 +++---- .../AbstractObserveMigrationCallBack.java | 13 ++++--- .../entities/migration/H2DataSourceMigration.java | 38 ++++++++++---------- ...ObserveMigrationCallBackForVersionResolver.java | 4 +-- .../entities/migration/PGDataSourceMigration.java | 41 +++++++++++---------- .../DataSourceMigrationForVersion_3_1.java | 24 ++++++------- .../DataSourceMigrationForVersion_3_10.java | 5 ++- .../DataSourceMigrationForVersion_3_11.java | 5 ++- .../DataSourceMigrationForVersion_3_12.java | 5 ++- .../DataSourceMigrationForVersion_3_14.java | 5 ++- .../DataSourceMigrationForVersion_3_15.java | 5 ++- .../DataSourceMigrationForVersion_3_16.java | 39 ++++++++++---------- .../DataSourceMigrationForVersion_3_5.java | 42 +++++++++++----------- .../DataSourceMigrationForVersion_3_7.java | 5 ++- .../DataSourceMigrationForVersion_3_8.java | 5 ++- .../DataSourceMigrationForVersion_3_9.java | 5 ++- .../DataSourceMigrationForVersion_4_0.java | 7 ++-- .../DataSourceMigrationForVersion_4_0_1.java | 31 ++++++++-------- .../DataSourceMigrationForVersion_4_0_RC2.java | 9 +++-- .../DataSourceMigrationForVersion_4_0_RC3.java | 22 ++++++------ .../DataSourceMigrationForVersion_4_0_RC4.java | 7 ++-- .../DataSourceMigrationForVersion_4_0_RC6.java | 13 ++++--- .../DataSourceMigrationForVersion_4_0_RC7.java | 5 ++- .../referentiel/LengthWeightParemeterHelper.java | 12 +++---- .../{ProgramDAOImpl.java => ProgramTopiaDao.java} | 34 +++++++++--------- .../main/java/fr/ird/observe/util/DBHelper.java | 4 +-- ...ObserveDataSourceConfigurationTopiaSupport.java | 3 ++ 30 files changed, 249 insertions(+), 209 deletions(-) create mode 100644 observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java rename observe-entities/src/main/java/fr/ird/observe/entities/referentiel/{ProgramDAOImpl.java => ProgramTopiaDao.java} (70%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7464 in repository observe. See http://git.codelutin.com/observe.git commit 756f064d67af884e3e64b5108121b10e86acf82b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 21 11:45:44 2015 +0200 Taiste --- .../observe/ObserveTopiaApplicationContext.java | 24 +++++++++++++ .../java/fr/ird/observe/ObserveTopiaIdFactory.java | 23 ++++++++++++ .../observe/ObserveTopiaPersistenceContext.java | 11 ++++++ .../fr/ird/observe/entities/OpenableEntities.java | 12 +++---- .../AbstractObserveMigrationCallBack.java | 13 ++++--- .../entities/migration/H2DataSourceMigration.java | 38 ++++++++++---------- ...ObserveMigrationCallBackForVersionResolver.java | 4 +-- .../entities/migration/PGDataSourceMigration.java | 41 +++++++++++---------- .../DataSourceMigrationForVersion_3_1.java | 24 ++++++------- .../DataSourceMigrationForVersion_3_10.java | 5 ++- .../DataSourceMigrationForVersion_3_11.java | 5 ++- .../DataSourceMigrationForVersion_3_12.java | 5 ++- .../DataSourceMigrationForVersion_3_14.java | 5 ++- .../DataSourceMigrationForVersion_3_15.java | 5 ++- .../DataSourceMigrationForVersion_3_16.java | 39 ++++++++++---------- .../DataSourceMigrationForVersion_3_5.java | 42 +++++++++++----------- .../DataSourceMigrationForVersion_3_7.java | 5 ++- .../DataSourceMigrationForVersion_3_8.java | 5 ++- .../DataSourceMigrationForVersion_3_9.java | 5 ++- .../DataSourceMigrationForVersion_4_0.java | 7 ++-- .../DataSourceMigrationForVersion_4_0_1.java | 31 ++++++++-------- .../DataSourceMigrationForVersion_4_0_RC2.java | 9 +++-- .../DataSourceMigrationForVersion_4_0_RC3.java | 22 ++++++------ .../DataSourceMigrationForVersion_4_0_RC4.java | 7 ++-- .../DataSourceMigrationForVersion_4_0_RC6.java | 13 ++++--- .../DataSourceMigrationForVersion_4_0_RC7.java | 5 ++- .../referentiel/LengthWeightParemeterHelper.java | 12 +++---- .../{ProgramDAOImpl.java => ProgramTopiaDao.java} | 34 +++++++++--------- .../main/java/fr/ird/observe/util/DBHelper.java | 4 +-- ...ObserveDataSourceConfigurationTopiaSupport.java | 3 ++ 30 files changed, 249 insertions(+), 209 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java new file mode 100644 index 0000000..d7d6bcc --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -0,0 +1,24 @@ +package fr.ird.observe; + +import org.nuiton.topia.persistence.TopiaConfiguration; + +import java.util.Map; +import java.util.Properties; + +public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicationContext { + + @Deprecated + public ObserveTopiaApplicationContext(Properties properties) { + super(properties); + } + + @Deprecated + public ObserveTopiaApplicationContext(Map<String, String> configuration) { + super(configuration); + } + + public ObserveTopiaApplicationContext(TopiaConfiguration topiaConfiguration) { + super(topiaConfiguration); + } + +} diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java new file mode 100644 index 0000000..d5a8778 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java @@ -0,0 +1,23 @@ +package fr.ird.observe; + +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory; + +/** + * Created on 21/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveTopiaIdFactory extends LegacyTopiaIdFactory { + + private static final long serialVersionUID = 1L; + + public <E extends TopiaEntity> String newTopiaId(Class<E> entityType ) { + + double random = Math.random(); + while (Double.toString(random).contains("E-")) { + random = Math.random(); + } + return newTopiaId(entityType, random+""); + } +} diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java new file mode 100644 index 0000000..61caf84 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java @@ -0,0 +1,11 @@ +package fr.ird.observe; + +import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContextConstructorParameter; + +public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersistenceContext { + + public ObserveTopiaPersistenceContext(AbstractTopiaPersistenceContextConstructorParameter parameter) { + super(parameter); + } + +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java index b84b82a..b6ad4ed 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java @@ -22,11 +22,9 @@ package fr.ird.observe.entities; * #L% */ -import fr.ird.observe.ObserveDAOHelper; +import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.seine.TripSeine; -import org.nuiton.topia.TopiaContext; - -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.persistence.TopiaException; import java.util.Collection; @@ -62,12 +60,12 @@ public class OpenableEntities { * @return la marée ouverte, ou <code>null</code> si pas de marée ouverte * @if any pb */ - public static TripSeine getOpenTrip(TopiaContext ctxt) { + public static TripSeine getOpenTrip(ObserveTopiaPersistenceContext ctxt) { if (ctxt == null) { - throw new TopiaRuntimeException("could not find a local topia" + + throw new TopiaException("could not find a local topia" + " context"); } - TripSeine m = ObserveDAOHelper.getTripSeineDAO(ctxt).findByOpen(true); + TripSeine m = ctxt.getTripSeineDao().forOpenEquals(true).findAnyOrNull(); return m; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java index cc8cb32..9819d82 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java @@ -27,11 +27,10 @@ import com.google.common.collect.Lists; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.jdbc.Work; - -import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.topia.persistence.support.TopiaSqlWork; import org.nuiton.util.version.Version; import java.io.IOException; @@ -76,7 +75,7 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal stream.close(); } catch (IOException e) { - throw new TopiaRuntimeException("Could not load migration script: " + migrationScript, e); + throw new TopiaException("Could not load migration script: " + migrationScript, e); } finally { IOUtils.closeQuietly(stream); } @@ -84,11 +83,11 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal } - protected Set<String> getTopiaIds(TopiaContextImplementor tx, final String tableName) { + protected Set<String> getTopiaIds(TopiaSqlSupport topiaSqlSupport, final String tableName) { final Set<String> result = new HashSet<String>(); - tx.getHibernate().doWork(new Work() { + topiaSqlSupport.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java index 234ab60..ef36c92 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java @@ -23,9 +23,9 @@ package fr.ird.observe.entities.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.jdbc.Work; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.topia.persistence.support.TopiaSqlWork; import java.sql.Connection; import java.sql.PreparedStatement; @@ -54,12 +54,12 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { super(new ObserveMigrationCallBackForVersionResolver(TYPE)); } - protected static String getUniqueConstraintName(TopiaContextImplementor tx, final String tableName, final String columnName) { + protected static String getUniqueConstraintName(TopiaSqlSupport tx, final String tableName, final String columnName) { // recherche du nom de la constrainte final List<String> result = new ArrayList<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -92,13 +92,13 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { return constraintName; } - public static String getFirstTableUniqueConstraintName(TopiaContextImplementor tx, final String tableName) { + public static String getFirstTableUniqueConstraintName(TopiaSqlSupport tx, final String tableName) { // recherche du nom de la constrainte //(); final List<String> result = new ArrayList<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -129,11 +129,11 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { return constraintName; } - public static Set<String> getConstraintNames(TopiaContextImplementor tx, final String tableName) { + public static Set<String> getConstraintNames(TopiaSqlSupport tx, final String tableName) { final Set<String> result = new HashSet<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -156,11 +156,11 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { return result; } - public static Set<String> getForeignKeyConstraintNames(TopiaContextImplementor tx, final String tableName) { + public static Set<String> getForeignKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { final Set<String> result = new HashSet<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -183,11 +183,11 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { return result; } - public static String getForeignKeyConstraintName(TopiaContextImplementor tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) { + public static String getForeignKeyConstraintName(TopiaSqlSupport tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) { final List<String> result = new ArrayList<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -232,11 +232,11 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } - public static Set<String> getUniqueKeyConstraintNames(TopiaContextImplementor tx, final String tableName) { + public static Set<String> getUniqueKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { final Set<String> result = new HashSet<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -259,7 +259,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { return result; } - public static void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) { + public static void removeFK(TopiaSqlSupport tx, String tableName, List<String> queries) { // Get fk constraints Set<String> fkNames = getForeignKeyConstraintNames(tx, tableName); @@ -271,7 +271,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } - public static void removeFK(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) { + public static void removeFK(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, true); @@ -281,7 +281,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } - public static void removeFKIfExists(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) { + public static void removeFKIfExists(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, false); @@ -296,7 +296,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } - public static void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) { + public static void removeUK(TopiaSqlSupport tx, String tableName, List<String> queries) { // Get uk constraints Set<String> uKNames = getUniqueKeyConstraintNames(tx, tableName); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java index 5e6c123..696fde3 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java @@ -23,7 +23,7 @@ package fr.ird.observe.entities.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.util.version.Version; @@ -83,7 +83,7 @@ class ObserveMigrationCallBackForVersionResolver implements TopiaMigrationCallba } } catch (ClassNotFoundException e) { - throw new TopiaRuntimeException("Could not find migration class [" + mainclassName + "] for version " + version); + throw new TopiaException("Could not find migration class [" + mainclassName + "] for version " + version); } if (log.isDebugEnabled()) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java index 8c04605..2bb4b76 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java @@ -23,9 +23,9 @@ package fr.ird.observe.entities.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.jdbc.Work; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.topia.persistence.support.TopiaSqlWork; import java.sql.Connection; import java.sql.PreparedStatement; @@ -54,12 +54,12 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { super(new ObserveMigrationCallBackForVersionResolver(TYPE)); } - protected static String getUniqueConstraintName(TopiaContextImplementor tx, final String tableName, final String columnName) { + protected static String getUniqueConstraintName(TopiaSqlSupport tx, final String tableName, final String columnName) { // recherche du nom de la constrainte final List<String> result = new ArrayList<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -135,13 +135,13 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return constraintName; } - public static String getFirstTableUniqueConstraintName(TopiaContextImplementor tx, final String tableName) { + public static String getFirstTableUniqueConstraintName(TopiaSqlSupport tx, final String tableName) { // recherche du nom de la constrainte //(); final List<String> result = new ArrayList<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -172,11 +172,11 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return constraintName; } - public static Set<String> getConstraintNames(TopiaContextImplementor tx, final String tableName) { + public static Set<String> getConstraintNames(TopiaSqlSupport tx, final String tableName) { final Set<String> result = new HashSet<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -199,11 +199,11 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return result; } - public static Set<String> getForeignKeyConstraintNames(TopiaContextImplementor tx, final String tableName) { + public static Set<String> getForeignKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { final Set<String> result = new HashSet<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -227,13 +227,12 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static String getForeignKeyConstraintName(TopiaContextImplementor tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) { + public static String getForeignKeyConstraintName(TopiaSqlSupport tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) { final List<String> result = new ArrayList<String>(); - tx.getHibernate().doWork(new Work() { - - @Override + tx.doSqlWork(new TopiaSqlWork() { + public void execute(Connection connection) throws SQLException { @@ -318,11 +317,11 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static Set<String> getUniqueKeyConstraintNames(TopiaContextImplementor tx, final String tableName) { + public static Set<String> getUniqueKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { final Set<String> result = new HashSet<String>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -345,7 +344,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return result; } - public static void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) { + public static void removeFK(TopiaSqlSupport tx, String tableName, List<String> queries) { // Get fk constraints Set<String> fkNames = getForeignKeyConstraintNames(tx, tableName); @@ -357,7 +356,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static void removeFK(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) { + public static void removeFK(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, true); @@ -367,7 +366,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static void removeFKIfExists(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) { + public static void removeFKIfExists(TopiaSqlSupport tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, false); @@ -381,7 +380,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) { + public static void removeUK(TopiaSqlSupport tx, String tableName, List<String> queries) { // Get uk constraints Set<String> uKNames = getUniqueKeyConstraintNames(tx, tableName); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java index 8580455..26cfb7f 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java @@ -25,9 +25,8 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import org.apache.commons.lang3.tuple.Pair; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaSQLQuery; -import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.sql.Connection; import java.sql.PreparedStatement; @@ -50,24 +49,23 @@ public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationC } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { // Doublons et absence de clé primaire dans especefaune_ocean et especethon_ocean // (see http://forge.codelutin.com/issues/3398) - updateReferentielEspece("thon", tx, queries); - updateReferentielEspece("faune", tx, queries); + updateReferentielEspece("thon", topiaSqlSupport, queries); + updateReferentielEspece("faune", topiaSqlSupport, queries); } - protected void updateReferentielEspece(String speciesType, TopiaContextImplementor tx, + protected void updateReferentielEspece(String speciesType, TopiaSqlSupport topiaSqlSupport, List<String> queries) { - GetAllEspeceOceanDoublonQuery request = - new GetAllEspeceOceanDoublonQuery(speciesType); + GetAllEspeceOceanDoublonQuery request = new GetAllEspeceOceanDoublonQuery(speciesType); - List<Pair<String, String>> entities = request.findMultipleResult(tx); + List<Pair<String, String>> entities = topiaSqlSupport.findMultipleResult(request); String deleteQuery = "DELETE FROM espece%1$s_ocean WHERE espece%1$s='%2$s' AND ocean='%3$s';"; String insertQuery = "INSERT INTO espece%1$s_ocean VALUES('%2$s','%3$s');"; @@ -84,7 +82,7 @@ public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationC queries.add(String.format(addConstraintQuery, speciesType)); } - static class GetAllEspeceOceanDoublonQuery extends TopiaSQLQuery<Pair<String, String>> { + static class GetAllEspeceOceanDoublonQuery extends TopiaSqlQuery<Pair<String, String>> { private final String tableName; @@ -93,7 +91,7 @@ public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationC } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { String sql = "SELECT e.espece%1$s, e.ocean, count(e.*) " + "FROM espece%1$s_ocean e \n" + "GROUP BY e.espece%1$s, e.ocean\n" + @@ -104,7 +102,7 @@ public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationC } @Override - protected Pair<String, String> prepareResult(ResultSet set) throws SQLException { + public Pair<String, String> prepareResult(ResultSet set) throws SQLException { Pair<String, String> result = Pair.of(set.getString(1), set.getString(2)); return result; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java index 371bd78..1fa4e0a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -44,7 +43,7 @@ public class DataSourceMigrationForVersion_3_10 extends AbstractObserveMigration } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java index ffb735e..55db066 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -44,7 +43,7 @@ public class DataSourceMigrationForVersion_3_11 extends AbstractObserveMigration } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java index 1663e5d..dece464 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -44,7 +43,7 @@ public class DataSourceMigrationForVersion_3_12 extends AbstractObserveMigration } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java index 5bce4e5..0f60deb 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -44,7 +43,7 @@ public class DataSourceMigrationForVersion_3_14 extends AbstractObserveMigration } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java index 57b5c95..a885f4b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -44,7 +43,7 @@ public class DataSourceMigrationForVersion_3_15 extends AbstractObserveMigration } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java index 6837359..d8b7fd3 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java @@ -28,9 +28,8 @@ import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.jdbc.Work; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.topia.persistence.support.TopiaSqlWork; import java.sql.Connection; import java.sql.PreparedStatement; @@ -56,19 +55,19 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { addScript("add-gear-referential", queries); addScript("add-gear-data", queries); - migrateTripSenneData(tx, queries); + migrateTripSenneData(topiaSqlSupport, queries); addScript("remove-tripSeine-seine", queries); - + } - private void migrateTripSenneData(TopiaContextImplementor tx, List<String> queries) { + private void migrateTripSenneData(TopiaSqlSupport tx, List<String> queries) { String gearUseFeaturesIdPrefix = "fr.ird.observe.entities.seine.GearUseFeatures#1427183650941#"; @@ -100,22 +99,11 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration } } - private static class SenneData { - - String tripId; - - Integer seineCircumference; - - Integer seineDepth; - - Integer seineBallastWeight; - } - - protected Set<SenneData> getSenneData(TopiaContextImplementor tx) { + protected Set<SenneData> getSenneData(TopiaSqlSupport tx) { final Set<SenneData> result = new HashSet<SenneData>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -142,6 +130,17 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration return result; } + private static class SenneData { + + String tripId; + + Integer seineCircumference; + + Integer seineDepth; + + Integer seineBallastWeight; + } + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_3_16 { public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java index 645d30a..6831832 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java @@ -27,8 +27,8 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; import java.util.Set; @@ -41,14 +41,6 @@ import java.util.Set; */ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveMigrationCallBack { - protected abstract void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) throws TopiaException; - - protected abstract void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) throws TopiaException; - - public DataSourceMigrationForVersion_3_5(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_5, callBack, scriptSuffix); - } - protected String[] TABLES = new String[]{ "ParametrageTaillePoidsFaune", "ParametrageTaillePoidsThon", @@ -99,24 +91,32 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM "ACTIVITE_SYSTEMEOBSERVE" }; + public DataSourceMigrationForVersion_3_5(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_3_5, callBack, scriptSuffix); + } + + protected abstract void removeFK(TopiaSqlSupport tx, String tableName, List<String> queries) throws TopiaException; + + protected abstract void removeUK(TopiaSqlSupport tx, String tableName, List<String> queries) throws TopiaException; + @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { // Get all especeThon (to migrate them into a speciesList later) - Set<String> speciesThonIds = getTopiaIds(tx, "especethon"); + Set<String> speciesThonIds = getTopiaIds(topiaSqlSupport, "especethon"); // Get all especeFaune (to migrate them into a speciesList later) - Set<String> speciesFauneIds = getTopiaIds(tx, "especefaune"); + Set<String> speciesFauneIds = getTopiaIds(topiaSqlSupport, "especefaune"); // translate model (see http://forge.codelutin.com/issues/4115) // migrate wind (see http://forge.codelutin.com/issues/5304) // migrate persons (see http://forge.codelutin.com/issues/5303) // add captain and dataInputor on Trip (see http://forge.codelutin.com/issues/5305) // add gearType on Program (see http://forge.codelutin.com/issues/5604) - translateModel(tx, queries); + translateModel(topiaSqlSupport, queries); // add SpeciesList (see http://forge.codelutin.com/issues/) addSpeciesList(queries, speciesThonIds, speciesFauneIds); @@ -146,12 +146,12 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM queries.addAll(Lists.newArrayList(migrationQueries)); } - protected void translateModel(TopiaContextImplementor tx, List<String> queries) { + protected void translateModel(TopiaSqlSupport topiaSqlSupport, List<String> queries) { for (String oldTableName : TABLES) { - removeFK(tx, oldTableName, queries); - removeUK(tx, oldTableName, queries); + removeFK(topiaSqlSupport, oldTableName, queries); + removeUK(topiaSqlSupport, oldTableName, queries); } String[] migrationQueries = loadScript("migration"); @@ -204,14 +204,14 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM } @Override - protected void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) { + protected void removeFK(TopiaSqlSupport tx, String tableName, List<String> queries) { H2DataSourceMigration.removeFK(tx, tableName, queries); } @Override - protected void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) { + protected void removeUK(TopiaSqlSupport tx, String tableName, List<String> queries) { H2DataSourceMigration.removeUK(tx, tableName, queries); @@ -226,14 +226,14 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM } @Override - protected void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) { + protected void removeFK(TopiaSqlSupport tx, String tableName, List<String> queries) { PGDataSourceMigration.removeFK(tx, tableName, queries); } @Override - protected void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) { + protected void removeUK(TopiaSqlSupport tx, String tableName, List<String> queries) { PGDataSourceMigration.removeUK(tx, tableName, queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java index 97109c4..f999b1f 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java @@ -27,8 +27,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -45,7 +44,7 @@ public abstract class DataSourceMigrationForVersion_3_7 extends AbstractObserveM } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java index afdec16..96a36ce 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -44,7 +43,7 @@ public class DataSourceMigrationForVersion_3_8 extends AbstractObserveMigrationC } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java index c892b8f..ad39efc 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -44,7 +43,7 @@ public class DataSourceMigrationForVersion_3_9 extends AbstractObserveMigrationC } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java index 6d78971..77817f8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -37,14 +36,14 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public class DataSourceMigrationForVersion_4_0 extends AbstractObserveMigrationCallBack { +public class DataSourceMigrationForVersion_4_0 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0(AbstractDataSourceMigration callBack, String scriptSuffix) { super(AbstractDataSourceMigration.V_4_0, callBack, scriptSuffix); } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java index 6ba88c8..b4c6ebb 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java @@ -24,16 +24,15 @@ package fr.ird.observe.entities.migration.versions; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; +import fr.ird.observe.ObserveTopiaIdFactory; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; -import org.hibernate.jdbc.Work; - -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.topia.persistence.support.TopiaSqlWork; import java.sql.Connection; import java.sql.PreparedStatement; @@ -52,14 +51,14 @@ import java.util.Set; */ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserveMigrationCallBack { - protected abstract void removeForeignKeys(TopiaContextImplementor tx, List<String> queries); - public DataSourceMigrationForVersion_4_0_1(AbstractDataSourceMigration callBack, String scriptSuffix) { super(AbstractDataSourceMigration.V_4_0_1, callBack, scriptSuffix); } + protected abstract void removeForeignKeys(TopiaSqlSupport tx, List<String> queries); + @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport tx, List<String> queries, boolean showSql, boolean showProgression) { @@ -79,7 +78,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv } - protected void recomputeLonglineHaulingIds(TopiaContextImplementor tx, List<String> queries) { + protected void recomputeLonglineHaulingIds(TopiaSqlSupport tx, List<String> queries) { class SetData { @@ -95,7 +94,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv // L'ensemble des opérations de pêche où l'on doit regénerer les générer les haulingIds final Set<SetData> setIds = new LinkedHashSet<SetData>(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -128,10 +127,10 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv } } - protected void migrateGearUseFeaturesSeineMeasurementIds(TopiaContextImplementor tx, List<String> queries) { + protected void migrateGearUseFeaturesSeineMeasurementIds(TopiaSqlSupport tx, List<String> queries) { final Multimap<String, String> gearUseFeaturesSeineAndMeasurementIds = LinkedHashMultimap.create(); - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { @@ -152,9 +151,11 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv } }); + ObserveTopiaIdFactory topiaIdFactory = new ObserveTopiaIdFactory(); for (String gearUseFeaturesSeineId : gearUseFeaturesSeineAndMeasurementIds.keySet()) { - String newGearUseFeaturesSeineId = TopiaId.create(GearUseFeaturesSeine.class); + + String newGearUseFeaturesSeineId = topiaIdFactory.newTopiaId(GearUseFeaturesSeine.class); queries.add(String.format("INSERT INTO OBSERVE_SEINE.GEARUSEFEATURES(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, GEAR, NUMBER) VALUES ('%s', 0, TIMESTAMP '2015-03-24 00:00:00.00', 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 1)", newGearUseFeaturesSeineId)); queries.add(String.format("UPDATE OBSERVE_SEINE.GEARUSEFEATURES SET TRIP = (SELECT TRIP FROM OBSERVE_SEINE.GEARUSEFEATURES WHERE topiaId='%s') WHERE topiaId='%s';", gearUseFeaturesSeineId, newGearUseFeaturesSeineId)); @@ -163,7 +164,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv for (String gearUseFeaturesMeasurementSeineId : gearUseFeaturesMeasurementSeineIds) { - String newGearUseFeaturesMeasurementSeineId = TopiaId.create(GearUseFeaturesMeasurementSeine.class); + String newGearUseFeaturesMeasurementSeineId = topiaIdFactory.newTopiaId(GearUseFeaturesMeasurementSeine.class); queries.add(String.format("UPDATE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT SET GEARUSEFEATURES = '%s', topiaid = '%s' WHERE topiaid='%s'", newGearUseFeaturesSeineId, newGearUseFeaturesMeasurementSeineId, gearUseFeaturesMeasurementSeineId)); } @@ -181,7 +182,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv } @Override - protected void removeForeignKeys(TopiaContextImplementor tx, List<String> queries) { + protected void removeForeignKeys(TopiaSqlSupport tx, List<String> queries) { H2DataSourceMigration.removeFKIfExists(tx, "observe_seine", "FLOATINGOBJECT", "OBJECTTYPE", queries); H2DataSourceMigration.removeFKIfExists(tx, "observe_seine", "FLOATINGOBJECT", "OBJECTFATE", queries); @@ -200,7 +201,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv } @Override - protected void removeForeignKeys(TopiaContextImplementor tx, List<String> queries) { + protected void removeForeignKeys(TopiaSqlSupport tx, List<String> queries) { PGDataSourceMigration.removeFKIfExists(tx, "observe_seine", "FLOATINGOBJECT", "OBJECTTYPE", queries); PGDataSourceMigration.removeFKIfExists(tx, "observe_seine", "FLOATINGOBJECT", "OBJECTFATE", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java index c6c4a98..1395a0a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java @@ -26,9 +26,8 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.hibernate.jdbc.Work; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.topia.persistence.support.TopiaSqlWork; import java.sql.Connection; import java.sql.PreparedStatement; @@ -51,7 +50,7 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { @@ -60,7 +59,7 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat // recherche du nom de la constrainte final Set<String> result = new HashSet<String>(); - tx.getHibernate().doWork(new Work() { + topiaSqlSupport.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java index 20bcfa8..734e8e8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -28,9 +28,9 @@ import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.jdbc.Work; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.topia.persistence.support.TopiaSqlWork; import java.sql.Connection; import java.sql.PreparedStatement; @@ -51,21 +51,21 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse /** Logger. */ private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_4_0_RC3.class); - protected abstract void addMissingForeignKeys(TopiaContextImplementor tx, List<String> queries) throws TopiaException; - public DataSourceMigrationForVersion_4_0_RC3(AbstractDataSourceMigration callBack, String scriptSuffix) { super(AbstractDataSourceMigration.V_4_0_RC3, callBack, scriptSuffix); } + protected abstract void addMissingForeignKeys(TopiaSqlSupport tx, List<String> queries) throws TopiaException; + @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { // See https://forge.codelutin.com/issues/6964 - addMissingForeignKeys(tx, queries); + addMissingForeignKeys(topiaSqlSupport, queries); // See https://forge.codelutin.com/issues/6983 loadScript("update-senne-gear-usedInTrip"); @@ -82,7 +82,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse } @Override - protected void addMissingForeignKeys(TopiaContextImplementor tx, List<String> queries) { + protected void addMissingForeignKeys(TopiaSqlSupport tx, List<String> queries) { // Nothing to do for h2 db } @@ -95,7 +95,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse } @Override - protected void addMissingForeignKeys(TopiaContextImplementor tx, List<String> queries) { + protected void addMissingForeignKeys(TopiaSqlSupport tx, List<String> queries) { removeForeignKeyIndex(tx, queries, "OBSERVE_COMMON", "gear_gearcaracteristic", "gear"); removeForeignKeyIndex(tx, queries, "OBSERVE_COMMON", "ocean_species", "species"); @@ -148,9 +148,9 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse } - private void removeForeignKeyIndex(TopiaContextImplementor tx, final List<String> queries, final String schemaName, final String tableName, final String columnName) { + private void removeForeignKeyIndex(TopiaSqlSupport tx, final List<String> queries, final String schemaName, final String tableName, final String columnName) { - tx.getHibernate().doWork(new Work() { + tx.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java index d6c1a8e..5640999 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -44,7 +43,7 @@ public class DataSourceMigrationForVersion_4_0_RC4 extends AbstractObserveMigrat } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { @@ -52,7 +51,7 @@ public class DataSourceMigrationForVersion_4_0_RC4 extends AbstractObserveMigrat // See https://forge.codelutin.com/issues/7013 addScript("add-gear-data", queries); - + } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC4 { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java index 40c6a2f..4b23fa2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -43,16 +42,16 @@ public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObse super(AbstractDataSourceMigration.V_4_0_RC6, callBack, scriptSuffix); } - protected abstract void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaContextImplementor tx, List<String> queries); + protected abstract void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries); @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { // See https://forge.codelutin.com/issues/7145 - removeForeignKeyOnGearFseFeaturesMeasurementSeine(tx, queries); + removeForeignKeyOnGearFseFeaturesMeasurementSeine(topiaSqlSupport, queries); // See https://forge.codelutin.com/issues/7142 addScript("fix-gearUseFeatures-topiaIds", queries); @@ -67,7 +66,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObse } @Override - protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaContextImplementor tx, List<String> queries) { + protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries) { H2DataSourceMigration.removeFK(tx, "observe_seine", "GEARUSEFEATURESMEASUREMENT", "GEARUSEFEATURES", queries); @@ -82,7 +81,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObse } @Override - protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaContextImplementor tx, List<String> queries) { + protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries) { PGDataSourceMigration.removeFK(tx, "observe_seine", "GEARUSEFEATURESMEASUREMENT", "GEARUSEFEATURES", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java index b40aa09..0ebb072 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java @@ -26,8 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; - -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -44,7 +43,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC7 extends AbstractObse } @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java index f95777d..e0e9c44 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java @@ -21,13 +21,12 @@ */ package fr.ird.observe.entities.referentiel; +import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.util.Numbers; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaDao; import javax.script.Bindings; import javax.script.ScriptContext; @@ -165,16 +164,15 @@ public class LengthWeightParemeterHelper { } @SuppressWarnings({"unchecked"}) - public static <P extends LengthWeightParameter> List<P> findBySpecies(TopiaContextImplementor tx, + public static <P extends LengthWeightParameter> List<P> findBySpecies(ObserveTopiaPersistenceContext tx, Species taillePoidsAble) { // le type de resultat recherche Class<P> entityClass = (Class<P>) LengthWeightParameter.class; - TopiaDAO<P> dao = tx.getDAO(entityClass); + TopiaDao<P> dao = tx.getDao(entityClass); - List<P> list = dao.findAllByProperties( - LengthWeightParameter.PROPERTY_SPECIES, taillePoidsAble); + List<P> list = dao.forProperties(LengthWeightParameter.PROPERTY_SPECIES, taillePoidsAble).findAll(); // on supprime les paramétrages qui ont a=0 ou a=null ou b=0 ou b = null Iterator<P> itr = list.iterator(); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java similarity index 70% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java index 66ec481..e053ee8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java @@ -24,9 +24,8 @@ package fr.ird.observe.entities.referentiel; import fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceLocale; - -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaSQLQuery; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,20 +33,21 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -public class ProgramDAOImpl<E extends Program> extends ProgramDAOAbstract<E> { - public List<E> findAllStub(ReferenceLocale referenceLocale) { - List<E> result = StubSqlQuery.findAll(context, referenceLocale); +public class ProgramTopiaDao extends AbstractProgramTopiaDao<Program> { + + public List<Program> findAllStub(ReferenceLocale referenceLocale) { + List<Program> result = StubSqlQuery.findAll(topiaSqlSupport, referenceLocale); return result; } public Program findStubByTopiaId(String programId, ReferenceLocale referentielLocale) { - return StubSqlQuery.find(context, programId, referentielLocale); + return StubSqlQuery.find(topiaSqlSupport, programId, referentielLocale); } - private static class StubSqlQuery<E extends Program> extends TopiaSQLQuery<E> { + private static class StubSqlQuery extends TopiaSqlQuery<Program> { private final String sql; @@ -55,7 +55,7 @@ public class ProgramDAOImpl<E extends Program> extends ProgramDAOAbstract<E> { private final ReferenceLocale referenceLocale; - static <E extends Program> List<E> findAll(TopiaContextImplementor context, ReferenceLocale referenceLocale) { + static List<Program> findAll(TopiaSqlSupport topiaSqlSupport, ReferenceLocale referenceLocale) { String sql = "SELECT" + " p.topiaId," + @@ -64,12 +64,12 @@ public class ProgramDAOImpl<E extends Program> extends ProgramDAOAbstract<E> { " FROM observe_common.program p" + " ORDER BY p." + referenceLocale.getColumnName(); - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, null, referenceLocale); - return request.findMultipleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, null, referenceLocale); + return topiaSqlSupport.findMultipleResult(request); } - static <E extends Program> E find(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) { + static Program find(TopiaSqlSupport topiaSqlSupport, String tripId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " p.topiaId," + @@ -80,8 +80,8 @@ public class ProgramDAOImpl<E extends Program> extends ProgramDAOAbstract<E> { " p.topiaId = ?" + " ORDER BY p." + referenceLocale.getColumnName(); - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, tripId, referenceLocale); - return request.findSingleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, tripId, referenceLocale); + return topiaSqlSupport.findSingleResult(request); } @@ -92,7 +92,7 @@ public class ProgramDAOImpl<E extends Program> extends ProgramDAOAbstract<E> { } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); if (id != null) { preparedStatement.setString(1, id); @@ -101,9 +101,9 @@ public class ProgramDAOImpl<E extends Program> extends ProgramDAOAbstract<E> { } @Override - protected E prepareResult(ResultSet set) throws SQLException { + public Program prepareResult(ResultSet set) throws SQLException { - E program = (E) new ProgramImpl(); + Program program = new ProgramImpl(); program.setTopiaId(set.getString(1)); int gearTypeOrdinal = set.getInt(2); diff --git a/observe-entities/src/main/java/fr/ird/observe/util/DBHelper.java b/observe-entities/src/main/java/fr/ird/observe/util/DBHelper.java index 4a36f15..c3440f6 100644 --- a/observe-entities/src/main/java/fr/ird/observe/util/DBHelper.java +++ b/observe-entities/src/main/java/fr/ird/observe/util/DBHelper.java @@ -26,7 +26,7 @@ import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.Entities; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityAbstract; @@ -54,7 +54,7 @@ public class DBHelper { entity.setTopiaContext(ctxt); } } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + throw new TopiaException(e); } } diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java index 228fa7c..cb8de02 100644 --- a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java @@ -22,16 +22,19 @@ public abstract class ObserveDataSourceConfigurationTopiaSupport implements Obse */ protected char[] password; + //FIXME deplacer ça dans l'objet de création ou d'ouverture de base /** * Est-ce que la base doit être migrée à son ouverture? */ protected boolean canMigrate; + //FIXME deplacer ça dans l'objet de création ou d'ouverture de base /** * Est-ce que l'on peut voir la progression lors d'une migration ? */ protected boolean showMigrationProgression; + //FIXME deplacer ça dans l'objet de création ou d'ouverture de base /** * Est-ce que l'on peut voir le script sql de migration à appliquer ? */ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm