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 4054f01cbc33a410a7afb6b7d6494417cb3bc30d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 21 12:16:38 2015 +0200 Refacotr module entite --- .../db/impl/AbstractDataSourceProvider.java | 1 - .../src/main/java/fr/ird/observe/util/Scripts.java | 30 +---- .../test/java/fr/ird/observe/db/DBTestHelper.java | 29 ++++- .../java/fr/ird/observe/db/DataServiceTest.java | 3 +- .../observe/db/impl/H2DataSourceConfigTest.java | 3 +- .../observe/db/impl/PGDataSourceConfigTest.java | 4 +- .../fr/ird/observe/its/DataSourceFactoryIT.java | 2 +- .../test/java/fr/ird/observe/its/PGInstallIT.java | 3 +- .../java/fr/ird/observe/its/RestoreEmptyPGIT.java | 3 +- .../its/migration/AbstractMigrationTest.java | 5 +- .../its/migration/PGDataSourceMigrationIT.java | 3 +- .../h2ToLast/AbstractH2MigrationToLastIT.java | 3 +- .../ird/observe/its/report/AbstractReportIT.java | 3 +- .../java/fr/ird/observe/entities/Entities.java | 13 +-- ...eDAOImpl.java => ActivityLonglineTopiaDao.java} | 35 +++--- .../entities/longline/SectionWithTemplateImpl.java | 6 +- ...glineDAOImpl.java => TripLonglineTopiaDao.java} | 122 ++++++++++----------- .../migration/AbstractDataSourceMigration.java | 1 + .../main/java/fr/ird/observe/util/DBHelper.java | 75 ------------- .../LengthWeightParemeterHelperTest.java | 3 +- .../{DBHelperTest.java => util/NumbersTest.java} | 51 +-------- 21 files changed, 133 insertions(+), 265 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSourceProvider.java b/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSourceProvider.java index bddcbd4..5c739e6 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSourceProvider.java +++ b/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSourceProvider.java @@ -22,7 +22,6 @@ package fr.ird.observe.db.impl; import com.google.common.base.Preconditions; -import fr.ird.observe.util.DBHelper; import fr.ird.observe.IObserveConfig; import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.db.DataSource; diff --git a/observe-entities/src/main/java/fr/ird/observe/util/Scripts.java b/observe-business/src/main/java/fr/ird/observe/util/Scripts.java similarity index 85% rename from observe-entities/src/main/java/fr/ird/observe/util/Scripts.java rename to observe-business/src/main/java/fr/ird/observe/util/Scripts.java index 012cc47..8d620da 100644 --- a/observe-entities/src/main/java/fr/ird/observe/util/Scripts.java +++ b/observe-business/src/main/java/fr/ird/observe/util/Scripts.java @@ -22,11 +22,9 @@ package fr.ird.observe.util; * #L% */ -import fr.ird.observe.ObserveDAOHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.version.Version; -import org.nuiton.util.version.Versions; import java.io.BufferedReader; import java.io.IOException; @@ -54,8 +52,6 @@ public class Scripts { public static final String REFERENTIEL_SCRIPT = "referentiel"; - public static final Version V_LAST = Versions.valueOf(ObserveDAOHelper.getModelVersion()); - public static final String FULL_SCRIPT = "referentiel-data"; public static void loadScript(Connection connection, @@ -79,7 +75,7 @@ public class Scripts { public static int loadScriptContent(String scriptName, StringBuilder out) throws IOException { - InputStream stream = DBHelper.class.getResourceAsStream(scriptName); + InputStream stream = Scripts.class.getResourceAsStream(scriptName); return loadScriptContent(stream, out); } @@ -144,28 +140,12 @@ public class Scripts { // } // } - public static String getLastObstunaScript() { - return getObstunaScript(V_LAST); - } - - public static String getObstunaScript(Version version) { - String result = String.format( - OBSTUNA_SCRIPT_PATTERN, - version.toString(), - "" - ); - if (log.isInfoEnabled()) { - log.info(result); - } - return result; - } - public static URL getBackupScriptURL(Version version, String pattern) { String path = getBackupScript(version, pattern); if (log.isInfoEnabled()) { log.info("script = " + path); } - URL result = DBHelper.class.getResource(path); + URL result = Scripts.class.getResource(path); return result; } @@ -182,11 +162,7 @@ public class Scripts { } public static URL getLastReferentielBackup() { - - URL url = getBackupScriptURL( - V_LAST, - REFERENTIEL_SCRIPT - ); + URL url = getBackupScriptURL(DBTestHelper.V_LAST, REFERENTIEL_SCRIPT); return url; } } diff --git a/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java b/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java index 6c03398..88024c1 100644 --- a/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java +++ b/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java @@ -41,10 +41,11 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.jdbc.Work; import org.junit.Assert; import org.junit.Assume; - import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.io.File; import java.io.IOException; @@ -68,6 +69,8 @@ public class DBTestHelper { /** Logger */ private static final Log log = LogFactory.getLog(DBTestHelper.class); + public static final Version V_LAST = Versions.valueOf(ObserveDAOHelper.getModelVersion()); + public static boolean canUsePG; public static Class<?> testClass; @@ -285,7 +288,7 @@ public class DBTestHelper { service + "] n'est pas ouvert."); } - String scriptName = Scripts.getObstunaScript(version); + String scriptName = getObstunaScript(version); if (log.isInfoEnabled()) { log.info("load script : " + scriptName); @@ -391,7 +394,7 @@ public class DBTestHelper { PGDataSourceConfig config = createPGConfig(name, false, true, true); - Version lastVersion = Scripts.V_LAST; + Version lastVersion = V_LAST; TestHelper.setConfig(IObserveConfig.DB_VERSION, lastVersion.toString()); @@ -533,7 +536,7 @@ public class DBTestHelper { TestHelper.initTest(testClass); TestHelper.createApplicationContext(); TestHelper.setConfig(IObserveConfig.DB_VERSION, - Scripts.V_LAST.toString()); + V_LAST.toString()); canUsePG = false; @@ -558,6 +561,22 @@ public class DBTestHelper { Assume.assumeTrue(canUsePG); } + public static String getLastObstunaScript() { + return getObstunaScript(V_LAST); + } + + public static String getObstunaScript(Version version) { + String result = String.format( + Scripts.OBSTUNA_SCRIPT_PATTERN, + version.toString(), + "" + ); + if (log.isInfoEnabled()) { + log.info(result); + } + return result; + } + /** * Pour installer une base obstuna a partir d'un script. * <p/> @@ -574,7 +593,7 @@ public class DBTestHelper { @Override public void execute() throws Exception { - String scriptName = Scripts.getLastObstunaScript(); + String scriptName = getLastObstunaScript(); URL script = getClass().getResource(scriptName); diff --git a/observe-business/src/test/java/fr/ird/observe/db/DataServiceTest.java b/observe-business/src/test/java/fr/ird/observe/db/DataServiceTest.java index d720a02..60cd158 100644 --- a/observe-business/src/test/java/fr/ird/observe/db/DataServiceTest.java +++ b/observe-business/src/test/java/fr/ird/observe/db/DataServiceTest.java @@ -26,7 +26,6 @@ import fr.ird.observe.IObserveConfig; import fr.ird.observe.db.impl.H2DataSourceConfig; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.test.TestHelper; -import fr.ird.observe.util.Scripts; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; @@ -65,7 +64,7 @@ public class DataServiceTest { TestHelper.createApplicationContext(); TestHelper.setConfig(IObserveConfig.DB_VERSION, - Scripts.V_LAST.toString()); + DBTestHelper.V_LAST.toString()); } @Before diff --git a/observe-business/src/test/java/fr/ird/observe/db/impl/H2DataSourceConfigTest.java b/observe-business/src/test/java/fr/ird/observe/db/impl/H2DataSourceConfigTest.java index 4db948b..8f55d22 100644 --- a/observe-business/src/test/java/fr/ird/observe/db/impl/H2DataSourceConfigTest.java +++ b/observe-business/src/test/java/fr/ird/observe/db/impl/H2DataSourceConfigTest.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.db.impl; +import fr.ird.observe.db.DBTestHelper; import fr.ird.observe.util.Scripts; import fr.ird.observe.test.TestHelper; import fr.ird.observe.db.constants.CreationMode; @@ -62,7 +63,7 @@ public class H2DataSourceConfigTest { I18n.setDefaultLocale(Locale.FRENCH); - Version lastVersion = Scripts.V_LAST; + Version lastVersion = DBTestHelper.V_LAST; TEST_DUMP_URL = Scripts.getBackupScriptURL(lastVersion, Scripts.FULL_SCRIPT); } diff --git a/observe-business/src/test/java/fr/ird/observe/db/impl/PGDataSourceConfigTest.java b/observe-business/src/test/java/fr/ird/observe/db/impl/PGDataSourceConfigTest.java index 7d9485e..41ed665 100644 --- a/observe-business/src/test/java/fr/ird/observe/db/impl/PGDataSourceConfigTest.java +++ b/observe-business/src/test/java/fr/ird/observe/db/impl/PGDataSourceConfigTest.java @@ -22,7 +22,7 @@ package fr.ird.observe.db.impl; import fr.ird.observe.IObserveConfig; -import fr.ird.observe.util.Scripts; +import fr.ird.observe.db.DBTestHelper; import fr.ird.observe.test.TestHelper; import fr.ird.observe.db.DataSourceFactory; import fr.ird.observe.db.constants.CommonDataSourceConfigParam; @@ -61,7 +61,7 @@ public class PGDataSourceConfigTest { TestHelper.createApplicationContext(); TestHelper.setConfig(IObserveConfig.DB_VERSION, - Scripts.V_LAST.toString() + DBTestHelper.V_LAST.toString() ); } diff --git a/observe-business/src/test/java/fr/ird/observe/its/DataSourceFactoryIT.java b/observe-business/src/test/java/fr/ird/observe/its/DataSourceFactoryIT.java index 6fb1de9..bfecc05 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/DataSourceFactoryIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/DataSourceFactoryIT.java @@ -70,7 +70,7 @@ public class DataSourceFactoryIT { TestHelper.createApplicationContext(); TestHelper.setConfig(IObserveConfig.DB_VERSION, - Scripts.V_LAST.toString()); + DBTestHelper.V_LAST.toString()); boolean canConnect = DBTestHelper.checkCanConnectPG( TestHelper.TEST_REMOTE_URL, diff --git a/observe-business/src/test/java/fr/ird/observe/its/PGInstallIT.java b/observe-business/src/test/java/fr/ird/observe/its/PGInstallIT.java index e45f168..a2e070e 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/PGInstallIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/PGInstallIT.java @@ -26,7 +26,6 @@ import fr.ird.observe.entities.Entities; import fr.ird.observe.db.DBTestHelper; import fr.ird.observe.db.impl.PGDataSourceConfig; import fr.ird.observe.db.util.PGInstall; -import fr.ird.observe.util.Scripts; import fr.ird.observe.db.util.SecurityModel; import fr.ird.observe.test.TestHelper; import org.apache.commons.lang3.tuple.Pair; @@ -64,7 +63,7 @@ public class PGInstallIT { TestHelper.createApplicationContext(); TestHelper.setConfig(IObserveConfig.DB_VERSION, - Scripts.V_LAST.toString()); + DBTestHelper.V_LAST.toString()); boolean canUsePG = DBTestHelper.checkCanConnectPG( TestHelper.TEST_REMOTE_URL, diff --git a/observe-business/src/test/java/fr/ird/observe/its/RestoreEmptyPGIT.java b/observe-business/src/test/java/fr/ird/observe/its/RestoreEmptyPGIT.java index f94c9f6..e1b1d19 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/RestoreEmptyPGIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/RestoreEmptyPGIT.java @@ -22,7 +22,6 @@ package fr.ird.observe.its; import fr.ird.observe.IObserveConfig; -import fr.ird.observe.util.Scripts; import fr.ird.observe.test.TestHelper; import fr.ird.observe.db.DBTestHelper; import org.apache.commons.logging.Log; @@ -54,7 +53,7 @@ public class RestoreEmptyPGIT { TestHelper.createApplicationContext(); TestHelper.setConfig(IObserveConfig.DB_VERSION, - Scripts.V_LAST.toString()); + DBTestHelper.V_LAST.toString()); boolean canConnect = DBTestHelper.checkCanConnectPG( TestHelper.TEST_REMOTE_URL, diff --git a/observe-business/src/test/java/fr/ird/observe/its/migration/AbstractMigrationTest.java b/observe-business/src/test/java/fr/ird/observe/its/migration/AbstractMigrationTest.java index 7eb68e5..64ec624 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/migration/AbstractMigrationTest.java +++ b/observe-business/src/test/java/fr/ird/observe/its/migration/AbstractMigrationTest.java @@ -28,7 +28,6 @@ import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.DataSourceFactory; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.test.TestHelper; -import fr.ird.observe.util.Scripts; import org.junit.After; import org.junit.Before; import org.nuiton.util.version.Version; @@ -61,7 +60,7 @@ public abstract class AbstractMigrationTest<C extends DataSourceConfig, S extend protected final void testForVersion(Version v) throws Exception { - boolean last = v.equals(Scripts.V_LAST); + boolean last = v.equals(DBTestHelper.V_LAST); // on ouvre la base avec migration possible avec affichage des requetes // uniquement sur la dernière version @@ -89,7 +88,7 @@ public abstract class AbstractMigrationTest<C extends DataSourceConfig, S extend protected final void testForVersion(Version referentielVersion, Version v) throws Exception { - boolean last = v.equals(Scripts.V_LAST); + boolean last = v.equals(DBTestHelper.V_LAST); // on ouvre la base avec migration possible avec affichage des requetes // uniquement sur la dernière version diff --git a/observe-business/src/test/java/fr/ird/observe/its/migration/PGDataSourceMigrationIT.java b/observe-business/src/test/java/fr/ird/observe/its/migration/PGDataSourceMigrationIT.java index d16224d..990aeff 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/migration/PGDataSourceMigrationIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/migration/PGDataSourceMigrationIT.java @@ -22,7 +22,6 @@ package fr.ird.observe.its.migration; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.util.Scripts; import fr.ird.observe.test.TestHelper; import fr.ird.observe.db.DBTestHelper; import fr.ird.observe.db.DataSourceFactory; @@ -53,7 +52,7 @@ public class PGDataSourceMigrationIT extends AbstractDataSourceMigrationTest<PGD if (!DBTestHelper.canUsePG) { return; } - Version lastVersion = Scripts.V_LAST; + Version lastVersion = DBTestHelper.V_LAST; // creation base derniere version diff --git a/observe-business/src/test/java/fr/ird/observe/its/migration/h2ToLast/AbstractH2MigrationToLastIT.java b/observe-business/src/test/java/fr/ird/observe/its/migration/h2ToLast/AbstractH2MigrationToLastIT.java index 981be22..bd5313a 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/migration/h2ToLast/AbstractH2MigrationToLastIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/migration/h2ToLast/AbstractH2MigrationToLastIT.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.its.migration.h2ToLast; -import fr.ird.observe.util.Scripts; import fr.ird.observe.test.TestHelper; import fr.ird.observe.db.DBTestHelper; import fr.ird.observe.db.impl.H2DataSource; @@ -82,7 +81,7 @@ public abstract class AbstractH2MigrationToLastIT extends AbstractMigrationTest< @Test public final void testMigrateFrom0_TO_Last() throws Exception { - testForVersion(Scripts.V_LAST); + testForVersion(DBTestHelper.V_LAST); } @Override diff --git a/observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java b/observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java index aaffe11..2ff0a7e 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java @@ -23,7 +23,6 @@ package fr.ird.observe.its.report; import fr.ird.observe.IObserveConfig; import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.util.Scripts; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.test.TestHelper; import fr.ird.observe.db.DBTestHelper; @@ -94,7 +93,7 @@ public abstract class AbstractReportIT { ApplicationConfig config = ObserveServiceHelper.get().getContextValue(ApplicationConfig.class); - config.setOption(IObserveConfig.DB_VERSION, Scripts.V_LAST.toString()); + config.setOption(IObserveConfig.DB_VERSION, DBTestHelper.V_LAST.toString()); TestHelper.setConfig(AbstractDataSourceMigration.AUTO_MIGRATE, "true"); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index f31b317..b2d3f62 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -28,14 +28,13 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.util.Numbers; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaId; import java.util.Arrays; import java.util.Collection; @@ -311,7 +310,7 @@ public class Entities { if (!TopiaEntity.class.isAssignableFrom(klass)) { return false; } - klass = ObserveDAOHelper.getContractClass((Class<? extends TopiaEntity>) klass); + klass = ObserveEntityEnum.getContractClass((Class<? extends TopiaEntity>) klass); for (ObserveEntityEnum c : REFERENCE_ENTITIES_LIST) { if (c.getContract().equals(klass)) { return true; @@ -341,7 +340,7 @@ public class Entities { if (!TopiaEntity.class.isAssignableFrom(klass)) { return false; } - klass = ObserveDAOHelper.getContractClass((Class<? extends TopiaEntity>) klass); + klass = ObserveEntityEnum.getContractClass((Class<? extends TopiaEntity>) klass); for (ObserveEntityEnum c : DATA_ENTITIES_LIST) { if (c.getContract().equals(klass)) { return true; @@ -354,7 +353,7 @@ public class Entities { Map<String, E> map = CollectionUtils.isEmpty(entities) ? Maps.<String, E>newHashMap() - : Maps.uniqueIndex(entities, TopiaId.GET_TOPIA_ID); + : Maps.uniqueIndex(entities, TopiaEntities.getTopiaIdFunction()); return map; @@ -402,7 +401,7 @@ public class Entities { private static class StackTraceElementPredicate implements Predicate<StackTraceElement> { - static final ImmutableSet<String> matchingPatterns = ImmutableSet.of("org.nuiton.","fr.ird"); + static final ImmutableSet<String> matchingPatterns = ImmutableSet.of("org.nuiton.", "fr.ird"); @Override public boolean apply(StackTraceElement input) { @@ -410,7 +409,7 @@ public class Entities { boolean keep = false; for (String matchingPattern : matchingPatterns) { if (className.contains(matchingPattern)) { - keep=true; + keep = true; break; } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java similarity index 71% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java index 49b9114..eaf7a9f 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java @@ -25,9 +25,8 @@ package fr.ird.observe.entities.longline; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.entities.referentiel.longline.VesselActivityLonglineImpl; - -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; @@ -35,23 +34,23 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -public class ActivityLonglineDAOImpl<E extends ActivityLongline> extends ActivityLonglineDAOAbstract<E> { +public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<ActivityLongline> { - public List<E> findAllStubByTripId(String tripId, ReferenceLocale referenceLocale) { + public List<ActivityLongline> findAllStubByTripId(String tripId, ReferenceLocale referenceLocale) { - List<E> result = StubSqlQuery.findAll(context, tripId, referenceLocale); + List<ActivityLongline> result = StubSqlQuery.findAll(topiaSqlSupport, tripId, referenceLocale); return result; } - public E findStubByTopiaId(String activityId, ReferenceLocale referenceLocale) { + public ActivityLongline findStubByTopiaId(String activityId, ReferenceLocale referenceLocale) { - E result = StubSqlQuery.find(context, activityId, referenceLocale); + ActivityLongline result = StubSqlQuery.find(topiaSqlSupport, activityId, referenceLocale); return result; } - private static class StubSqlQuery<E extends ActivityLongline> extends TopiaSQLQuery<E> { + private static class StubSqlQuery extends TopiaSqlQuery<ActivityLongline> { private final String sql; @@ -59,7 +58,7 @@ public class ActivityLonglineDAOImpl<E extends ActivityLongline> extends Activit private final ReferenceLocale referenceLocale; - public static <E extends ActivityLongline> List<E> findAll(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) { + public static List<ActivityLongline> findAll(TopiaSqlSupport context, String tripId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " a.topiaId," + @@ -73,12 +72,12 @@ public class ActivityLonglineDAOImpl<E extends ActivityLongline> extends Activit " AND a.vesselactivity = va.topiaid" + " ORDER BY a.timestamp"; - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, tripId, referenceLocale); - return request.findMultipleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, tripId, referenceLocale); + return context.findMultipleResult(request); } - public static <E extends ActivityLongline> E find(TopiaContextImplementor context, String activityId, ReferenceLocale referenceLocale) { + public static ActivityLongline find(TopiaSqlSupport context, String activityId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " a.topiaId," + @@ -92,8 +91,8 @@ public class ActivityLonglineDAOImpl<E extends ActivityLongline> extends Activit " AND a.vesselactivity = va.topiaid" + " ORDER BY a.timestamp"; - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, activityId, referenceLocale); - return request.findSingleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, activityId, referenceLocale); + return context.findSingleResult(request); } @@ -104,16 +103,16 @@ public class ActivityLonglineDAOImpl<E extends ActivityLongline> extends Activit } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); preparedStatement.setString(1, id); return preparedStatement; } @Override - protected E prepareResult(ResultSet set) throws SQLException { + public ActivityLongline prepareResult(ResultSet set) throws SQLException { - E activity = (E) new ActivityLonglineImpl(); + ActivityLongline activity = new ActivityLonglineImpl(); activity.setTopiaId(set.getString(1)); activity.setTimeStamp(set.getTimestamp(2)); activity.setOpen(set.getBoolean(3)); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java index 6932b10..3398e00 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java @@ -63,17 +63,17 @@ public class SectionWithTemplateImpl extends SectionImpl implements SectionWithT } @Override - public void addAllBasket(List<Basket> basket) { + public void addAllBasket(Iterable<Basket> basket) { delegate.addAllBasket(basket); } @Override - public void addAllCatchLongline(Collection<CatchLongline> catchLongline) { + public void addAllCatchLongline(Iterable<CatchLongline> catchLongline) { delegate.addAllCatchLongline(catchLongline); } @Override - public void addAllTdr(Collection<Tdr> tdr) { + public void addAllTdr(Iterable<Tdr> tdr) { delegate.addAllTdr(tdr); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java similarity index 74% rename from observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index ef80115..4cbc12c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -31,9 +31,8 @@ import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; import fr.ird.observe.tripMap.TripMapPoint; import fr.ird.observe.tripMap.TripMapPointType; - -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 org.nuiton.util.DateUtil; import java.sql.Connection; @@ -44,15 +43,16 @@ import java.sql.Timestamp; import java.util.Date; import java.util.List; -public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAOAbstract<E> { +public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongline> { public static final String ACTIVITY_INTERACTION_ID = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.4"; + public static final String ACTIVITY_STATION_ID = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.3"; public int findPositionByProgramId(String programId, String tripId) { int result = 0; - List<E> list = findAllStubByProgramId(programId, ReferenceLocale.FR); - for (E e : list) { + List<TripLongline> list = findAllStubByProgramId(programId, ReferenceLocale.FR); + for (TripLongline e : list) { if (tripId.equals(e.getTopiaId())) { return result; } @@ -63,16 +63,16 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO return -1; } - public List<E> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) { + public List<TripLongline> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) { - List<E> result = StubSqlQuery.findAll(context, programId, referenceLocale); + List<TripLongline> result = StubSqlQuery.findAll(topiaSqlSupport, programId, referenceLocale); return result; } - public E findStubByTopiaId(String tripId, ReferenceLocale referenceLocale) { + public TripLongline findStubByTopiaId(String tripId, ReferenceLocale referenceLocale) { - E result = StubSqlQuery.find(context, tripId, referenceLocale); + TripLongline result = StubSqlQuery.find(topiaSqlSupport, tripId, referenceLocale); return result; } @@ -86,8 +86,8 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO // add departure harbours Harbour departureHarbour = tripLongline.getDepartureHarbour(); if (departureHarbour != null - && departureHarbour.getLatitude() != null - && departureHarbour.getLongitude() != null) { + && departureHarbour.getLatitude() != null + && departureHarbour.getLongitude() != null) { TripMapPoint departurePoint = new TripMapPoint(); departurePoint.setTime(tripLongline.getStartDate()); departurePoint.setLatitude(departureHarbour.getLatitude()); @@ -98,16 +98,16 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO // Add Activities TripMapActivityPointQuery tripMapActivityPointQuery = new TripMapActivityPointQuery(tripId); - List<List<TripMapPoint>> results = tripMapActivityPointQuery.findMultipleResult(context); - for (List<TripMapPoint> result : results) { + List<List<TripMapPoint>> results = topiaSqlSupport.findMultipleResult(tripMapActivityPointQuery); + for (List<TripMapPoint> result : results) { tripMapPoints.addAll(result); } // add landing harbours Harbour landingHarbour = tripLongline.getLandingHarbour(); if (landingHarbour != null - && landingHarbour.getLatitude() != null - && landingHarbour.getLongitude() != null) { + && landingHarbour.getLatitude() != null + && landingHarbour.getLongitude() != null) { TripMapPoint landingPoint = new TripMapPoint(); landingPoint.setTime(tripLongline.getEndDate()); landingPoint.setLatitude(landingHarbour.getLatitude()); @@ -119,30 +119,30 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO return tripMapPoints; } - private static class TripMapActivityPointQuery extends TopiaSQLQuery<List<TripMapPoint>> { + private static class TripMapActivityPointQuery extends TopiaSqlQuery<List<TripMapPoint>> { private static String SQL = "SELECT" + - " a.timestamp, " + - " a.latitude," + - " a.longitude," + - " a.vesselActivity," + - " s.settingStartTimestamp," + - " s.settingStartLatitude," + - " s.settingStartLongitude," + - " s.settingEndTimestamp," + - " s.settingEndLatitude," + - " s.settingEndLongitude," + - " s.haulingStartTimestamp," + - " s.haulingStartLatitude," + - " s.haulingStartLongitude," + - " s.haulingEndTimestamp," + - " s.haulingEndLatitude," + - " s.haulingEndLongitude" + - " FROM observe_longLine.activity a" + - " LEFT OUTER JOIN observe_longLine.set s" + - " ON s.topiaId = a.set" + - " WHERE a.trip = ?" + - " ORDER BY a.timestamp"; + " a.timestamp, " + + " a.latitude," + + " a.longitude," + + " a.vesselActivity," + + " s.settingStartTimestamp," + + " s.settingStartLatitude," + + " s.settingStartLongitude," + + " s.settingEndTimestamp," + + " s.settingEndLatitude," + + " s.settingEndLongitude," + + " s.haulingStartTimestamp," + + " s.haulingStartLatitude," + + " s.haulingStartLongitude," + + " s.haulingEndTimestamp," + + " s.haulingEndLatitude," + + " s.haulingEndLongitude" + + " FROM observe_longLine.activity a" + + " LEFT OUTER JOIN observe_longLine.set s" + + " ON s.topiaId = a.set" + + " WHERE a.trip = ?" + + " ORDER BY a.timestamp"; protected String tripId; @@ -151,14 +151,14 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(SQL); preparedStatement.setString(1, tripId); return preparedStatement; } @Override - protected List<TripMapPoint> prepareResult(ResultSet resultSet) throws SQLException { + public List<TripMapPoint> prepareResult(ResultSet resultSet) throws SQLException { List<TripMapPoint> result = Lists.newLinkedList(); @@ -229,9 +229,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO } - - - private static class StubSqlQuery<E extends TripLongline> extends TopiaSQLQuery<E> { + private static class StubSqlQuery extends TopiaSqlQuery<TripLongline> { private final String sql; @@ -245,7 +243,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO this.referenceLocale = referenceLocale; } - public static <E extends TripLongline> List<E> findAll(TopiaContextImplementor context, String programId, ReferenceLocale referenceLocale) { + public static List<TripLongline> findAll(TopiaSqlSupport context, String programId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -263,12 +261,12 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, programId, referenceLocale); - return request.findMultipleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, programId, referenceLocale); + return context.findMultipleResult(request); } - public static <E extends TripLongline> E find(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) { + public static TripLongline find(TopiaSqlSupport context, String tripId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -286,22 +284,22 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, tripId, referenceLocale); - return request.findSingleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, tripId, referenceLocale); + return context.findSingleResult(request); } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); preparedStatement.setString(1, id); return preparedStatement; } @Override - protected E prepareResult(ResultSet set) throws SQLException { + public TripLongline prepareResult(ResultSet set) throws SQLException { - E trip = (E) new TripLonglineImpl(); + TripLongline trip = new TripLonglineImpl(); trip.setTopiaId(set.getString(1)); trip.setStartDate(set.getTimestamp(2)); trip.setEndDate(set.getTimestamp(3)); @@ -327,7 +325,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO } - public boolean updateEndDate(E trip) { + public boolean updateEndDate(TripLongline trip) { boolean wasUpdated = false; @@ -349,13 +347,13 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO } - public Date getTheoricalEndDate(E trip) { + public Date getTheoricalEndDate(TripLongline trip) { Date d; - Timestamp lastActivityDate = TheoricalEndOfDateSqlQuery.find(context, trip.getTopiaId()); + Timestamp lastActivityDate = TheoricalEndOfDateSqlQuery.find(topiaSqlSupport, trip.getTopiaId()); - if (lastActivityDate==null) { + if (lastActivityDate == null) { // pas d'activité, donc la date de fin est la date de debut d = trip.getStartDate(); @@ -373,7 +371,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO } - private static class TheoricalEndOfDateSqlQuery extends TopiaSQLQuery<Timestamp> { + private static class TheoricalEndOfDateSqlQuery extends TopiaSqlQuery<Timestamp> { private final String sql; @@ -384,19 +382,19 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO this.tripId = tripId; } - public static Timestamp find(TopiaContextImplementor context, String tripId) { + public static Timestamp find(TopiaSqlSupport context, String tripId) { String sql = "SELECT max(a.timestamp)" + " FROM observe_longline.activity a" + " WHERE a.trip = ?"; - TheoricalEndOfDateSqlQuery request = new TheoricalEndOfDateSqlQuery(sql, tripId); - return request.findSingleResult(context); + TheoricalEndOfDateSqlQuery request = new TheoricalEndOfDateSqlQuery(sql, tripId); + return context.findSingleResult(request); } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); preparedStatement.setString(1, tripId); @@ -405,7 +403,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO } @Override - protected Timestamp prepareResult(ResultSet set) throws SQLException { + public Timestamp prepareResult(ResultSet set) throws SQLException { Timestamp result = set.getTimestamp(1); return result; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 4133d06..53464f9 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -111,6 +111,7 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback } + //FIXME @Override public Version getApplicationVersion() { Preconditions.checkNotNull(applicationConfigSupplier); 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 deleted file mode 100644 index c3440f6..0000000 --- a/observe-entities/src/main/java/fr/ird/observe/util/DBHelper.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.util; - -import fr.ird.observe.ObserveDAOHelper; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.Entities; -import org.nuiton.topia.TopiaContext; - -import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaEntityAbstract; - -import java.util.Properties; - -/** - * @author Tony Chemit - chemit@codelutin.com - * @since 1.0 - */ -public class DBHelper { - - - /** - * Attache l'entité à un topia context donné, cela permet d'activityr le - * support des modifications de propriétés. - * - * @param ctxt le topia context - * @param entity l'entité à attacher - */ - public static void attachTopiaContext(TopiaContext ctxt, - TopiaEntityAbstract entity) { - try { - if (entity.getTopiaContext() == null) { - // only attach topia context if required - entity.setTopiaContext(ctxt); - } - } catch (TopiaException e) { - throw new TopiaException(e); - } - } - - /** - * Permet d'ajouter les differents mapping hibernate specifique a - * l'application - * - * @param config l'objet properties dans lequel il faut ajouter les - * informations - * @return l'objet config passe en parametre - */ - public static Properties addHibernateMapping(Properties config) { - config.setProperty("topia.persistence.classes", - ObserveDAOHelper.getImplementationClassesAsString()); - return config; - } - -} diff --git a/observe-entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java b/observe-entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java index 4f634c0..8aca457 100644 --- a/observe-entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java +++ b/observe-entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java @@ -36,8 +36,7 @@ public class LengthWeightParemeterHelperTest { public void testComputeValue() { Float weight; - LengthWeightParameter parametrage = - new LengthWeightParameterImpl(); + LengthWeightParameter parametrage = new LengthWeightParameterImpl(); parametrage.setCoefficients("a=3.8e-5:b=2.78 "); parametrage.setLengthWeightFormula("a * Math.pow(L, b)"); Assert.assertTrue(parametrage.isLengthWeightFormulaValid()); diff --git a/observe-entities/src/test/java/fr/ird/observe/DBHelperTest.java b/observe-entities/src/test/java/fr/ird/observe/util/NumbersTest.java similarity index 52% rename from observe-entities/src/test/java/fr/ird/observe/DBHelperTest.java rename to observe-entities/src/test/java/fr/ird/observe/util/NumbersTest.java index ccaab3f..8280ab7 100644 --- a/observe-entities/src/test/java/fr/ird/observe/DBHelperTest.java +++ b/observe-entities/src/test/java/fr/ird/observe/util/NumbersTest.java @@ -1,57 +1,15 @@ -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe; +package fr.ird.observe.util; -import fr.ird.observe.util.Numbers; import org.junit.Assert; import org.junit.Test; /** - * Pour tester les arrondis sur le weight. + * Created on 21/08/15. * * @author Tony Chemit - chemit@codelutin.com - * @since 1.8 */ -public class DBHelperTest { +public class NumbersTest { -// @Test -// public void testDatFormat() { -// -// I18n.init(null, Locale.FRANCE); -// -// Date d = new Date(); -// Calendar calendar = Calendar.getInstance(); -// calendar.setTime(d); -// calendar.set(Calendar.YEAR, 2010); -// calendar.set(Calendar.MONTH, Calendar.FEBRUARY); -// calendar.set(Calendar.DAY_OF_MONTH, 4); -// d = calendar.getTime(); -// -// d = DBHelper.getDay(d); -// String expected = "Démarrage de la réplication du référentiel (04/02/2010 à 00:00:00)"; -// String actual = I18n.t("observe.storage.message.replicate.referentiel.starting", d); -// Assert.assertEquals(expected, actual); -// -// } @Test public void testRound3Digits() { @@ -102,4 +60,5 @@ public class DBHelperTest { Float actual = Numbers.round1Digit(number); Assert.assertEquals("" + expected, "" + actual); } -} + +} \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.