This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository tutti. See http://git.codelutin.com/tutti.git commit 361b442027ecb76bc743fb68896c25eeb2ed5b1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 29 15:12:44 2015 +0100 Suppression de l'enumeration ReferenceLocale (on ne garde que celle côté service API --- .../entities/constants/ReferenceLocale.java | 134 --------------------- .../longline/ActivityLonglineTopiaDao.java | 20 +-- .../entities/longline/TripLonglineTopiaDao.java | 22 ++-- .../referentiel/I18nReferenceEntities.java | 54 +++++++-- .../entities/referentiel/ProgramTopiaDao.java | 23 ++-- .../entities/referentiel/ReferenceEntities.java | 67 ++--------- .../entities/seine/ActivitySeineTopiaDao.java | 20 +-- .../ird/observe/entities/seine/ActivitySeines.java | 6 +- .../entities/seine/FloatingObjectTopiaDao.java | 24 ++-- .../observe/entities/seine/TripSeineTopiaDao.java | 51 ++++---- .../fr/ird/observe/entities/seine/TripSeines.java | 6 +- 11 files changed, 143 insertions(+), 284 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java deleted file mode 100644 index ebb4ebd..0000000 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java +++ /dev/null @@ -1,134 +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.entities.constants; - -import fr.ird.observe.entities.referentiel.I18nReferenceEntities; -import fr.ird.observe.entities.referentiel.I18nReferenceEntity; - -import java.util.Locale; - -/** - * Pour définir les différentes langues du référentiel. - * <p/> - * La position de chaque constante définit l'index du champs libelleXXX à - * utiliser. - * <p/> - * En base on a actuellement 8 langues possibles, pour gérer une nouvelle - * langue, il faut définir une nouvelle constante ici. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.2 - */ -public enum ReferenceLocale { - /** - * correspond a la propriete {@code label1} d'un {@link - * I18nReferenceEntity}. - * - * @see I18nReferenceEntity#getLabel1() - */ - UK(Locale.UK), - /** - * correspond a la propriete {@code label2} d'un {@link - * I18nReferenceEntity}. - * - * @see I18nReferenceEntity#getLabel2() - */ - FR(Locale.FRANCE), - /** - * correspond a la propriete {@code label3} d'un {@link - * I18nReferenceEntity}. - * - * @see I18nReferenceEntity#getLabel3() - */ - ES(new Locale("es", "ES")); - - private Locale locale; - - ReferenceLocale(Locale locale) { - this.locale = locale; - } - - public Locale getLocale() { - return locale; - } - - public String getLibelle() { - return "label" + (ordinal() + 1); - } - - public static ReferenceLocale valueOf(Locale locale) { - for (ReferenceLocale anEnum : values()) { - if (locale.equals(anEnum.getLocale())) { - return anEnum; - } - } - throw new IllegalArgumentException( - "could not find referentiel locale from locale " + locale); - } - - public String getColumnName() { - return "label"+(ordinal() + 1); - } - - @Override - public String toString() { - return "<Locale: " + locale + ", index: " + name() + ">"; - } - - public <E extends I18nReferenceEntity> void setLabel(String label, E i18nEntity) { - - switch (ordinal()+1) { - case 1: - i18nEntity.setLabel1(label); - break; - case 2: - i18nEntity.setLabel2(label); - break; - case 3: - i18nEntity.setLabel3(label); - break; - case 4: - i18nEntity.setLabel4(label); - break; - case 5: - i18nEntity.setLabel5(label); - break; - case 6: - i18nEntity.setLabel6(label); - break; - case 7: - i18nEntity.setLabel7(label); - break; - case 8: - i18nEntity.setLabel8(label); - break; - } - - } - - public <E extends I18nReferenceEntity> String getLabel(E i18nEntity) { - - String result = I18nReferenceEntities.decorate(ordinal(), i18nEntity); - return result; - - } -} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java index 2ba6ff2..9df92e8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.longline; * #L% */ -import fr.ird.observe.entities.constants.ReferenceLocale; +import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.entities.referentiel.longline.VesselActivityLonglineImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -36,14 +36,14 @@ import java.util.List; public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<ActivityLongline> { - public List<ActivityLongline> findAllStubByTripId(String tripId, ReferenceLocale referenceLocale) { + public List<ActivityLongline> findAllStubByTripId(String tripId, int referenceLocale) { List<ActivityLongline> result = StubSqlQuery.findAll(topiaSqlSupport, tripId, referenceLocale); return result; } - public ActivityLongline findStubByTopiaId(String activityId, ReferenceLocale referenceLocale) { + public ActivityLongline findStubByTopiaId(String activityId, int referenceLocale) { ActivityLongline result = StubSqlQuery.find(topiaSqlSupport, activityId, referenceLocale); return result; @@ -56,16 +56,16 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A private final String id; - private final ReferenceLocale referenceLocale; + private final int referenceLocale; - public static List<ActivityLongline> findAll(TopiaSqlSupport context, String tripId, ReferenceLocale referenceLocale) { + public static List<ActivityLongline> findAll(TopiaSqlSupport context, String tripId, int referenceLocale) { String sql = "SELECT" + " a.topiaId," + " a.timestamp," + // " a.open," + " a.set," + - " va." + referenceLocale.getColumnName() + + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + " WHERE " + " a.trip = ?" + @@ -77,14 +77,14 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A } - public static ActivityLongline find(TopiaSqlSupport context, String activityId, ReferenceLocale referenceLocale) { + public static ActivityLongline find(TopiaSqlSupport context, String activityId, int referenceLocale) { String sql = "SELECT" + " a.topiaId," + " a.timestamp," + // " a.open," + " a.set," + - " va." + referenceLocale.getColumnName() + + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + " WHERE " + " a.topiaId = ?" + @@ -96,7 +96,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A } - StubSqlQuery(String sql, String id, ReferenceLocale referenceLocale) { + StubSqlQuery(String sql, String id, int referenceLocale) { this.sql = sql; this.id = id; this.referenceLocale = referenceLocale; @@ -127,7 +127,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A } VesselActivityLongline vesselActivity = new VesselActivityLonglineImpl(); String label = set.getString(4); - referenceLocale.setLabel(label, vesselActivity); + I18nReferenceEntities.setLabel(referenceLocale,vesselActivity, label); activity.setVesselActivityLongline(vesselActivity); return activity; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index 430b555..b7f25b6 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -23,8 +23,8 @@ package fr.ird.observe.entities.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.Harbour; +import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.PersonImpl; import fr.ird.observe.entities.referentiel.Vessel; @@ -52,7 +52,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl public int findPositionByProgramId(String programId, String tripId) { int result = 0; - List<TripLongline> list = findAllStubByProgramId(programId, ReferenceLocale.FR); + List<TripLongline> list = findAllStubByProgramId(programId, 1); for (TripLongline e : list) { if (tripId.equals(e.getTopiaId())) { return result; @@ -64,14 +64,14 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl return -1; } - public List<TripLongline> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) { + public List<TripLongline> findAllStubByProgramId(String programId, int referenceLocale) { List<TripLongline> result = StubSqlQuery.findAll(topiaSqlSupport, programId, referenceLocale); return result; } - public TripLongline findStubByTopiaId(String tripId, ReferenceLocale referenceLocale) { + public TripLongline findStubByTopiaId(String tripId, int referenceLocale) { TripLongline result = StubSqlQuery.find(topiaSqlSupport, tripId, referenceLocale); return result; @@ -236,15 +236,15 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl private final String id; - private final ReferenceLocale referenceLocale; + private final int referenceLocale; - StubSqlQuery(String sql, String id, ReferenceLocale referenceLocale) { + StubSqlQuery(String sql, String id, int referenceLocale) { this.sql = sql; this.id = id; this.referenceLocale = referenceLocale; } - public static List<TripLongline> findAll(TopiaSqlSupport context, String programId, ReferenceLocale referenceLocale) { + public static List<TripLongline> findAll(TopiaSqlSupport context, String programId, int referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -253,7 +253,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " p.lastName," + " p.firstName," + " v.topiaId," + - " v." + referenceLocale.getColumnName() + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + " WHERE " + " t.program = ?" + @@ -266,7 +266,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl } - public static TripLongline find(TopiaSqlSupport context, String tripId, ReferenceLocale referenceLocale) { + public static TripLongline find(TopiaSqlSupport context, String tripId, int referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -275,7 +275,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " p.lastName," + " p.firstName," + " v.topiaId," + - " v." + referenceLocale.getColumnName() + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + " WHERE " + " t.topiaId = ?" + @@ -314,7 +314,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl String vesselId = set.getString(6); vessel.setTopiaId(vesselId); String label = set.getString(7); - referenceLocale.setLabel(label, vessel); + I18nReferenceEntities.setLabel(referenceLocale, vessel, label); trip.setVessel(vessel); return trip; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java index 8dcd892..67a2f91 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.referentiel; * #L% */ -import fr.ird.observe.entities.constants.ReferenceLocale; +import java.util.Locale; /** * Created on 29/08/15. @@ -31,18 +31,23 @@ import fr.ird.observe.entities.constants.ReferenceLocale; */ public class I18nReferenceEntities { - public static <E extends I18nReferenceEntity> String decorate(ReferenceLocale referenceLocale, E i18nReferenceEntitiy) { + public static final Locale ES_LOCALE = new Locale("es", "ES"); - StringBuilder builder = new StringBuilder(); - - builder.append(i18nReferenceEntitiy.getCode()); - builder.append(" - ").append(referenceLocale.getLabel(i18nReferenceEntitiy)); - - return builder.toString(); + public static Locale getLocale(int referenceLocaleOrdinal) { + Locale locale = Locale.FRANCE; + if (referenceLocaleOrdinal == 0) { + locale = Locale.UK; + } else if (referenceLocaleOrdinal == 2) { + locale = ES_LOCALE; + } + return locale; + } + public static String getPropertyName(int referenceLocaleOrdinal) { + return "label" + (referenceLocaleOrdinal + 1); } - public static <E extends I18nReferenceEntity> String decorate(int referenceLocaleOrdinal, E i18nEntity) { + public static <E extends I18nReferenceEntity> String getLabel(int referenceLocaleOrdinal, E i18nEntity) { String result = null; @@ -77,4 +82,35 @@ public class I18nReferenceEntities { } + public static <E extends I18nReferenceEntity> void setLabel(int referenceLocaleOrdinal, E i18nEntity, String label) { + + switch (referenceLocaleOrdinal + 1) { + case 1: + i18nEntity.setLabel1(label); + break; + case 2: + i18nEntity.setLabel2(label); + break; + case 3: + i18nEntity.setLabel3(label); + break; + case 4: + i18nEntity.setLabel4(label); + break; + case 5: + i18nEntity.setLabel5(label); + break; + case 6: + i18nEntity.setLabel6(label); + break; + case 7: + i18nEntity.setLabel7(label); + break; + case 8: + i18nEntity.setLabel8(label); + break; + } + + } + } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java index e053ee8..a5dae79 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java @@ -23,7 +23,6 @@ package fr.ird.observe.entities.referentiel; */ import fr.ird.observe.entities.constants.GearType; -import fr.ird.observe.entities.constants.ReferenceLocale; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -36,13 +35,13 @@ import java.util.List; public class ProgramTopiaDao extends AbstractProgramTopiaDao<Program> { - public List<Program> findAllStub(ReferenceLocale referenceLocale) { + public List<Program> findAllStub(int referenceLocale) { List<Program> result = StubSqlQuery.findAll(topiaSqlSupport, referenceLocale); return result; } - public Program findStubByTopiaId(String programId, ReferenceLocale referentielLocale) { + public Program findStubByTopiaId(String programId, int referentielLocale) { return StubSqlQuery.find(topiaSqlSupport, programId, referentielLocale); } @@ -53,39 +52,39 @@ public class ProgramTopiaDao extends AbstractProgramTopiaDao<Program> { private final String id; - private final ReferenceLocale referenceLocale; + private final int referenceLocale; - static List<Program> findAll(TopiaSqlSupport topiaSqlSupport, ReferenceLocale referenceLocale) { + static List<Program> findAll(TopiaSqlSupport topiaSqlSupport, int referenceLocale) { String sql = "SELECT" + " p.topiaId," + " p.gearType," + - " p." + referenceLocale.getColumnName() + + " p." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_common.program p" + - " ORDER BY p." + referenceLocale.getColumnName(); + " ORDER BY p." + I18nReferenceEntities.getPropertyName(referenceLocale); StubSqlQuery request = new StubSqlQuery(sql, null, referenceLocale); return topiaSqlSupport.findMultipleResult(request); } - static Program find(TopiaSqlSupport topiaSqlSupport, String tripId, ReferenceLocale referenceLocale) { + static Program find(TopiaSqlSupport topiaSqlSupport, String tripId, int referenceLocale) { String sql = "SELECT" + " p.topiaId," + " p.gearType," + - " p." + referenceLocale.getColumnName() + + " p." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_common.program p" + " WHERE " + " p.topiaId = ?" + - " ORDER BY p." + referenceLocale.getColumnName(); + " ORDER BY p." + I18nReferenceEntities.getPropertyName(referenceLocale); StubSqlQuery request = new StubSqlQuery(sql, tripId, referenceLocale); return topiaSqlSupport.findSingleResult(request); } - StubSqlQuery(String sql, String id, ReferenceLocale referenceLocale) { + StubSqlQuery(String sql, String id, int referenceLocale) { this.sql = sql; this.id = id; this.referenceLocale = referenceLocale; @@ -111,7 +110,7 @@ public class ProgramTopiaDao extends AbstractProgramTopiaDao<Program> { program.setGearType(gearType); String label = set.getString(3); - referenceLocale.setLabel(label, program); + I18nReferenceEntities.setLabel(referenceLocale, program, label); return program; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java index 69f84aa..13bf6b8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java @@ -23,7 +23,6 @@ package fr.ird.observe.entities.referentiel; */ import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableMap; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.constants.ReferenceStatus; @@ -33,7 +32,6 @@ import org.nuiton.topia.persistence.TopiaEntity; import java.util.Iterator; import java.util.List; -import java.util.Map; /** * Helper class around {@link ReferenceEntity}. @@ -43,13 +41,17 @@ import java.util.Map; */ public class ReferenceEntities { + public static final Predicate<? extends ReferenceEntity> IS_ACTIF_PREDICATE = new Predicate<ReferenceEntity>() { + + @Override + public boolean apply(ReferenceEntity input) { + return ReferenceStatus.disabled != input.getStatus(); + } + }; + /** Logger. */ private static final Log log = LogFactory.getLog(ReferenceEntities.class); - protected ReferenceEntities() { - // avoid instance - } - /** * Filter une liste d'entités d'un référentiel en supprimmant toutes les * entités qui ne sont pas actives {@link ReferenceEntity#getStatus()} @@ -90,14 +92,6 @@ public class ReferenceEntities { } } - public static final Predicate<? extends ReferenceEntity> IS_ACTIF_PREDICATE = new Predicate<ReferenceEntity>() { - - @Override - public boolean apply(ReferenceEntity input) { - return ReferenceStatus.disabled != input.getStatus(); - } - }; - public static <R extends ReferenceEntity> Predicate<R> newEnablePredicate() { return (Predicate<R>) IS_ACTIF_PREDICATE; } @@ -121,50 +115,13 @@ public class ReferenceEntities { } } - public interface ReferentielWalker { - - <E extends TopiaEntity> void walk(Class<E> beanClass) throws Exception; - } - - public static <E extends ReferenceEntity> String toString(int referenceLocaleOrdinal, E entity) { - - String result = null; - if (entity != null) { - for (Map.Entry<Class<?>, ReferenceEntityToString> entry : TO_STRING_CACHE.entrySet()) { - - if (entry.getKey().isAssignableFrom(entity.getClass())) { - - ReferenceEntityToString<E> value = entry.getValue(); - result = value.toString(referenceLocaleOrdinal, entity); - break; - } - } - if (result == null && entity instanceof I18nReferenceEntity) { - - - result = I18nReferenceEntities.decorate(referenceLocaleOrdinal, (I18nReferenceEntity) entity); - } - } - - return result; - + protected ReferenceEntities() { + // avoid instance } - private static final ImmutableMap<Class<?>, ReferenceEntityToString> TO_STRING_CACHE = ImmutableMap - .<Class<?>, ReferenceEntityToString>builder() - .put(Species.class, new ReferenceEntityToString<Species>() { - - @Override - public String toString(int referenceLocaleOrdinal, Species entity) { - return entity.getScientificLabel(); - } - }) - .build(); - - - interface ReferenceEntityToString<E extends ReferenceEntity> { + public interface ReferentielWalker { - String toString(int referenceLocaleOrdinal, E entity); + <E extends TopiaEntity> void walk(Class<E> beanClass) throws Exception; } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java index 2b85146..48d0893 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.seine; * #L% */ -import fr.ird.observe.entities.constants.ReferenceLocale; +import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeineImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -36,14 +36,14 @@ import java.util.List; public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<ActivitySeine> { - public List<ActivitySeine> findAllStubByRouteId(String routeId, ReferenceLocale referenceLocale) { + public List<ActivitySeine> findAllStubByRouteId(String routeId, int referenceLocale) { List<ActivitySeine> result = StubSqlQuery.findAll(topiaSqlSupport, routeId, referenceLocale); return result; } - public ActivitySeine findStubByTopiaId(String activityId, ReferenceLocale referenceLocale) { + public ActivitySeine findStubByTopiaId(String activityId, int referenceLocale) { ActivitySeine result = StubSqlQuery.find(topiaSqlSupport, activityId, referenceLocale); return result; @@ -56,15 +56,15 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit private final String id; - private final ReferenceLocale referenceLocale; + private final int referenceLocale; - static List<ActivitySeine> findAll(TopiaSqlSupport context, String routeId, ReferenceLocale referenceLocale) { + static List<ActivitySeine> findAll(TopiaSqlSupport context, String routeId, int referenceLocale) { String sql = "SELECT" + " a.topiaId," + " a.time," + " a.set," + - " va." + referenceLocale.getColumnName() + + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_seine.activity a, observe_seine.vesselactivity va" + " WHERE " + " a.route = ?" + @@ -76,13 +76,13 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit } - static ActivitySeine find(TopiaSqlSupport context, String activityId, ReferenceLocale referenceLocale) { + static ActivitySeine find(TopiaSqlSupport context, String activityId, int referenceLocale) { String sql = "SELECT" + " a.topiaId," + " a.time," + " a.set," + - " va." + referenceLocale.getColumnName() + + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_seine.activity a, observe_seine.vesselactivity va" + " WHERE " + " a.topiaId = ?" + @@ -94,7 +94,7 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit } - StubSqlQuery(String sql, String id, ReferenceLocale referenceLocale) { + StubSqlQuery(String sql, String id, int referenceLocale) { this.sql = sql; this.id = id; this.referenceLocale = referenceLocale; @@ -125,7 +125,7 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit VesselActivitySeine vesselActivity = new VesselActivitySeineImpl(); String label = set.getString(4); - referenceLocale.setLabel(label, vesselActivity); + I18nReferenceEntities.setLabel(referenceLocale, vesselActivity, label); activity.setVesselActivitySeine(vesselActivity); return activity; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java index bf22c23..7ceb58c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java @@ -24,8 +24,8 @@ package fr.ird.observe.entities.seine; import com.google.common.base.Predicate; import com.google.common.collect.Lists; -import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.seine.ObservedSystem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,11 +62,11 @@ public class ActivitySeines { /** Logger. */ private static final Log log = LogFactory.getLog(ActivitySeines.class); - public static String decorate(ReferenceLocale referenceLocale, ActivitySeine activitySeine) { + public static String decorate(int referenceLocale, ActivitySeine activitySeine) { return String.format("%1$tH:%1$tM", activitySeine.getTime()) + " - " + - referenceLocale.getLabel(activitySeine.getVesselActivitySeine()); + I18nReferenceEntities.getLabel(referenceLocale,activitySeine.getVesselActivitySeine()); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java index 5e0f3f3..54f7259 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.seine; * #L% */ -import fr.ird.observe.entities.constants.ReferenceLocale; +import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.seine.ObjectType; import fr.ird.observe.entities.referentiel.seine.ObjectTypeImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -36,14 +36,14 @@ import java.util.List; public class FloatingObjectTopiaDao extends AbstractFloatingObjectTopiaDao<FloatingObject> { - public List<FloatingObject> findAllStubByActivityId(String activityId, ReferenceLocale referenceLocale) { + public List<FloatingObject> findAllStubByActivityId(String activityId, int referenceLocale) { List<FloatingObject> result = StubSqlQuery.findAll(topiaSqlSupport, activityId, referenceLocale); return result; } - public FloatingObject findStubByTopiaId(String floatingObjectId, ReferenceLocale referenceLocale) { + public FloatingObject findStubByTopiaId(String floatingObjectId, int referenceLocale) { FloatingObject result = StubSqlQuery.find(topiaSqlSupport, floatingObjectId, referenceLocale); return result; @@ -56,41 +56,41 @@ public class FloatingObjectTopiaDao extends AbstractFloatingObjectTopiaDao<Float private final String id; - private final ReferenceLocale referenceLocale; + private final int referenceLocale; - static List<FloatingObject> findAll(TopiaSqlSupport context, String activityId, ReferenceLocale referenceLocale) { + static List<FloatingObject> findAll(TopiaSqlSupport context, String activityId, int referenceLocale) { String sql = "SELECT" + " fo.topiaId," + - " ot." + referenceLocale.getColumnName() + + " ot." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_seine.floatingobject fo, observe_seine.objecttype ot" + " WHERE " + " fo.activity = ?" + " AND fo.objecttype = ot.topiaid" + - " ORDER BY ot." + referenceLocale.getColumnName(); + " ORDER BY ot." + I18nReferenceEntities.getPropertyName(referenceLocale); StubSqlQuery request = new StubSqlQuery(sql, activityId, referenceLocale); return context.findMultipleResult(request); } - static FloatingObject find(TopiaSqlSupport context, String floatingObjectId, ReferenceLocale referenceLocale) { + static FloatingObject find(TopiaSqlSupport context, String floatingObjectId, int referenceLocale) { String sql = "SELECT" + " fo.topiaId," + - " ot." + referenceLocale.getColumnName() + + " ot." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_seine.floatingobject fo, observe_seine.objecttype ot" + " WHERE " + " fo.topiaId = ?" + " AND fo.objecttype = ot.topiaid" + - " ORDER BY ot." + referenceLocale.getColumnName(); + " ORDER BY ot." + I18nReferenceEntities.getPropertyName(referenceLocale); StubSqlQuery request = new StubSqlQuery(sql, floatingObjectId, referenceLocale); return context.findSingleResult(request); } - StubSqlQuery(String sql, String id, ReferenceLocale referenceLocale) { + StubSqlQuery(String sql, String id, int referenceLocale) { this.sql = sql; this.id = id; this.referenceLocale = referenceLocale; @@ -111,7 +111,7 @@ public class FloatingObjectTopiaDao extends AbstractFloatingObjectTopiaDao<Float String objectTypeLabel = set.getString(2); ObjectType objectType = new ObjectTypeImpl(); - referenceLocale.setLabel(objectTypeLabel, objectType); + I18nReferenceEntities.setLabel(referenceLocale, objectType, objectTypeLabel); floatingObject.setObjectType(objectType); return floatingObject; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index a68cacd..10033af 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.entities.seine; -import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.Harbour; +import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.PersonImpl; import fr.ird.observe.entities.referentiel.Vessel; @@ -52,9 +52,10 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { public static final String ACTIVITY_HARBOUR_ID = "fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675349#0.363119635949572"; + //FIXME Si on veut juste récupérer les positions, on fait une requete spécifique :( public int findPositionByProgramId(String programId, String tripId) { int result = 0; - List<TripSeine> list = findAllStubByProgramId(programId, ReferenceLocale.FR); + List<TripSeine> list = findAllStubByProgramId(programId, 1); for (TripSeine e : list) { if (tripId.equals(e.getTopiaId())) { return result; @@ -66,14 +67,14 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { return -1; } - public List<TripSeine> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) { + public List<TripSeine> findAllStubByProgramId(String programId, int referenceLocale) { List<TripSeine> result = StubSqlQuery.findAll(topiaSqlSupport, programId, referenceLocale); return result; } - public TripSeine findStubByTopiaId(String tripId, ReferenceLocale referenceLocale) { + public TripSeine findStubByTopiaId(String tripId, int referenceLocale) { TripSeine result = StubSqlQuery.find(topiaSqlSupport, tripId, referenceLocale); return result; @@ -118,19 +119,19 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { private static class TripMapActivityPointQuery extends TopiaSqlQuery<TripMapPointDto> { private static String SQL = "SELECT" + - " r.date, " + - " a.time, " + - " a.latitude," + - " a.longitude," + - " a.vesselactivity, " + - " s.schoolType" + - " FROM observe_seine.route r" + - " INNER JOIN observe_seine.activity a" + - " ON a.route = r.topiaId" + - " LEFT OUTER JOIN observe_seine.set s" + - " ON s.topiaId = a.set" + - " WHERE r.trip = ?" + - " ORDER BY r.date, a.time"; + " r.date, " + + " a.time, " + + " a.latitude," + + " a.longitude," + + " a.vesselactivity, " + + " s.schoolType" + + " FROM observe_seine.route r" + + " INNER JOIN observe_seine.activity a" + + " ON a.route = r.topiaId" + + " LEFT OUTER JOIN observe_seine.set s" + + " ON s.topiaId = a.set" + + " WHERE r.trip = ?" + + " ORDER BY r.date, a.time"; protected String tripId; @@ -183,9 +184,9 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { private final String id; - private final ReferenceLocale referenceLocale; + private final int referenceLocale; - static <E extends TripSeine> List<TripSeine> findAll(TopiaSqlSupport context, String programId, ReferenceLocale referenceLocale) { + static <E extends TripSeine> List<TripSeine> findAll(TopiaSqlSupport context, String programId, int referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -194,7 +195,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " p.lastName," + " p.firstName," + " v.topiaId, " + - " v." + referenceLocale.getColumnName() + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + " WHERE " + " t.program = ?" + @@ -207,7 +208,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { } - static TripSeine find(TopiaSqlSupport context, String tripId, ReferenceLocale referenceLocale) { + static TripSeine find(TopiaSqlSupport context, String tripId, int referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -216,7 +217,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " p.lastName," + " p.firstName," + " v.topiaId," + - " v." + referenceLocale.getColumnName() + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + " WHERE " + " t.topiaId = ?" + @@ -229,7 +230,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { } - StubSqlQuery(String sql, String id, ReferenceLocale referenceLocale) { + StubSqlQuery(String sql, String id, int referenceLocale) { this.sql = sql; this.id = id; this.referenceLocale = referenceLocale; @@ -262,7 +263,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { String vesselId = set.getString(6); vessel.setTopiaId(vesselId); String label = set.getString(7); - referenceLocale.setLabel(label, vessel); + I18nReferenceEntities.setLabel(referenceLocale, vessel, label); trip.setVessel(vessel); return trip; @@ -335,7 +336,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " FROM observe_seine.route r" + " WHERE r.trip = ?"; - TheoricalEndOfDateSqlQuery request = new TheoricalEndOfDateSqlQuery(sql, tripId); + TheoricalEndOfDateSqlQuery request = new TheoricalEndOfDateSqlQuery(sql, tripId); return context.findSingleResult(request); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java index d40b2db..fb952b6 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.seine; * #L% */ -import fr.ird.observe.entities.constants.ReferenceLocale; +import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.Person; /** @@ -32,13 +32,13 @@ import fr.ird.observe.entities.referentiel.Person; */ public class TripSeines { - public static String decorate(ReferenceLocale referenceLocale, TripSeine tripSeine) { + public static String decorate(int referenceLocale, TripSeine tripSeine) { StringBuilder builder = new StringBuilder(); builder.append(String.format("%1$td/%1$tm/%1$tY", tripSeine.getStartDate())); builder.append(" - ").append(String.format("%1$td/%1$tm/%1$tY", tripSeine.getEndDate())); - builder.append(" - ").append(referenceLocale.getLabel(tripSeine.getVessel())); + builder.append(" - ").append(I18nReferenceEntities.getLabel(referenceLocale, tripSeine.getVessel())); Person observer = tripSeine.getObserver(); builder.append(" - ").append(observer == null ? "" : observer.getLastName() + " " + observer.getFirstName()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.