branch feature/8089-topia3-migration created (now 9aa9e26)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8089-topia3-migration in repository echobase. See http://git.codelutin.com/echobase.git at 9aa9e26 refs: #8089: Migrate to ToPIA 3.0 This branch includes the following new commits: new 9aa9e26 refs: #8089: Migrate to ToPIA 3.0 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 9aa9e26e8cf1752f40c8087f545062ad1d8b3e0a Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 9 13:46:51 2016 +0100 refs: #8089: Migrate to ToPIA 3.0 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8089-topia3-migration in repository echobase. See http://git.codelutin.com/echobase.git commit 9aa9e26e8cf1752f40c8087f545062ad1d8b3e0a Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 9 13:46:51 2016 +0100 refs: #8089: Migrate to ToPIA 3.0 --- .../echobase/entities/AbstractEchoBaseDao.java | 5 ++- .../EchoBaseUserTopiaApplicationContext.java | 2 +- .../echobase/entities/EchoBaseUserTopiaDao.java | 10 +++--- .../EchoBaseUserTopiaPersistenceContext.java | 7 ++-- .../echobase/entities/data/EchotypeTopiaDao.java | 1 - .../echobase/persistence/EchoBaseEntityHelper.java | 31 ++++++++-------- .../persistence/EchoBasePersistenceHelper.java | 18 +++------- .../echobase/persistence/JdbcConfiguration.java | 20 +++++------ .../EchoBaseMigrationCallBackResolver.java | 23 ++++++------ .../internalDb/MigrationCallBackForVersion.java | 3 +- .../internalDb/MigrationCallBackForVersion2_2.java | 29 ++++++++------- .../migration/internalDb/MigrationCallback.java | 18 ++++------ .../workingDb/MigrationCallBackForVersion.java | 2 +- .../workingDb/MigrationCallBackForVersion2_2.java | 14 ++++---- .../MigrationCallBackForVersion2_5_1.java | 8 +++-- .../workingDb/MigrationCallBackForVersion2_6.java | 33 +++++++++-------- .../MigrationCallBackForVersion2_6_1.java | 15 ++++---- .../MigrationCallBackForVersion2_7_2.java | 15 ++++---- .../migration/workingDb/MigrationCallback.java | 11 ++---- .../main/resources/echobase-internaldb.properties | 3 -- .../main/resources/echobase-workingdb.properties | 3 -- .../echobase/services/service/DbEditorService.java | 5 ++- .../echobase/services/service/UserService.java | 15 ++++++-- .../EmbeddedApplicationService.java | 2 +- .../services/service/exportdb/ExportDbService.java | 41 ++++++++++++---------- .../services/FakeEchoBaseServiceContext.java | 4 +-- .../removedata/AbstractRemoveDataServiceTest.java | 2 +- pom.xml | 4 +-- 28 files changed, 172 insertions(+), 172 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java index 0c2128d..44f5552 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java @@ -24,7 +24,6 @@ package fr.ifremer.echobase.entities; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaNoResultException; import org.nuiton.topia.persistence.internal.AbstractTopiaDao; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.util.List; import java.util.Map; @@ -53,7 +52,7 @@ public abstract class AbstractEchoBaseDao<E extends TopiaEntity> extends Abstrac } @Override - public <K> List<K> find(String hql, Map<String, Object> hqlParameters, TopiaPagerBean pager) { - return super.find(hql, hqlParameters, pager); + public <K> List<K> find(String hql, Map<String, Object> hqlParameters, int startIndex, int endIndex) { + return super.find(hql, hqlParameters, startIndex, endIndex); } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java index 5f694cc..9659d46 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java @@ -127,7 +127,7 @@ public class EchoBaseUserTopiaApplicationContext extends AbstractEchoBaseUserTop } finally { - persistenceContext.closeContext(); + persistenceContext.close(); } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java index e4fad64..a6b91c7 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java @@ -20,14 +20,14 @@ */ package fr.ifremer.echobase.entities; -import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; - import java.util.List; -public class EchoBaseUserTopiaDao extends AbstractEchoBaseUserTopiaDao<EchoBaseUser> { +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.util.pagination.PaginationParameter; + +public abstract class EchoBaseUserTopiaDao extends GeneratedEchoBaseUserTopiaDao<EchoBaseUser> { - public List<EchoBaseUser> findAll(TopiaPagerBean pager) throws TopiaException { + public List<EchoBaseUser> findAll(PaginationParameter pager) throws TopiaException { List<EchoBaseUser> users; if (pager == null) { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java index d09114d..653f375 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java @@ -23,9 +23,10 @@ package fr.ifremer.echobase.entities; import org.hibernate.cfg.Environment; import org.nuiton.topia.persistence.TopiaIdFactory; +import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContextConstructorParameter; import org.nuiton.topia.persistence.internal.HibernateProvider; import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; -import org.nuiton.topia.persistence.support.TopiaListenableSupport; +import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; public class EchoBaseUserTopiaPersistenceContext extends AbstractEchoBaseUserTopiaPersistenceContext { @@ -43,8 +44,8 @@ public class EchoBaseUserTopiaPersistenceContext extends AbstractEchoBaseUserTop */ protected boolean spatialStructureFound; - public EchoBaseUserTopiaPersistenceContext(HibernateProvider hibernateProvider, TopiaListenableSupport listenableSupport, TopiaIdFactory topiaIdFactory, TopiaHibernateSessionRegistry sessionRegistry) { - super(hibernateProvider, listenableSupport, topiaIdFactory, sessionRegistry); + public EchoBaseUserTopiaPersistenceContext(AbstractTopiaPersistenceContextConstructorParameter newContextParams) { + super(newContextParams); } @Override diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java index 88a1c6c..85f9b57 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java @@ -33,7 +33,6 @@ import java.util.List; */ public class EchotypeTopiaDao extends GeneratedEchotypeTopiaDao<Echotype> { - @Override public Echotype findByIdAndSpecies(Integer id, Species species) throws TopiaException { List<Echotype> allById = forIdEquals(id).findAll(); diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java index d244b57..8197031 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java @@ -1,5 +1,17 @@ package fr.ifremer.echobase.persistence; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Transaction; +import org.nuiton.topia.persistence.TopiaApplicationContext; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext; + /* * #%L * EchoBase :: Domain @@ -22,23 +34,12 @@ package fr.ifremer.echobase.persistence; */ import com.google.common.base.Preconditions; + import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.entities.EchoBaseInternalTopiaApplicationContext; import fr.ifremer.echobase.entities.EchoBaseUserImpl; import fr.ifremer.echobase.entities.EchoBaseUserTopiaApplicationContext; import fr.ifremer.echobase.entities.data.VoyageImpl; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.hibernate.Transaction; -import org.hibernate.cfg.Environment; -import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext; -import org.nuiton.topia.persistence.TopiaApplicationContext; -import org.nuiton.topia.persistence.TopiaException; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; /** * helper about topia context and jdbc connections. @@ -55,7 +56,7 @@ public class EchoBaseEntityHelper { if (log.isInfoEnabled()) { log.info("release database " + - context.getConfiguration().get(Environment.URL)); + context.getConfiguration().getJdbcConnectionUrl()); } try { releaseContext(context); @@ -70,7 +71,7 @@ public class EchoBaseEntityHelper { public static void releaseContext(TopiaApplicationContext rootContext) throws TopiaException { if (rootContext != null && !rootContext.isClosed()) { - rootContext.closeContext(); + rootContext.close(); } } @@ -162,7 +163,7 @@ public class EchoBaseEntityHelper { } tx.rollback(); } - transaction.closeContext(); + transaction.close(); } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java index 0b9c227..428e2ff 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java @@ -1,5 +1,8 @@ package fr.ifremer.echobase.persistence; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityEnumProvider; + /* * #%L * EchoBase :: Domain @@ -22,31 +25,18 @@ package fr.ifremer.echobase.persistence; */ import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaPersistenceHelper; /** * Persistence helper for working db. * * @author Tony Chemit - chemit@codelutin.com - * @see TopiaPersistenceHelper * @since 1.1 */ -public class EchoBasePersistenceHelper implements TopiaPersistenceHelper<EchoBaseUserEntityEnum> { +public class EchoBasePersistenceHelper implements TopiaEntityEnumProvider<EchoBaseUserEntityEnum> { @Override public <E extends TopiaEntity> EchoBaseUserEntityEnum getEntityEnum(Class<E> type) { return EchoBaseUserEntityEnum.valueOf(type); } -// @Override -// public <E extends TopiaEntity> TopiaDAO<E> getDAO(TopiaContext tx, Class<E> type) { -// return EchoBaseDAOHelper.<E, TopiaDAO<E>>getDAO(tx, type); -// } -// -// @Override -// public <E extends TopiaEntity> TopiaDAO<E> getDAO(TopiaContext tx, EchoBaseEntityEnum type) { -// return (TopiaDAO<E>) getDAO(tx, type.getContract()); -// } - } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java index c4458dc..a3aaac4 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java @@ -20,23 +20,23 @@ */ package fr.ifremer.echobase.persistence; -import com.google.common.collect.ImmutableMap; -import fr.ifremer.echobase.entities.DriverType; -import org.hibernate.cfg.Environment; -import org.nuiton.topia.persistence.TopiaApplicationContext; - import java.io.File; import java.io.Serializable; +import org.nuiton.topia.persistence.TopiaApplicationContext; +import org.nuiton.topia.persistence.TopiaConfiguration; + +import fr.ifremer.echobase.entities.DriverType; + public class JdbcConfiguration implements Serializable { public static JdbcConfiguration newConfig(TopiaApplicationContext context) { - ImmutableMap config = context.getConfiguration(); + TopiaConfiguration config = context.getConfiguration(); JdbcConfiguration result = new JdbcConfiguration(); - result.setDriverType(DriverType.valueOfDriverName((String) config.get(Environment.DRIVER))); - result.setUrl((String) config.get(Environment.URL)); - result.setLogin((String) config.get(Environment.USER)); - result.setPassword((String) config.get(Environment.PASS)); + result.setDriverType(DriverType.valueOfDriverName((String) config.getJdbcDriverClass().getName())); + result.setUrl((String) config.getJdbcConnectionUrl()); + result.setLogin((String) config.getJdbcConnectionUser()); + result.setPassword((String) config.getJdbcConnectionPassword()); return result; } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java index 47d42c2..8307605 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java @@ -1,5 +1,15 @@ package fr.ifremer.echobase.persistence.migration; +import java.util.Map; +import java.util.ServiceLoader; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.VersionComparator; + /* * #%L * EchoBase :: Domain @@ -22,15 +32,6 @@ package fr.ifremer.echobase.persistence.migration; */ import com.google.common.collect.Maps; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; - -import java.util.Map; -import java.util.ServiceLoader; -import java.util.Set; /** * Migration callBack resolver using service loader to discover version to @@ -45,7 +46,7 @@ public class EchoBaseMigrationCallBackResolver<C extends TopiaMigrationCallbackB private static final Log log = LogFactory.getLog(EchoBaseMigrationCallBackResolver.class); - public static <C extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion<?>> EchoBaseMigrationCallBackResolver<C> newResolver(Class<C> resolverType) { + public static <C extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion> EchoBaseMigrationCallBackResolver<C> newResolver(Class<C> resolverType) { return new EchoBaseMigrationCallBackResolver<C>(resolverType); } @@ -53,7 +54,7 @@ public class EchoBaseMigrationCallBackResolver<C extends TopiaMigrationCallbackB protected EchoBaseMigrationCallBackResolver(Class<C> migrationType) { this.versionMigrationMapping = Maps.newTreeMap( - new VersionUtil.VersionComparator()); + new VersionComparator()); for (C callBackForVersion : ServiceLoader.load(migrationType)) { Version version = callBackForVersion.getVersion(); if (log.isInfoEnabled()) { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java index 6f776c8..0f55a69 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java @@ -21,7 +21,6 @@ package fr.ifremer.echobase.persistence.migration.internalDb; * #L% */ -import fr.ifremer.echobase.entities.EchoBaseInternalTopiaPersistenceContext; import fr.ifremer.echobase.io.EchoBaseIOUtil; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; @@ -33,7 +32,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ -public abstract class MigrationCallBackForVersion extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion<EchoBaseInternalTopiaPersistenceContext> { +public abstract class MigrationCallBackForVersion extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { protected void addScript(String script, List<String> queries) { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java index ecdcd13..ec04a6b 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java @@ -1,5 +1,17 @@ package fr.ifremer.echobase.persistence.migration.internalDb; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.List; + +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; + /* * #%L * EchoBase :: Domain @@ -21,20 +33,9 @@ package fr.ifremer.echobase.persistence.migration.internalDb; * #L% */ -import fr.ifremer.echobase.entities.EchoBaseInternalTopiaPersistenceContext; import fr.ifremer.echobase.entities.ExportQueries; import fr.ifremer.echobase.entities.ExportQuery; import fr.ifremer.echobase.entities.ExportQueryImpl; -import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.support.TopiaSqlQuery; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; -import org.nuiton.util.Version; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; /** * Migrate internal db to version {@code 2.2}. @@ -45,20 +46,18 @@ import java.util.List; public class MigrationCallBackForVersion2_2 extends MigrationCallBackForVersion { @Override public Version getVersion() { - return new Version("2.2"); + return Versions.valueOf("2.2"); } public static final String EXPORT_QUERY_UPDATE = "UPDATE exportquery SET name = '%s', topiaversion = topiaversion + 1 WHERE topiaid = '%s'"; @Override - protected void prepareMigrationScript(EchoBaseInternalTopiaPersistenceContext tx, + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { - TopiaSqlSupport sqlSupport = tx.getSqlSupport(); - // normalize queries names (http://forge.codelutin.com/issues/2875) normalizeExportQueryNames(sqlSupport, queries); diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java index 8adc25d..0d4135b 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java @@ -1,5 +1,10 @@ package fr.ifremer.echobase.persistence.migration.internalDb; +import java.util.List; + +import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; +import org.nuiton.util.version.Version; + /* * #%L * EchoBase :: Domain @@ -21,13 +26,7 @@ package fr.ifremer.echobase.persistence.migration.internalDb; * #L% */ -import fr.ifremer.echobase.entities.EchoBaseInternalTopiaPersistenceContext; import fr.ifremer.echobase.persistence.migration.EchoBaseMigrationCallBackResolver; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; - -import java.util.List; /** * EchoBase Migration callback for internal db. @@ -35,7 +34,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ -public class MigrationCallback extends TopiaMigrationCallbackByClassNG<EchoBaseInternalTopiaPersistenceContext> { +public class MigrationCallback extends TopiaMigrationCallbackByClassNG { public MigrationCallback() { super(EchoBaseMigrationCallBackResolver.newResolver( @@ -46,9 +45,4 @@ public class MigrationCallback extends TopiaMigrationCallbackByClassNG<EchoBaseI public boolean askUser(Version version, List<Version> versions) { return true; } - - @Override - protected TopiaSqlSupport getSqlSupport(EchoBaseInternalTopiaPersistenceContext persistenceContext) { - return persistenceContext.getSqlSupport(); - } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java index b29da47..51bbfee 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java @@ -33,7 +33,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ -public abstract class MigrationCallBackForVersion extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion<EchoBaseUserTopiaPersistenceContext> { +public abstract class MigrationCallBackForVersion extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { protected void addScript(String script, List<String> queries) { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java index 219e478..b2a1c8f 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java @@ -25,7 +25,9 @@ import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.util.Version; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.util.List; @@ -42,11 +44,11 @@ public class MigrationCallBackForVersion2_2 extends MigrationCallBackForVersion @Override public Version getVersion() { - return new Version("2.2"); + return Versions.valueOf("2.2"); } @Override - protected void prepareMigrationScript(EchoBaseUserTopiaPersistenceContext tx, + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { @@ -58,7 +60,7 @@ public class MigrationCallBackForVersion2_2 extends MigrationCallBackForVersion migrateImportTypeId(queries); // compute all spatial data (http://forge.codelutin.com/issues/3037) - updatePostgis(tx); + updatePostgis(sqlSupport); } protected void migrateImportTypeId(List<String> queries) { @@ -69,14 +71,14 @@ public class MigrationCallBackForVersion2_2 extends MigrationCallBackForVersion queries.add("ALTER TABLE Result ALTER COLUMN category DROP NOT NULL;"); } - protected void updatePostgis(EchoBaseUserTopiaPersistenceContext tx) { + protected void updatePostgis(TopiaSqlSupport sqlSupport) { boolean spatialAware = tx.isSpatialStructureFound(); try { if (spatialAware) { try { // compute all spatial data - tx.getSqlSupport().executeSql("SELECT echobase_compute_all_spatial_data();"); + sqlSupport.executeSql("SELECT echobase_compute_all_spatial_data();"); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not update spatial datas", e); diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java index 04840aa..fd34919 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java @@ -23,7 +23,9 @@ package fr.ifremer.echobase.persistence.migration.workingDb; import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.util.Version; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.util.List; @@ -37,11 +39,11 @@ public class MigrationCallBackForVersion2_5_1 extends MigrationCallBackForVersio @Override public Version getVersion() { - return new Version("2.5.1"); + return Versions.valueOf("2.5.1"); } @Override - protected void prepareMigrationScript(EchoBaseUserTopiaPersistenceContext tx, + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java index ee710f9..ba3f46d 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java @@ -1,5 +1,17 @@ package fr.ifremer.echobase.persistence.migration.workingDb; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.List; + +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; + /* * #%L * EchoBase :: Domain @@ -22,15 +34,6 @@ package fr.ifremer.echobase.persistence.migration.workingDb; */ import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; -import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.support.TopiaSqlQuery; -import org.nuiton.util.Version; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; /** * Created on 2/26/14. @@ -42,11 +45,11 @@ public class MigrationCallBackForVersion2_6 extends MigrationCallBackForVersion @Override public Version getVersion() { - return new Version("2.6"); + return Versions.valueOf("2.6"); } @Override - protected void prepareMigrationScript(EchoBaseUserTopiaPersistenceContext tx, + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { @@ -67,22 +70,22 @@ public class MigrationCallBackForVersion2_6 extends MigrationCallBackForVersion addScript("2.6-0-postgis-view.sql", queries); } - protected void updateDataMedataReferential(EchoBaseUserTopiaPersistenceContext tx, List<String> queries) { + protected void updateDataMedataReferential(TopiaSqlSupport sqlSupport, List<String> queries) { String dataId; - dataId = tx.getSqlSupport().findSingleResult(new GetdataMetadataSqlQuery("meanMapcellBiomass")); + dataId = sqlSupport.findSingleResult(new GetdataMetadataSqlQuery("meanMapcellBiomass")); if (dataId == null) { // add it queries.add("INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965290', 0, '2014-02-27 17:01:48.355', 0.0, 'Mean biomass averaged in a grid map cell using a block averaging procedure', 0, 'Mean biomass in map cell', 'meanMapcellBiomass', 1.0, 'tons', 999999999, 0);"); } - dataId = tx.getSqlSupport().findSingleResult(new GetdataMetadataSqlQuery("stdevMapcellBiomass")); + dataId = sqlSupport.findSingleResult(new GetdataMetadataSqlQuery("stdevMapcellBiomass")); if (dataId == null) { // add it queries.add("INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965291', 0, '2014-02-27 17:01:48.355', 0.0, 'Biomass standard deviation in a grid map cell produced from a block averaging procedure', 0, 'Biomass standard deviation in map cell', 'stdevMapcellBiomass', 1.0, 'tons', 999999999, 0);"); } - dataId = tx.getSqlSupport().findSingleResult(new GetdataMetadataSqlQuery("NsampleMapcell")); + dataId = sqlSupport.findSingleResult(new GetdataMetadataSqlQuery("NsampleMapcell")); if (dataId == null) { // add it queries.add("INSERT INTO datametadata (topiaId,topiaversion, topiacreatedate, addOffset, comment, fillValue, longName, name, scaleFactor, units, validMax, validMin) VALUES('fr.ifremer.echobase.entities.references.DataMetadata#4443610280597#0.9322615025965292', 0, '2014-02-27 17:01:48.355', 0.0, 'No. of data samples in a grid map cell in a block averaging procedure', 0, 'No. of samples in map cell', 'NsampleMapcell', 1.0, 'tons', 999999999, 0);"); diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java index bb93b25..1dc321f 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java @@ -1,5 +1,12 @@ package fr.ifremer.echobase.persistence.migration.workingDb; +import java.util.List; + +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; + /* * #%L * EchoBase :: Domain @@ -22,10 +29,6 @@ package fr.ifremer.echobase.persistence.migration.workingDb; */ import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; -import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.util.Version; - -import java.util.List; /** * Created on 4/16/14. @@ -37,11 +40,11 @@ public class MigrationCallBackForVersion2_6_1 extends MigrationCallBackForVersio @Override public Version getVersion() { - return new Version("2.6.1"); + return Versions.valueOf("2.6.1"); } @Override - protected void prepareMigrationScript(EchoBaseUserTopiaPersistenceContext tx, + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java index 97d91a3..a1ee642 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java @@ -1,5 +1,12 @@ package fr.ifremer.echobase.persistence.migration.workingDb; +import java.util.List; + +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; + /* * #%L * EchoBase :: Domain @@ -22,10 +29,6 @@ package fr.ifremer.echobase.persistence.migration.workingDb; */ import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; -import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.util.Version; - -import java.util.List; /** * Created on 12/16/14. @@ -37,11 +40,11 @@ public class MigrationCallBackForVersion2_7_2 extends MigrationCallBackForVersio @Override public Version getVersion() { - return new Version("2.7.2"); + return Versions.valueOf("2.7.2"); } @Override - protected void prepareMigrationScript(EchoBaseUserTopiaPersistenceContext tx, + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java index d0fc3f8..69cc2b5 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java @@ -21,11 +21,9 @@ package fr.ifremer.echobase.persistence.migration.workingDb; * #L% */ -import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; import fr.ifremer.echobase.persistence.migration.EchoBaseMigrationCallBackResolver; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import java.util.List; @@ -35,7 +33,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ -public class MigrationCallback extends TopiaMigrationCallbackByClassNG<EchoBaseUserTopiaPersistenceContext> { +public class MigrationCallback extends TopiaMigrationCallbackByClassNG { public MigrationCallback() { super(EchoBaseMigrationCallBackResolver.newResolver( @@ -46,9 +44,4 @@ public class MigrationCallback extends TopiaMigrationCallbackByClassNG<EchoBaseU public boolean askUser(Version version, List<Version> versions) { return true; } - - @Override - protected TopiaSqlSupport getSqlSupport(EchoBaseUserTopiaPersistenceContext persistenceContext) { - return persistenceContext.getSqlSupport(); - } } diff --git a/echobase-domain/src/main/resources/echobase-internaldb.properties b/echobase-domain/src/main/resources/echobase-internaldb.properties index 418acd7..a48c96e 100644 --- a/echobase-domain/src/main/resources/echobase-internaldb.properties +++ b/echobase-domain/src/main/resources/echobase-internaldb.properties @@ -27,9 +27,6 @@ hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:${echobase.internal.db.directory}/echobase-user -# Never create/update schema (will do it by logic) -hibernate.hbm2ddl.auto=none - # To custom sql in logger hibernate.show_sql=false hibernate.format_sql=false diff --git a/echobase-domain/src/main/resources/echobase-workingdb.properties b/echobase-domain/src/main/resources/echobase-workingdb.properties index 9d5044e..a94742c 100644 --- a/echobase-domain/src/main/resources/echobase-workingdb.properties +++ b/echobase-domain/src/main/resources/echobase-workingdb.properties @@ -27,9 +27,6 @@ hibernate.connection.driver_class=${configuration.driver} hibernate.dialect=${configuration.dialect} hibernate.connection.provider_class=org.nuiton.topia.persistence.internal.TopiaConnectionProvider -# Never create/update schema (will do it by logic) -hibernate.hbm2ddl.auto=none - # To custom sql in logger hibernate.show_sql=false hibernate.format_sql=false diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java index ba61704..011d43e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java @@ -56,6 +56,7 @@ import org.nuiton.topia.service.csv.EntityCsvModel; import org.nuiton.util.PagerBeanUtil; import org.nuiton.util.beans.BeanMonitor; import org.nuiton.util.beans.PropertyDiff; +import org.nuiton.util.pagination.PaginationParameter; import javax.inject.Inject; import java.math.BigDecimal; @@ -165,7 +166,9 @@ public class DbEditorService extends EchoBaseServiceSupport { PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); } - List<E> result = dao.find(hql, hqlParameters, pager); + //FIXME echatellier 20160309 use proper paginationparameter everywhere + PaginationParameter param = PaginationParameter.of(pager.getPageIndex(), pager.getPageSize()); + List<E> result = dao.find(hql, hqlParameters, param.getStartIndex(), param.getEndIndex()); return result; } catch (TopiaException eee) { throw new EchoBaseTechnicalException("Could not obtain data", eee); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java index 0cef03b..df2e368 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java @@ -29,7 +29,9 @@ import fr.ifremer.echobase.services.EchoBaseServiceSupport; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.PagerBean; import org.nuiton.util.StringUtil; +import org.nuiton.util.pagination.PaginationParameter; import javax.inject.Inject; import java.util.List; @@ -52,10 +54,19 @@ public class UserService extends EchoBaseServiceSupport { EchoBaseInternalPersistenceContext echoBaseInternalPersistenceContext; public List<EchoBaseUser> getUsers() { - return getUsers(null); + return getUsers((PaginationParameter)null); } - public List<EchoBaseUser> getUsers(TopiaPagerBean pager) { + /** + * @since 3.0, prefer using PaginationParameter param + */ + @Deprecated + public List<EchoBaseUser> getUsers(PagerBean pager) { + PaginationParameter param = PaginationParameter.of(pager.getPageIndex(), pager.getPageSize()); + return getUsers(param); + } + + public List<EchoBaseUser> getUsers(PaginationParameter pager) { try { EchoBaseUserTopiaDao dao = getDao(); List<EchoBaseUser> users = dao.findAll(pager); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java index 2f6e853..398afc3 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java @@ -317,7 +317,7 @@ public class EmbeddedApplicationService extends EchoBaseServiceSupport { throw eee; } finally { serviceContext.setEchoBaseUserPersistenceContext(persistenceContext); - newPersistenceContext.closeContext(); + newPersistenceContext.close(); } File exportZipFile = exportconfiguration.getExportFile(); if (log.isInfoEnabled()) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java index dda9eae..7a1480a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java @@ -20,21 +20,19 @@ */ package fr.ifremer.echobase.services.service.exportdb; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.io.EchoBaseIOUtil; -import fr.ifremer.echobase.persistence.EchoBaseDbMeta; -import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.service.UserDbPersistenceService; +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.inject.Inject; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.TopiaPersistenceHelper; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.TableMeta; import org.nuiton.topia.service.csv.out.ExportEntityVisitor; @@ -42,13 +40,18 @@ import org.nuiton.topia.service.csv.out.TopiaCsvExports; import org.nuiton.util.FileUtil; import org.nuiton.util.TimeLog; -import javax.inject.Inject; -import java.io.File; -import java.io.IOException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; + +import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.io.EchoBaseIOUtil; +import fr.ifremer.echobase.persistence.EchoBaseDbMeta; +import fr.ifremer.echobase.persistence.EchoBasePersistenceHelper; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.service.UserDbPersistenceService; /** * Service to import / export a complete db. @@ -214,7 +217,7 @@ public class ExportDbService extends EchoBaseServiceSupport { protected final Set<String> categoryIds; - public ReplicateEntityVisitor(TopiaPersistenceHelper<EchoBaseUserEntityEnum> typeProvider, + public ReplicateEntityVisitor(EchoBasePersistenceHelper typeProvider, Map<EchoBaseUserEntityEnum, TopiaCsvExports.EntityExportContext<EchoBaseUserEntityEnum>> entityExporters) { super(typeProvider, entityExporters); categoryIds = Sets.newHashSet(); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java index 7b8a3e0..45846fa 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java @@ -158,7 +158,7 @@ public class FakeEchoBaseServiceContext extends TestWatcher implements EchoBaseS protected void finished(Description description) { super.finished(description); if (echoBaseTopiaApplicationContext != null && !echoBaseTopiaApplicationContext.isClosed()) { - echoBaseTopiaApplicationContext.closeContext(); + echoBaseTopiaApplicationContext.close(); } } @@ -197,7 +197,7 @@ public class FakeEchoBaseServiceContext extends TestWatcher implements EchoBaseS @Override public String getUserDbUrl() { - String result = echoBaseTopiaApplicationContext.getConfiguration().get(TopiaConfigurationConstants.CONFIG_URL); + String result = echoBaseTopiaApplicationContext.getConfiguration().getJdbcConnectionUrl(); return result; } diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java index 521a368..f3f0d7b 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java @@ -371,7 +371,7 @@ public abstract class AbstractRemoveDataServiceTest extends EchoBaseTestServiceS TopiaIdFactory topiaIdFactory = persistenceContext.getTopiaIdFactory(); Class entityType = topiaIdFactory.getClassName(id); TopiaDao<E> dao = persistenceContext.getDao(entityType); - E entity = dao.forTopiaIdEquals(id).findAnyOrNull(); + E entity = dao.forTopiaIdEquals(id).findUniqueOrNull(); return entity; } diff --git a/pom.xml b/pom.xml index b0a7e42..19d4943 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ <!-- libraries version --> - <topiaVersion>3.0-beta-3</topiaVersion> + <topiaVersion>3.0</topiaVersion> <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonWebVersion>1.16</nuitonWebVersion> @@ -463,7 +463,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>2.8</version> + <version>2.13</version> <dependencies> <dependency> <groupId>org.nuiton.topia</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm