This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 0d652158f644a8ecc863944d7f7e5b56e3dcf2d7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 9 11:42:21 2016 +0100 Renommage des constantes dans le module de persistence pour éviter des synonymes --- .../java/fr/ird/observe/entities/TripMapPoint.java | 8 +- .../{GearType.java => GearTypePersist.java} | 10 +-- ...enceStatus.java => ReferenceStatusPersist.java} | 2 +- ...rsistType.java => TripMapPointTypePersist.java} | 4 +- ... NonTargetCatchComputedValueSourcePersist.java} | 4 +- .../{Ownership.java => OwnershipPersist.java} | 10 +-- .../{SchoolType.java => SchoolTypePersist.java} | 4 +- ...a => TypeTransmittingBuoyOperationPersist.java} | 10 +-- .../entities/longline/TripLonglineTopiaDao.java | 22 ++--- .../referentiel/ObserveReferentialEntities.java | 4 +- .../referentiel/ObserveReferentialEntityImpl.java | 6 +- .../entities/referentiel/ProgramTopiaDao.java | 4 +- .../ird/observe/entities/referentiel/Programs.java | 6 +- .../observe/entities/seine/ActivitySeineImpl.java | 6 +- .../ird/observe/entities/seine/ActivitySeines.java | 10 +-- .../observe/entities/seine/FloatingObjectImpl.java | 18 ++-- .../observe/entities/seine/NonTargetCatchImpl.java | 6 +- .../ird/observe/entities/seine/SetSeineImpl.java | 8 +- .../observe/entities/seine/TripSeineTopiaDao.java | 20 ++--- observe-entities/src/main/xmi/observe-common.zargo | Bin 37603 -> 37331 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 84567 -> 84619 bytes .../seine/FloatingObjectTransmittingBuoyDto.java | 2 +- .../ird/observe/services/binder/BinderSupport.java | 98 +++++++++++++-------- .../ConsolidateActivitySeineDataResultBuilder.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 30 +++---- .../service/seine/SetSeineServiceTopia.java | 4 +- .../referentiel/LengthWeightParemetersTest.java | 4 +- 27 files changed, 164 insertions(+), 140 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java b/observe-entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java index 7d13fb3..ee6cd85 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java @@ -1,6 +1,6 @@ package fr.ird.observe.entities; -import fr.ird.observe.entities.constants.TripMapPointPersistType; +import fr.ird.observe.entities.constants.TripMapPointTypePersist; import java.io.Serializable; import java.util.Date; @@ -23,7 +23,7 @@ public class TripMapPoint implements Serializable { protected float longitude; - protected TripMapPointPersistType type; + protected TripMapPointTypePersist type; public Date getTime() { return time; @@ -49,11 +49,11 @@ public class TripMapPoint implements Serializable { this.longitude = longitude; } - public TripMapPointPersistType getType() { + public TripMapPointTypePersist getType() { return type; } - public void setType(TripMapPointPersistType type) { + public void setType(TripMapPointTypePersist type) { this.type = type; } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java similarity index 88% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java rename to observe-entities/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java index d221da3..6f13f15 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java @@ -31,7 +31,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.6 */ -public enum GearType { +public enum GearTypePersist { /** Seine */ seine(n("observe.reference.gearType.seine")) { @@ -51,7 +51,7 @@ public enum GearType { private String i18nKey; - GearType(String i18nKey) { + GearTypePersist(String i18nKey) { this.i18nKey = i18nKey; } @@ -64,10 +64,10 @@ public enum GearType { return t(i18nKey); } - public static GearType fromOrdinal(int ordinal) { + public static GearTypePersist fromOrdinal(int ordinal) { - GearType result = null; - for (GearType gearType : values()) { + GearTypePersist result = null; + for (GearTypePersist gearType : values()) { if (ordinal == gearType.ordinal()) { result = gearType; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatus.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java similarity index 96% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatus.java rename to observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java index 37e1683..ce7593c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatus.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java @@ -28,7 +28,7 @@ package fr.ird.observe.entities.constants; * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ -public enum ReferenceStatus { +public enum ReferenceStatusPersist { /** status desactive */ disabled, diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointPersistType.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java similarity index 96% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointPersistType.java rename to observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java index 331d0e5..1c4ca5d 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointPersistType.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java @@ -28,7 +28,7 @@ import static org.nuiton.i18n.I18n.t; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public enum TripMapPointPersistType { +public enum TripMapPointTypePersist { SEINE_DEPARTURE_HARBOUR(n("observe.map.seine.harbour.departure")), SEINE_LANDING_HARBOUR(n("observe.map.seine.harbour.landing")), @@ -48,7 +48,7 @@ public enum TripMapPointPersistType { String label; - TripMapPointPersistType(String label) { + TripMapPointTypePersist(String label) { this.label = label; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java similarity index 93% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java rename to observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java index e3c1523..9fcb672 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java @@ -31,7 +31,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.0 */ -public enum NonTargetCatchComputedValueSource { +public enum NonTargetCatchComputedValueSourcePersist { /** * Donnée directement calculée à partir d'autre données de la capture. @@ -54,7 +54,7 @@ public enum NonTargetCatchComputedValueSource { private final String i18nKey; - NonTargetCatchComputedValueSource(String i18nKey) { + NonTargetCatchComputedValueSourcePersist(String i18nKey) { this.i18nKey = i18nKey; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java similarity index 85% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java rename to observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java index c0572a7..5f4b503 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java @@ -29,7 +29,7 @@ import static org.nuiton.i18n.I18n.t; * * @author Tony Chemit - chemit@codelutin.com */ -public enum Ownership implements Comparable<Ownership> { +public enum OwnershipPersist implements Comparable<OwnershipPersist> { /** inconnue */ unknown(n("observe.ownership.unknown")), @@ -42,7 +42,7 @@ public enum Ownership implements Comparable<Ownership> { private String i18nKey; - Ownership(String i18nKey) { + OwnershipPersist(String i18nKey) { this.i18nKey = i18nKey; } @@ -55,15 +55,15 @@ public enum Ownership implements Comparable<Ownership> { return t(i18nKey); } - public static Ownership valueOf(int ordinal) + public static OwnershipPersist valueOf(int ordinal) throws IllegalArgumentException { - for (Ownership o : values()) { + for (OwnershipPersist o : values()) { if (o.ordinal() == ordinal) { return o; } } throw new IllegalArgumentException( - "could not find a " + Ownership.class.getSimpleName() + + "could not find a " + OwnershipPersist.class.getSimpleName() + " value for ordinal " + ordinal); } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java similarity index 95% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java rename to observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java index 7da4d02..77cd003 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java @@ -30,7 +30,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.5 */ -public enum SchoolType { +public enum SchoolTypePersist { /** banc indéterminé (valeur par défaut) // was 3 before version 4.0 */ undefined(n("observe.schoolType.undefined")), @@ -43,7 +43,7 @@ public enum SchoolType { private String i18nKey; - SchoolType(String i18nKey) { + SchoolTypePersist(String i18nKey) { this.i18nKey = i18nKey; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java similarity index 86% rename from observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java rename to observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java index 80c4a9b..60f8445 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java @@ -25,7 +25,7 @@ import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @author Tony Chemit - chemit@codelutin.com */ -public enum TypeTransmittingBuoyOperation { +public enum TypeTransmittingBuoyOperationPersist { // pas de balise lue pasDeBalise(n("observe.typeTransmittingBuoyOperation.no.balise")), @@ -46,7 +46,7 @@ public enum TypeTransmittingBuoyOperation { /** le count de balises lues */ private int nbBalises; - TypeTransmittingBuoyOperation(String i18nKey, String... codeOperation) { + TypeTransmittingBuoyOperationPersist(String i18nKey, String... codeOperation) { this.i18nKey = i18nKey; this.codeOperation = codeOperation; nbBalises = codeOperation.length; @@ -69,16 +69,16 @@ public enum TypeTransmittingBuoyOperation { return t(i18nKey); } - public static TypeTransmittingBuoyOperation valueOf(int ordinal) + public static TypeTransmittingBuoyOperationPersist valueOf(int ordinal) throws IllegalArgumentException { - for (TypeTransmittingBuoyOperation o : values()) { + for (TypeTransmittingBuoyOperationPersist o : values()) { if (o.ordinal() == ordinal) { return o; } } throw new IllegalArgumentException( "could not find a " + - TypeTransmittingBuoyOperation.class.getSimpleName() + + TypeTransmittingBuoyOperationPersist.class.getSimpleName() + " value for ordinal " + ordinal); } } 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 9b0ab9c..b8ba4e3 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 @@ -24,7 +24,7 @@ package fr.ird.observe.entities.longline; import com.google.common.collect.Lists; import fr.ird.observe.entities.TripMapPoint; -import fr.ird.observe.entities.constants.TripMapPointPersistType; +import fr.ird.observe.entities.constants.TripMapPointTypePersist; import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.Person; @@ -93,7 +93,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl departurePoint.setTime(tripLongline.getStartDate()); departurePoint.setLatitude(departureHarbour.getLatitude()); departurePoint.setLongitude(departureHarbour.getLongitude()); - departurePoint.setType(TripMapPointPersistType.LONGLINE_IN_HARBOUR); + departurePoint.setType(TripMapPointTypePersist.LONGLINE_IN_HARBOUR); tripMapPoints.add(departurePoint); } @@ -113,7 +113,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl landingPoint.setTime(tripLongline.getEndDate()); landingPoint.setLatitude(landingHarbour.getLatitude()); landingPoint.setLongitude(landingHarbour.getLongitude()); - landingPoint.setType(TripMapPointPersistType.LONGLINE_IN_HARBOUR); + landingPoint.setType(TripMapPointTypePersist.LONGLINE_IN_HARBOUR); tripMapPoints.add(landingPoint); } @@ -173,13 +173,13 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl String vesselActivityId = resultSet.getString(4); if (vesselActivityId == null) { - activity.setType(TripMapPointPersistType.LONGLINE_ACTIVITY); + activity.setType(TripMapPointTypePersist.LONGLINE_ACTIVITY); } else if (ACTIVITY_INTERACTION_ID.equals(vesselActivityId)) { - activity.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_INTERACTION); + activity.setType(TripMapPointTypePersist.LONGLINE_ACTIVITY_WITH_INTERACTION); } else if (ACTIVITY_STATION_ID.equals(vesselActivityId)) { - activity.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_STATION); + activity.setType(TripMapPointTypePersist.LONGLINE_ACTIVITY_WITH_STATION); } else { - activity.setType(TripMapPointPersistType.LONGLINE_ACTIVITY); + activity.setType(TripMapPointTypePersist.LONGLINE_ACTIVITY); } result.add(activity); @@ -191,7 +191,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl settingStart.setTime(resultSet.getDate(5)); settingStart.setLatitude(resultSet.getFloat(6)); settingStart.setLongitude(resultSet.getFloat(7)); - settingStart.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_SETTING_START); + settingStart.setType(TripMapPointTypePersist.LONGLINE_ACTIVITY_WITH_SETTING_START); result.add(settingStart); } @@ -201,7 +201,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl settingEnd.setTime(resultSet.getDate(8)); settingEnd.setLatitude(resultSet.getFloat(9)); settingEnd.setLongitude(resultSet.getFloat(10)); - settingEnd.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_SETTING_END); + settingEnd.setType(TripMapPointTypePersist.LONGLINE_ACTIVITY_WITH_SETTING_END); result.add(settingEnd); } @@ -211,7 +211,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl haulingStart.setTime(resultSet.getDate(11)); haulingStart.setLatitude(resultSet.getFloat(12)); haulingStart.setLongitude(resultSet.getFloat(13)); - haulingStart.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_HAULING_START); + haulingStart.setType(TripMapPointTypePersist.LONGLINE_ACTIVITY_WITH_HAULING_START); result.add(haulingStart); } @@ -221,7 +221,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl haulingEnd.setTime(resultSet.getDate(14)); haulingEnd.setLatitude(resultSet.getFloat(15)); haulingEnd.setLongitude(resultSet.getFloat(16)); - haulingEnd.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_HAULING_END); + haulingEnd.setType(TripMapPointTypePersist.LONGLINE_ACTIVITY_WITH_HAULING_END); result.add(haulingEnd); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java index a15c73a..a444709 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java @@ -25,7 +25,7 @@ package fr.ird.observe.entities.referentiel; import com.google.common.base.Predicate; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.constants.ReferenceStatus; +import fr.ird.observe.entities.constants.ReferenceStatusPersist; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; @@ -45,7 +45,7 @@ public class ObserveReferentialEntities { @Override public boolean apply(ObserveReferentialEntity input) { - return ReferenceStatus.disabled != input.getStatus(); + return ReferenceStatusPersist.disabled != input.getStatus(); } }; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java index 0322566..24e641c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.referentiel; * #L% */ -import fr.ird.observe.entities.constants.ReferenceStatus; +import fr.ird.observe.entities.constants.ReferenceStatusPersist; public abstract class ObserveReferentialEntityImpl extends ObserveReferentialEntityAbstract { @@ -30,12 +30,12 @@ public abstract class ObserveReferentialEntityImpl extends ObserveReferentialEnt @Override public boolean isEnabled() { - return ReferenceStatus.enabled == getStatus(); + return ReferenceStatusPersist.enabled == getStatus(); } @Override public boolean isDisabled() { - return ReferenceStatus.disabled == getStatus(); + return ReferenceStatusPersist.disabled == getStatus(); } } 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 a5dae79..3b163f3 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 @@ -22,7 +22,7 @@ package fr.ird.observe.entities.referentiel; * #L% */ -import fr.ird.observe.entities.constants.GearType; +import fr.ird.observe.entities.constants.GearTypePersist; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -106,7 +106,7 @@ public class ProgramTopiaDao extends AbstractProgramTopiaDao<Program> { program.setTopiaId(set.getString(1)); int gearTypeOrdinal = set.getInt(2); - GearType gearType = GearType.fromOrdinal(gearTypeOrdinal); + GearTypePersist gearType = GearTypePersist.fromOrdinal(gearTypeOrdinal); program.setGearType(gearType); String label = set.getString(3); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java index f577332..8645ba9 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.referentiel; * #L% */ -import fr.ird.observe.entities.constants.GearType; +import fr.ird.observe.entities.constants.GearTypePersist; import java.util.Collections; import java.util.Comparator; @@ -59,11 +59,11 @@ public class Programs { } public static boolean isProgramLongline(Program program) { - return GearType.longline.equals(program.getGearType()); + return GearTypePersist.longline.equals(program.getGearType()); } public static boolean isProgramSeine(Program program) { - return GearType.seine.equals(program.getGearType()); + return GearTypePersist.seine.equals(program.getGearType()); } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java index bbfd092..4068ef2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java @@ -23,7 +23,7 @@ package fr.ird.observe.entities.seine; import com.google.common.base.MoreObjects; import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.type.CoordinateHelper; import org.apache.commons.logging.Log; @@ -143,8 +143,8 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { } @Override - public SchoolType getSchoolType() { - SchoolType type = ActivitySeines.getSchoolType(this); + public SchoolTypePersist getSchoolType() { + SchoolTypePersist type = ActivitySeines.getSchoolType(this); return type; } 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 634be0e..2bd5681 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,7 +24,7 @@ package fr.ird.observe.entities.seine; import com.google.common.base.Predicate; import com.google.common.collect.Lists; -import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.seine.ObservedSystem; import org.apache.commons.logging.Log; @@ -130,14 +130,14 @@ public class ActivitySeines { * @return le type de banc a appliquer * @since 1.5 */ - public static SchoolType getSchoolType(ActivitySeine a) { + public static SchoolTypePersist getSchoolType(ActivitySeine a) { // par defaut, on suppose que la set est sur BL - SchoolType type = SchoolType.libre; + SchoolTypePersist type = SchoolTypePersist.libre; if (!a.isObservedSystemEmpty()) { - SchoolType boCode = SchoolType.objet; + SchoolTypePersist boCode = SchoolTypePersist.objet; // des systèmes observés sont connus, si un des système est sur // banc objet, alors la set est considérée sur BO @@ -145,7 +145,7 @@ public class ActivitySeines { if (boCode == s.getSchoolType()) { // set sur BO - type = SchoolType.objet; + type = SchoolTypePersist.objet; break; } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java index dcca89f..e802ec2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.seine; import com.google.common.collect.Iterables; -import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation; +import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPersist; import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; /** Implantation des objectOperations pour l'entité FloatingObject. */ @@ -33,15 +33,15 @@ public class FloatingObjectImpl extends FloatingObjectAbstract { /** * Récupère le type d'objectOperation effectué sur les balises du DCP. * - * @return l'ordinal de l'énumeration {@link TypeTransmittingBuoyOperation} - * @see TypeTransmittingBuoyOperation + * @return l'ordinal de l'énumeration {@link TypeTransmittingBuoyOperationPersist} + * @see TypeTransmittingBuoyOperationPersist */ @Override - public TypeTransmittingBuoyOperation getTypeTransmittingBuoyOperation() { + public TypeTransmittingBuoyOperationPersist getTypeTransmittingBuoyOperation() { if (isTransmittingBuoyEmpty()) { // pas de balise lié au dcp. - return TypeTransmittingBuoyOperation.pasDeBalise; + return TypeTransmittingBuoyOperationPersist.pasDeBalise; } if (transmittingBuoy.size() == 1) { @@ -55,15 +55,15 @@ public class FloatingObjectImpl extends FloatingObjectAbstract { case 1: // visite - return TypeTransmittingBuoyOperation.visite; + return TypeTransmittingBuoyOperationPersist.visite; case 2: // recuperation - return TypeTransmittingBuoyOperation.recuperation; + return TypeTransmittingBuoyOperationPersist.recuperation; case 3: // mise a l'eau d'une nouvelle balise - return TypeTransmittingBuoyOperation.pose; + return TypeTransmittingBuoyOperationPersist.pose; default: throw new IllegalStateException("objectOperation must be between 1 to 3, but was " + objectOperation.getCode()); } @@ -72,7 +72,7 @@ public class FloatingObjectImpl extends FloatingObjectAbstract { // deux balises lues pour le DCP, on peut avoir un seul cas : // - récupération et remplacement - return TypeTransmittingBuoyOperation.recuperationEtRemplacement; + return TypeTransmittingBuoyOperationPersist.recuperationEtRemplacement; } throw new IllegalStateException("on a dcp, can only have 0, 1 or 2 balise lues"); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java index a55328e..b3978fa 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.entities.seine; -import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; +import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSourcePersist; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -64,7 +64,7 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract { @Override public void setLengthSource(boolean lengthSource) { - setMeanLengthComputedSource(NonTargetCatchComputedValueSource.FROM_DATA); + setMeanLengthComputedSource(NonTargetCatchComputedValueSourcePersist.FROM_DATA); } @Override @@ -84,7 +84,7 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract { @Override public void setWeightSource(boolean weightSource) { - setMeanWeightComputedSource(NonTargetCatchComputedValueSource.FROM_DATA); + setMeanWeightComputedSource(NonTargetCatchComputedValueSourcePersist.FROM_DATA); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java index 6b66572..7847273 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.entities.seine; -import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import org.nuiton.util.DateUtil; import org.nuiton.util.NumberUtil; @@ -140,17 +140,17 @@ public class SetSeineImpl extends SetSeineAbstract { @Override public boolean isFreeSchoolType() { - return schoolType != null && SchoolType.libre == schoolType; + return schoolType != null && SchoolTypePersist.libre == schoolType; } @Override public boolean isSchoolObjectType() { - return schoolType != null && SchoolType.objet == schoolType; + return schoolType != null && SchoolTypePersist.objet == schoolType; } @Override public boolean isUnknownSchoolType() { - return schoolType != null && SchoolType.undefined == schoolType; + return schoolType != null && SchoolTypePersist.undefined == schoolType; } @Override 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 15177a2..a5e4c60 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 @@ -22,8 +22,8 @@ package fr.ird.observe.entities.seine; import fr.ird.observe.entities.TripMapPoint; -import fr.ird.observe.entities.constants.TripMapPointPersistType; -import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.constants.TripMapPointTypePersist; +import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.Person; @@ -94,7 +94,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { departurePoint.setTime(tripSeine.getStartDate()); departurePoint.setLatitude(departureHarbour.getLatitude()); departurePoint.setLongitude(departureHarbour.getLongitude()); - departurePoint.setType(TripMapPointPersistType.SEINE_DEPARTURE_HARBOUR); + departurePoint.setType(TripMapPointTypePersist.SEINE_DEPARTURE_HARBOUR); tripMapPoints.add(departurePoint); } @@ -109,7 +109,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { landingPoint.setTime(tripSeine.getEndDate()); landingPoint.setLatitude(landingHarbour.getLatitude()); landingPoint.setLongitude(landingHarbour.getLongitude()); - landingPoint.setType(TripMapPointPersistType.SEINE_LANDING_HARBOUR); + landingPoint.setType(TripMapPointTypePersist.SEINE_LANDING_HARBOUR); tripMapPoints.add(landingPoint); } @@ -155,20 +155,20 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { point.setLatitude(resultSet.getFloat(3)); point.setLongitude(resultSet.getFloat(4)); if (ACTIVITY_HARBOUR_ID.equals(resultSet.getString(5))) { - point.setType(TripMapPointPersistType.SEINE_ACTIVITY_IN_HARBOUR); + point.setType(TripMapPointTypePersist.SEINE_ACTIVITY_IN_HARBOUR); } else if (resultSet.getString(6) == null) { - point.setType(TripMapPointPersistType.SEINE_ACTIVITY); + point.setType(TripMapPointTypePersist.SEINE_ACTIVITY); } else { - SchoolType schoolType = SchoolType.values()[resultSet.getInt(6)]; + SchoolTypePersist schoolType = SchoolTypePersist.values()[resultSet.getInt(6)]; switch (schoolType) { case libre: - point.setType(TripMapPointPersistType.SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE); + point.setType(TripMapPointTypePersist.SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE); break; case objet: - point.setType(TripMapPointPersistType.SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE); + point.setType(TripMapPointTypePersist.SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE); break; default: - point.setType(TripMapPointPersistType.SEINE_ACTIVITY); + point.setType(TripMapPointTypePersist.SEINE_ACTIVITY); } } diff --git a/observe-entities/src/main/xmi/observe-common.zargo b/observe-entities/src/main/xmi/observe-common.zargo index 6816ec0..1a0614c 100644 Binary files a/observe-entities/src/main/xmi/observe-common.zargo and b/observe-entities/src/main/xmi/observe-common.zargo differ diff --git a/observe-entities/src/main/xmi/observe-seine.zargo b/observe-entities/src/main/xmi/observe-seine.zargo index 0a7451d..4132971 100644 Binary files a/observe-entities/src/main/xmi/observe-seine.zargo and b/observe-entities/src/main/xmi/observe-seine.zargo differ diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java index 47c9906..c64da55 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java @@ -38,7 +38,7 @@ public class FloatingObjectTransmittingBuoyDto extends AbstractFloatingObjectTra case 2: // recuperation - return TypeTransmittingBuoyOperation.recupeNration; + return TypeTransmittingBuoyOperation.recuperation; case 3: // mise a l'eau d'une nouvelle balise diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java index a798046..05e79bf 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java @@ -3,14 +3,22 @@ package fr.ird.observe.services.binder; import com.google.common.base.Function; import com.google.common.collect.Iterables; import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.constants.ReferenceStatus; +import fr.ird.observe.entities.constants.GearTypePersist; +import fr.ird.observe.entities.constants.ReferenceStatusPersist; +import fr.ird.observe.entities.constants.TripMapPointTypePersist; +import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSourcePersist; +import fr.ird.observe.entities.constants.seine.OwnershipPersist; +import fr.ird.observe.entities.constants.seine.SchoolTypePersist; +import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPersist; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.I18nReferentialEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.GearType; +import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.constants.TripMapPointType; import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource; import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.SchoolType; @@ -34,99 +42,115 @@ import java.util.List; */ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { - protected static final Function<GearType, fr.ird.observe.entities.constants.GearType> GEAR_TYPE_TO_ENTITY = new Function<GearType, fr.ird.observe.entities.constants.GearType>() { + protected static final Function<TripMapPointType, TripMapPointTypePersist> TRIP_MAP_POINT_TO_ENTITY = new Function<TripMapPointType, TripMapPointTypePersist>() { @Override - public fr.ird.observe.entities.constants.GearType apply(GearType input) { - return fr.ird.observe.entities.constants.GearType.valueOf(input.name()); + public TripMapPointTypePersist apply(TripMapPointType input) { + return TripMapPointTypePersist.valueOf(input.name()); } }; - protected static final Function<fr.ird.observe.services.dto.constants.ReferenceStatus, ReferenceStatus> REFERENCE_STATUS_TO_ENTITY = new Function<fr.ird.observe.services.dto.constants.ReferenceStatus, ReferenceStatus>() { + protected static final Function<GearType, GearTypePersist> GEAR_TYPE_TO_ENTITY = new Function<GearType, GearTypePersist>() { @Override - public ReferenceStatus apply(fr.ird.observe.services.dto.constants.ReferenceStatus input) { - return ReferenceStatus.valueOf(input.name()); + public GearTypePersist apply(GearType input) { + return GearTypePersist.valueOf(input.name()); } }; - protected static final Function<Ownership, fr.ird.observe.entities.constants.seine.Ownership> OWNERSHIP_TO_ENTITY = new Function<Ownership, fr.ird.observe.entities.constants.seine.Ownership>() { + protected static final Function<ReferenceStatus, ReferenceStatusPersist> REFERENCE_STATUS_TO_ENTITY = new Function<ReferenceStatus, ReferenceStatusPersist>() { @Override - public fr.ird.observe.entities.constants.seine.Ownership apply(Ownership input) { - return input == null ? null : fr.ird.observe.entities.constants.seine.Ownership.valueOf(input.name()); + public ReferenceStatusPersist apply(ReferenceStatus input) { + return ReferenceStatusPersist.valueOf(input.name()); } }; - protected static final Function<SchoolType, fr.ird.observe.entities.constants.seine.SchoolType> SCHOOL_TYPE_TO_ENTITY = new Function<SchoolType, fr.ird.observe.entities.constants.seine.SchoolType>() { + protected static final Function<Ownership, OwnershipPersist> OWNERSHIP_TO_ENTITY = new Function<Ownership, OwnershipPersist>() { @Override - public fr.ird.observe.entities.constants.seine.SchoolType apply(SchoolType input) { - return input == null ? null : fr.ird.observe.entities.constants.seine.SchoolType.valueOf(input.name()); + public OwnershipPersist apply(Ownership input) { + return input == null ? null : OwnershipPersist.valueOf(input.name()); } }; - protected static final Function<TypeTransmittingBuoyOperation, fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation> TYPE_TRANSMITTING_BUOY_OPERATION_TO_ENTITY = new Function<TypeTransmittingBuoyOperation, fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation>() { + protected static final Function<SchoolType, SchoolTypePersist> SCHOOL_TYPE_TO_ENTITY = new Function<SchoolType, SchoolTypePersist>() { @Override - public fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation apply(TypeTransmittingBuoyOperation input) { - return input == null ? null : fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation.valueOf(input.name()); + public SchoolTypePersist apply(SchoolType input) { + return input == null ? null : SchoolTypePersist.valueOf(input.name()); } }; - protected static final Function<NonTargetCatchComputedValueSource, fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource> NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_ENTITY = new Function<NonTargetCatchComputedValueSource, fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource>() { + protected static final Function<TypeTransmittingBuoyOperation, TypeTransmittingBuoyOperationPersist> TYPE_TRANSMITTING_BUOY_OPERATION_TO_ENTITY = new Function<TypeTransmittingBuoyOperation, TypeTransmittingBuoyOperationPersist>() { @Override - public fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource apply(NonTargetCatchComputedValueSource input) { - return input == null ? null : fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource.valueOf(input.name()); + public TypeTransmittingBuoyOperationPersist apply(TypeTransmittingBuoyOperation input) { + return input == null ? null : TypeTransmittingBuoyOperationPersist.valueOf(input.name()); } }; - protected static final Function<fr.ird.observe.entities.constants.GearType, fr.ird.observe.services.dto.constants.GearType> GEAR_TYPE_TO_DTO = new Function<fr.ird.observe.entities.constants.GearType, fr.ird.observe.services.dto.constants.GearType>() { + protected static final Function<NonTargetCatchComputedValueSource, NonTargetCatchComputedValueSourcePersist> NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_ENTITY = new Function<NonTargetCatchComputedValueSource, NonTargetCatchComputedValueSourcePersist>() { @Override - public fr.ird.observe.services.dto.constants.GearType apply(fr.ird.observe.entities.constants.GearType input) { - return input == null ? null : fr.ird.observe.services.dto.constants.GearType.valueOf(input.name()); + public NonTargetCatchComputedValueSourcePersist apply(NonTargetCatchComputedValueSource input) { + return input == null ? null : NonTargetCatchComputedValueSourcePersist.valueOf(input.name()); } }; - protected static final Function<ReferenceStatus, fr.ird.observe.services.dto.constants.ReferenceStatus> REFERENCE_STATUS_TO_DTO = new Function<ReferenceStatus, fr.ird.observe.services.dto.constants.ReferenceStatus>() { + protected static final Function<TripMapPointTypePersist, TripMapPointType> TRIP_MAP_POINT_TO_DTO = new Function<TripMapPointTypePersist, TripMapPointType>() { @Override - public fr.ird.observe.services.dto.constants.ReferenceStatus apply(ReferenceStatus input) { - return input == null ? null : fr.ird.observe.services.dto.constants.ReferenceStatus.valueOf(input.name()); + public TripMapPointType apply(TripMapPointTypePersist input) { + return TripMapPointType.valueOf(input.name()); } }; - protected static final Function<fr.ird.observe.entities.constants.seine.Ownership, fr.ird.observe.services.dto.constants.seine.Ownership> OWNERSHIP_TO_DTO = new Function<fr.ird.observe.entities.constants.seine.Ownership, fr.ird.observe.services.dto.constants.seine.Ownership>() { + protected static final Function<GearTypePersist, GearType> GEAR_TYPE_TO_DTO = new Function<GearTypePersist, GearType>() { @Override - public fr.ird.observe.services.dto.constants.seine.Ownership apply(fr.ird.observe.entities.constants.seine.Ownership input) { - return input == null ? null : fr.ird.observe.services.dto.constants.seine.Ownership.valueOf(input.name()); + public GearType apply(GearTypePersist input) { + return input == null ? null : GearType.valueOf(input.name()); } }; - protected static final Function<fr.ird.observe.entities.constants.seine.SchoolType, fr.ird.observe.services.dto.constants.seine.SchoolType> SCHOOL_TYPE_TO_DTO = new Function<fr.ird.observe.entities.constants.seine.SchoolType, fr.ird.observe.services.dto.constants.seine.SchoolType>() { + protected static final Function<ReferenceStatusPersist, ReferenceStatus> REFERENCE_STATUS_TO_DTO = new Function<ReferenceStatusPersist, ReferenceStatus>() { @Override - public fr.ird.observe.services.dto.constants.seine.SchoolType apply(fr.ird.observe.entities.constants.seine.SchoolType input) { - return input == null ? null : fr.ird.observe.services.dto.constants.seine.SchoolType.valueOf(input.name()); + public ReferenceStatus apply(ReferenceStatusPersist input) { + return input == null ? null : ReferenceStatus.valueOf(input.name()); } }; -// protected static final Function<fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation, fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation> TRANSMITTING_BUOY_OPERATION_TO_DTO = new Function<fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation, fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation>() { + protected static final Function<OwnershipPersist, Ownership> OWNERSHIP_TO_DTO = new Function<OwnershipPersist, Ownership>() { + + @Override + public Ownership apply(OwnershipPersist input) { + return input == null ? null : Ownership.valueOf(input.name()); + } + }; + + protected static final Function<SchoolTypePersist, SchoolType> SCHOOL_TYPE_TO_DTO = new Function<SchoolTypePersist, SchoolType>() { + + @Override + public SchoolType apply(SchoolTypePersist input) { + return input == null ? null : SchoolType.valueOf(input.name()); + } + }; + +// protected static final Function<fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPersist, fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationPersist> TRANSMITTING_BUOY_OPERATION_TO_DTO = new Function<fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPersist, fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationPersist>() { // // @Override -// public fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation apply(fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation input) { -// return input == null ? null : fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.valueOf(input.name()); +// public fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationPersist apply(fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPersist input) { +// return input == null ? null : fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationPersist.valueOf(input.name()); // } // }; - protected static final Function<fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource, fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource> NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_DTO = new Function<fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource, fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource>() { + protected static final Function<NonTargetCatchComputedValueSourcePersist, NonTargetCatchComputedValueSource> NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_DTO = new Function<NonTargetCatchComputedValueSourcePersist, NonTargetCatchComputedValueSource>() { @Override - public fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource apply(fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource input) { - return input == null ? null : fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.valueOf(input.name()); + public NonTargetCatchComputedValueSource apply(NonTargetCatchComputedValueSourcePersist input) { + return input == null ? null : NonTargetCatchComputedValueSource.valueOf(input.name()); } }; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java index 313a49d..58331b2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.entities.referentiel.Sex; @@ -208,7 +208,7 @@ public class ConsolidateActivitySeineDataResultBuilder { return this; } - public ConsolidateActivitySeineDataResultBuilder setSchoolTypeChanged(SchoolType oldSchoolType, SchoolType newSchoolType) { + public ConsolidateActivitySeineDataResultBuilder setSchoolTypeChanged(SchoolTypePersist oldSchoolType, SchoolTypePersist newSchoolType) { this.oldSchoolType = l(locale, oldSchoolType.getI18nKey()); this.newSchoolType = l(locale, newSchoolType.getI18nKey()); return this; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java index 35697b1..1b3c9a5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -27,8 +27,8 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaDaoSupplier; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.LengthWeightComputable; -import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; -import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSourcePersist; +import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.LengthWeightParameterNotFoundException; import fr.ird.observe.entities.referentiel.LengthWeightParameters; @@ -119,7 +119,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements return lengthWeightParameter; } - public void setSchoolTypeChanged(SchoolType oldSchoolType, SchoolType newSchoolType) { + public void setSchoolTypeChanged(SchoolTypePersist oldSchoolType, SchoolTypePersist newSchoolType) { resultBuilder.setSchoolTypeChanged(oldSchoolType, newSchoolType); } @@ -284,8 +284,8 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements } SetSeine setSeine = activity.getSetSeine(); - SchoolType oldSchoolType = setSeine.getSchoolType(); - SchoolType newSchoolType = activity.getSchoolType(); + SchoolTypePersist oldSchoolType = setSeine.getSchoolType(); + SchoolTypePersist newSchoolType = activity.getSchoolType(); if (oldSchoolType == null || oldSchoolType != newSchoolType) { // le type de banc a changé, on doit sauver l'activité @@ -452,7 +452,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements // on essaye de calculer la taille moyenne à partir des échantillons - NonTargetCatchComputedValueSource computedSource = null; + NonTargetCatchComputedValueSourcePersist computedSource = null; if (CollectionUtils.isNotEmpty(samples)) { @@ -474,7 +474,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements meanLength = totalLength / totalCount; - computedSource = NonTargetCatchComputedValueSource.FROM_SAMPLE; + computedSource = NonTargetCatchComputedValueSourcePersist.FROM_SAMPLE; } } @@ -483,7 +483,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements // on prend directement la valeur fournie par le référentiel meanLength = lengthWeightParameter.getMeanLength(); - computedSource = NonTargetCatchComputedValueSource.FROM_REFERENTIEL; + computedSource = NonTargetCatchComputedValueSourcePersist.FROM_REFERENTIEL; } if (meanLength != null) { @@ -530,7 +530,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements if (totalCount != 0) { nonTargetCatch.setTotalCount(totalCount); - nonTargetCatch.setTotalCountComputedSource(NonTargetCatchComputedValueSource.FROM_SAMPLE); + nonTargetCatch.setTotalCountComputedSource(NonTargetCatchComputedValueSourcePersist.FROM_SAMPLE); } } @@ -552,14 +552,14 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements if (nonTargetCatch.getMeanLength() == null) { nonTargetCatch.setMeanLength(lengthWeightParameter.getMeanLength()); - nonTargetCatch.setMeanLengthComputedSource(NonTargetCatchComputedValueSource.FROM_REFERENTIEL); + nonTargetCatch.setMeanLengthComputedSource(NonTargetCatchComputedValueSourcePersist.FROM_REFERENTIEL); } if (nonTargetCatch.getMeanWeight() == null) { nonTargetCatch.setMeanWeight(lengthWeightParameter.getMeanWeight()); - nonTargetCatch.setMeanWeightComputedSource(NonTargetCatchComputedValueSource.FROM_REFERENTIEL); + nonTargetCatch.setMeanWeightComputedSource(NonTargetCatchComputedValueSourcePersist.FROM_REFERENTIEL); } @@ -584,7 +584,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements // calcul le weight poids à partir de nb estime et du poids moyen catchWeight = meanWeight * (float) totalCount / 1000; nonTargetCatch.setCatchWeight(catchWeight); - nonTargetCatch.setCatchWeightComputedSource(NonTargetCatchComputedValueSource.FROM_DATA); + nonTargetCatch.setCatchWeightComputedSource(NonTargetCatchComputedValueSourcePersist.FROM_DATA); } @@ -593,19 +593,19 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements // calcul le nb estime à partir du poids estime et du poids moyen totalCount = (int) ((float) 1000 * catchWeight / meanWeight); nonTargetCatch.setTotalCount(totalCount); - nonTargetCatch.setTotalCountComputedSource(NonTargetCatchComputedValueSource.FROM_DATA); + nonTargetCatch.setTotalCountComputedSource(NonTargetCatchComputedValueSourcePersist.FROM_DATA); } if (meanWeight == null && totalCount != null && totalCount != 0 && catchWeight != null && - !NonTargetCatchComputedValueSource.FROM_SAMPLE.equals(nonTargetCatch.getTotalCountComputedSource())) { + !NonTargetCatchComputedValueSourcePersist.FROM_SAMPLE.equals(nonTargetCatch.getTotalCountComputedSource())) { // calcul le poids moyen à partir de nb estime et du poids estime // uniquement si le nombre estimé ne vient pas des échantillons (voir http://forge.codelutin.com/issues/4670) meanWeight = catchWeight * (float) 1000 / (float) totalCount; nonTargetCatch.setMeanWeight(meanWeight); - nonTargetCatch.setMeanWeightComputedSource(NonTargetCatchComputedValueSource.FROM_DATA); + nonTargetCatch.setMeanWeightComputedSource(NonTargetCatchComputedValueSourcePersist.FROM_DATA); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java index c2b0bce..a3cd355 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.service.seine; * #L% */ -import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.SetSeine; @@ -106,7 +106,7 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein preCreated.setEndPursingDate(routeDate); // recuperation du type de set a partir de l'activity - SchoolType schoolType = activitySeine.getSchoolType(); + SchoolTypePersist schoolType = activitySeine.getSchoolType(); preCreated.setSchoolType(schoolType); Form<SetSeineDto> form = dataEntityToForm(SetSeineDto.class, diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java b/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java index 563339d..701393e 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java @@ -25,7 +25,7 @@ import com.google.common.base.Optional; import com.opensymphony.xwork2.interceptor.annotations.After; import fr.ird.observe.ObserveTopiaDaoSupplier; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.constants.ReferenceStatus; +import fr.ird.observe.entities.constants.ReferenceStatusPersist; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import org.apache.commons.logging.Log; @@ -118,7 +118,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { entity.setOcean(ocean); entity.setStartDate(startDate); entity.setEndDate(endDate); - entity.setStatus(ReferenceStatus.enabled); + entity.setStatus(ReferenceStatusPersist.enabled); entity.setCoefficients("a=3.8E-5:b=2.78"); entity.setLengthWeightFormula("a * Math.pow(L, b)"); entity.setWeightLengthFormula("Math.pow(P/a, 1/b)"); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.