[Observe-commits] 01/01: Renommage ReferenceEntity en ReferentialEntity + introduction ObserveEntity et ObserveDataEntity

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour in repository tutti. See http://git.codelutin.com/tutti.git commit 591e7e25defe60de12a5b33984ca58747a3f7d2c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 25 16:08:43 2015 +0100 Renommage ReferenceEntity en ReferentialEntity + introduction ObserveEntity et ObserveDataEntity --- .../referentiel/I18nReferenceEntities.java | 4 +-- .../entities/referentiel/ReferenceEntities.java | 14 ++++---- ...eEntityImpl.java => ReferentialEntityImpl.java} | 2 +- observe-entities/src/main/xmi/observe-common.zargo | Bin 37617 -> 37215 bytes .../src/main/xmi/observe-longline.zargo | Bin 96937 -> 93445 bytes .../ird/observe/services/ObserveServiceTopia.java | 24 +++++++------- .../ird/observe/services/binder/BinderEngine.java | 26 +++++++-------- .../services/binder/BinderEngineInitializer.java | 16 ++++----- .../ird/observe/services/binder/BinderSupport.java | 14 ++++---- .../binder/data/ActivityLonglineBinder.java | 5 ++- .../data/ActivityLonglineEncouterDtoBinder.java | 4 +-- .../data/ActivityLonglineSensorUsedDtoBinder.java | 4 +-- .../services/binder/data/ActivitySeineBinder.java | 5 ++- .../data/ActivitySeineObservedSystemDtoBinder.java | 4 +-- .../binder/data/ActivitySeineStubDtoBinder.java | 2 +- .../observe/services/binder/data/RouteBinder.java | 8 ++--- .../services/binder/data/SetLonglineBinder.java | 8 ++--- .../binder/data/SetLonglineCatchDtoBinder.java | 4 +-- .../SetLonglineDetailCompositionDtoBinder.java | 4 +-- .../SetLonglineGlobalCompositionDtoBinder.java | 4 +-- .../binder/data/SetLonglineTdrDtoBinder.java | 4 +-- .../services/binder/data/SetSeineBinder.java | 8 ++--- .../data/SetSeineSchoolEstimateDtoBinder.java | 4 +-- .../binder/data/SetSeineTargetCatchDtoBinder.java | 4 +-- .../services/binder/data/TripLonglineBinder.java | 4 +-- .../binder/data/TripLonglineGearUseDtoBinder.java | 4 +-- .../services/binder/data/TripSeineBinder.java | 4 +-- .../binder/data/TripSeineGearUseDtoBinder.java | 4 +-- .../referential/ReferentialBinderSupport.java | 20 ++++++------ .../services/entity/EntitiesSetFactory.java | 4 +-- .../services/service/ReferentialServiceTopia.java | 36 ++++++++++----------- .../service/actions/report/ReportServiceTopia.java | 6 ++-- .../GenerateValidatorDescriptorsFileTool.java | 4 +-- .../actions/validate/ValidateServiceTopia.java | 14 ++++---- .../service/longline/BranchlineServiceTopia.java | 2 +- .../referentiel/LengthWeightParemetersTest.java | 2 +- .../services/binder/BinderEngineMetadataTest.java | 26 +++++++-------- .../observe/services/binder/BinderEngineTest.java | 8 ++--- .../service/ReferentialServiceTopiaTest.java | 4 +-- .../service/seine/TripSeineServiceTopiaTest.java | 8 ++--- 40 files changed, 160 insertions(+), 162 deletions(-) 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 67a2f91..e52b59e 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 @@ -47,7 +47,7 @@ public class I18nReferenceEntities { return "label" + (referenceLocaleOrdinal + 1); } - public static <E extends I18nReferenceEntity> String getLabel(int referenceLocaleOrdinal, E i18nEntity) { + public static <E extends I18nReferentialEntity> String getLabel(int referenceLocaleOrdinal, E i18nEntity) { String result = null; @@ -82,7 +82,7 @@ public class I18nReferenceEntities { } - public static <E extends I18nReferenceEntity> void setLabel(int referenceLocaleOrdinal, E i18nEntity, String label) { + public static <E extends I18nReferentialEntity> void setLabel(int referenceLocaleOrdinal, E i18nEntity, String label) { switch (referenceLocaleOrdinal + 1) { case 1: 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 13bf6b8..e8afecc 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 @@ -34,17 +34,17 @@ import java.util.Iterator; import java.util.List; /** - * Helper class around {@link ReferenceEntity}. + * Helper class around {@link ReferentialEntity}. * * @author Tony Chemit - chemit@codelutin.com * @since 3.0 */ public class ReferenceEntities { - public static final Predicate<? extends ReferenceEntity> IS_ACTIF_PREDICATE = new Predicate<ReferenceEntity>() { + public static final Predicate<? extends ReferentialEntity> IS_ACTIF_PREDICATE = new Predicate<ReferentialEntity>() { @Override - public boolean apply(ReferenceEntity input) { + public boolean apply(ReferentialEntity input) { return ReferenceStatus.disabled != input.getStatus(); } }; @@ -54,12 +54,12 @@ public class ReferenceEntities { /** * 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()} + * entités qui ne sont pas actives {@link ReferentialEntity#getStatus()} * * @param list la liste des entitées à filtrer * @param <E> le type des entites du référentiel */ - public static <E extends ReferenceEntity> void filterReferentielListByStatus( + public static <E extends ReferentialEntity> void filterReferentielListByStatus( List<E> list) { filterReferentielList(list, ReferenceEntities.<E>newEnablePredicate()); @@ -73,7 +73,7 @@ public class ReferenceEntities { * @param predicate le prédicate à appliquer pour conserver les valeurs * @param <E> le type des entites du référentiel */ - public static <E extends ReferenceEntity> void filterReferentielList( + public static <E extends ReferentialEntity> void filterReferentielList( List<E> list, Predicate<E> predicate) { Iterator<E> itr = list.iterator(); @@ -92,7 +92,7 @@ public class ReferenceEntities { } } - public static <R extends ReferenceEntity> Predicate<R> newEnablePredicate() { + public static <R extends ReferentialEntity> Predicate<R> newEnablePredicate() { return (Predicate<R>) IS_ACTIF_PREDICATE; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntityImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferentialEntityImpl.java similarity index 93% rename from observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntityImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferentialEntityImpl.java index 50e7ca1..1b4f5ca 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntityImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferentialEntityImpl.java @@ -24,7 +24,7 @@ package fr.ird.observe.entities.referentiel; import fr.ird.observe.entities.constants.ReferenceStatus; -public abstract class ReferenceEntityImpl extends ReferenceEntityAbstract { +public abstract class ReferentialEntityImpl extends ReferentialEntityAbstract { private static final long serialVersionUID = 1L; diff --git a/observe-entities/src/main/xmi/observe-common.zargo b/observe-entities/src/main/xmi/observe-common.zargo index c472cb6..a8688fb 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-longline.zargo b/observe-entities/src/main/xmi/observe-longline.zargo index 9af82f6..c4d9da9 100644 Binary files a/observe-entities/src/main/xmi/observe-longline.zargo and b/observe-entities/src/main/xmi/observe-longline.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index df37fb8..93b58e3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -33,7 +33,7 @@ import fr.ird.observe.entities.FollowedUpdateEntity; import fr.ird.observe.entities.LastUpdateType; import fr.ird.observe.entities.LastUpdateTypeTopiaDao; import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; @@ -91,7 +91,7 @@ public abstract class ObserveServiceTopia implements ObserveService { return dataEntityType; } - public static <D extends ReferentialDto, E extends ReferenceEntity> Class<E> getReferentialEntityType(Class<D> dtoType) { + public static <D extends ReferentialDto, E extends ReferentialEntity> Class<E> getReferentialEntityType(Class<D> dtoType) { Class<E> referentialEntityType = BINDER_ENGINE.getReferentialEntityType(dtoType); return referentialEntityType; } @@ -195,7 +195,7 @@ public abstract class ObserveServiceTopia implements ObserveService { protected <E extends TopiaEntity & FollowedUpdateEntity> Date setLastUpdate(E entity) { Date lastUpdate = now(); - entity.setLastUpdate(lastUpdate); + entity.setLastUpdateDate(lastUpdate); ObserveTopiaPersistenceContext persistenceContext = getTopiaPersistenceContext(); @@ -271,9 +271,9 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <E extends ReferenceEntity, D extends ReferentialDto> Form<D> referentialEntityToForm(Class<D> dtoType, - E entity, - ReferenceSetRequestDefinitions referentialRequestDefinition) { + protected <E extends ReferentialEntity, D extends ReferentialDto> Form<D> referentialEntityToForm(Class<D> dtoType, + E entity, + ReferenceSetRequestDefinitions referentialRequestDefinition) { D dto = BINDER_ENGINE.transformEntityToReferentialDto(serviceContext.getReferentialLocale(), entity); @@ -289,7 +289,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <E extends ReferenceEntity, D extends ReferentialDto> void copyReferentialDtoToEntity(D dto, E entity) { + protected <E extends ReferentialEntity, D extends ReferentialDto> void copyReferentialDtoToEntity(D dto, E entity) { BINDER_ENGINE.copyReferentialDtoToEntity(serviceContext.getReferentialLocale(), dto, entity); @@ -310,7 +310,7 @@ public abstract class ObserveServiceTopia implements ObserveService { return entity; } - protected <E extends ReferenceEntity, D extends ReferentialDto> E loadOrCreateEntityFromReferentialDto(D dto) { + protected <E extends ReferentialEntity, D extends ReferentialDto> E loadOrCreateEntityFromReferentialDto(D dto) { Class<D> dtoType = (Class<D>) dto.getClass(); @@ -335,7 +335,7 @@ public abstract class ObserveServiceTopia implements ObserveService { if (dto.isPersisted()) { - Date lasUpdate = entity.getLastUpdate(); + Date lasUpdate = entity.getLastUpdateDate(); Date currentUpdate = dto.getLastUpdate(); @@ -513,7 +513,7 @@ public abstract class ObserveServiceTopia implements ObserveService { return dao.forTopiaIdEquals(id).exists(); } - protected <D extends ReferentialDto> ReferentialReference<D> toReference(ReferenceEntity entity) { + protected <D extends ReferentialDto> ReferentialReference<D> toReference(ReferentialEntity entity) { ReferentialReference<D> reference = BinderEngine.get().transformEntityToReferentialReferenceDto(getReferentialLocale(), entity); return reference; @@ -546,7 +546,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <D extends ReferentialDto, E extends ReferenceEntity> ReferentialReferenceSet<D> toReferentialReferenceSet(Class<D> dtoType, List<E> allStubByTripId, Date lastUpdate) { + protected <D extends ReferentialDto, E extends ReferentialEntity> ReferentialReferenceSet<D> toReferentialReferenceSet(Class<D> dtoType, List<E> allStubByTripId, Date lastUpdate) { ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); @@ -571,7 +571,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <D extends ReferentialDto, E extends ReferenceEntity> ReferentialBinderSupport<E, D> getReferentialBinder(Class<D> dtoType) { + protected <D extends ReferentialDto, E extends ReferentialEntity> ReferentialBinderSupport<E, D> getReferentialBinder(Class<D> dtoType) { ReferentialBinderSupport<E, D> reference = BINDER_ENGINE.getReferentialBinder(dtoType); return reference; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java index caa1f1f..0dcdc57 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.binder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; @@ -29,11 +29,11 @@ public class BinderEngine implements ReferenceBinderEngine { protected ImmutableMap<Class<? extends DataDto>, BinderSupport> dataBinders; - protected ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> referentialDtoToEntityTypes; + protected ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferentialEntity>> referentialDtoToEntityTypes; protected ImmutableMap<Class<? extends DataDto>, Class<? extends TopiaEntity>> dataDtoToEntityTypes; - protected ImmutableMap<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypes; + protected ImmutableMap<Class<? extends ReferentialEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypes; protected ImmutableMap<Class<? extends TopiaEntity>, Class<? extends DataDto>> dataEntityToDtoTypes; @@ -57,7 +57,7 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends ReferentialDto, E extends ReferenceEntity> ReferentialBinderSupport<E, D> getReferentialBinder(Class<D> dtoType) { + public <D extends ReferentialDto, E extends ReferentialEntity> ReferentialBinderSupport<E, D> getReferentialBinder(Class<D> dtoType) { return (ReferentialBinderSupport) referentialBinders.get(dtoType); } @@ -91,13 +91,13 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends ReferentialDto, E extends ReferenceEntity> Class<D> getReferentialDtoType(Class<E> entityType) { + public <D extends ReferentialDto, E extends ReferentialEntity> Class<D> getReferentialDtoType(Class<E> entityType) { Class<D> result = (Class<D>) referentialEntityToDtoTypes.get(entityType); if (result == null) { // Pour gérer le cas des proxy hibernate qui ne sont pas égale à la classe proxifiée //FIXME Trouver une meilleure solution String name = entityType.getName(); - for (Map.Entry<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> entry : referentialEntityToDtoTypes.entrySet()) { + for (Map.Entry<Class<? extends ReferentialEntity>, Class<? extends ReferentialDto>> entry : referentialEntityToDtoTypes.entrySet()) { if (name.startsWith(entry.getKey().getName())) { result = (Class<D>) entry.getValue(); break; @@ -107,11 +107,11 @@ public class BinderEngine implements ReferenceBinderEngine { return result; } - public <D extends ReferentialDto, E extends ReferenceEntity> Class<E> getReferentialEntityType(Class<D> dtoType) { + public <D extends ReferentialDto, E extends ReferentialEntity> Class<E> getReferentialEntityType(Class<D> dtoType) { return (Class<E>) referentialDtoToEntityTypes.get(dtoType); } - public <D extends ReferentialDto, E extends ReferenceEntity> D transformEntityToReferentialDto(ReferentialLocale referentialLocale, E entity) { + public <D extends ReferentialDto, E extends ReferentialEntity> D transformEntityToReferentialDto(ReferentialLocale referentialLocale, E entity) { Class<D> dtoType = getReferentialDtoType(entity.getClass()); ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); @@ -123,7 +123,7 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends ReferentialDto, E extends ReferenceEntity> E transformReferentialDtoToEntity(ReferentialLocale referentialLocale, D dto) { + public <D extends ReferentialDto, E extends ReferentialEntity> E transformReferentialDtoToEntity(ReferentialLocale referentialLocale, D dto) { Class<D> dtoType = (Class<D>) dto.getClass(); ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); @@ -178,7 +178,7 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends ReferentialDto, E extends ReferenceEntity> ReferentialReference<D> transformEntityToReferentialReferenceDto(ReferentialLocale referentialLocale, E entity) { + public <D extends ReferentialDto, E extends ReferentialEntity> ReferentialReference<D> transformEntityToReferentialReferenceDto(ReferentialLocale referentialLocale, E entity) { Class<D> dtoType = getReferentialDtoType(entity.getClass()); ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); @@ -197,7 +197,7 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends ReferentialDto, E extends ReferenceEntity> void copyReferentialDtoToEntity(ReferentialLocale referentialLocale, D dto, E entity) { + public <D extends ReferentialDto, E extends ReferentialEntity> void copyReferentialDtoToEntity(ReferentialLocale referentialLocale, D dto, E entity) { Class<D> dtoType = (Class<D>) dto.getClass(); ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); @@ -210,7 +210,7 @@ public class BinderEngine implements ReferenceBinderEngine { return ImmutableSet.copyOf(getReferentialDtoToEntityTypes().keySet()); } - public ImmutableMap<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> getReferentialEntityToDtoTypes() { + public ImmutableMap<Class<? extends ReferentialEntity>, Class<? extends ReferentialDto>> getReferentialEntityToDtoTypes() { return referentialEntityToDtoTypes; } @@ -222,7 +222,7 @@ public class BinderEngine implements ReferenceBinderEngine { return dataDtoToEntityTypes; } - protected ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> getReferentialDtoToEntityTypes() { + protected ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferentialEntity>> getReferentialDtoToEntityTypes() { return referentialDtoToEntityTypes; } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java index 64d0f22..8bc7cbc 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java @@ -31,7 +31,7 @@ import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.entities.referentiel.Organism; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.entities.referentiel.Sex; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesGroup; @@ -340,9 +340,9 @@ class BinderEngineInitializer implements ObserveModelInitializer { ImmutableMap.Builder<Class<? extends DataDto>, BinderSupport> dataBinderBuilder; - ImmutableMap.Builder<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> referentialDtoToEntityTypeBuilder; + ImmutableMap.Builder<Class<? extends ReferentialDto>, Class<? extends ReferentialEntity>> referentialDtoToEntityTypeBuilder; - ImmutableMap.Builder<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypeBuilder; + ImmutableMap.Builder<Class<? extends ReferentialEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypeBuilder; ImmutableMap.Builder<Class<? extends ReferentialDto>, BinderSupport> referentialBinderBuilder; @@ -350,9 +350,9 @@ class BinderEngineInitializer implements ObserveModelInitializer { ImmutableMap<Class<? extends TopiaEntity>, Class<? extends DataDto>> dataEntityToDtoTypes; - ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> referentialDtoToEntityTypes; + ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferentialEntity>> referentialDtoToEntityTypes; - ImmutableMap<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypes; + ImmutableMap<Class<? extends ReferentialEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypes; ImmutableMap<Class<? extends DataDto>, BinderSupport> dataBinders; @@ -392,15 +392,15 @@ class BinderEngineInitializer implements ObserveModelInitializer { } } - for (Map.Entry<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> entry : referentialDtoToEntityTypes.entrySet()) { + for (Map.Entry<Class<? extends ReferentialDto>, Class<? extends ReferentialEntity>> entry : referentialDtoToEntityTypes.entrySet()) { Class<? extends ReferentialDto> dtoType = entry.getKey(); - Class<? extends ReferenceEntity> entityType = entry.getValue(); + Class<? extends ReferentialEntity> entityType = entry.getValue(); if ((entityType.getSimpleName() + "Dto").equals(dtoType.getSimpleName())) { ObserveEntityEnum observeEntityEnum = ObserveEntityEnum.valueOf(entityType); referentialEntityToDtoTypeBuilder.put(entityType, dtoType); - referentialEntityToDtoTypeBuilder.put((Class<? extends ReferenceEntity>) observeEntityEnum.getImplementation(), dtoType); + referentialEntityToDtoTypeBuilder.put((Class<? extends ReferentialEntity>) observeEntityEnum.getImplementation(), dtoType); } } dataEntityToDtoTypes = dataEntityToDtoTypeBuilder.build(); 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 3d1c949..e623751 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 @@ -5,8 +5,8 @@ import com.google.common.collect.Iterables; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.constants.ReferenceStatus; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; -import fr.ird.observe.entities.referentiel.I18nReferenceEntity; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.I18nReferentialEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.GearType; @@ -147,7 +147,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { // -- REFERENTIAL REFERENCE → ENTITY ---------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------------------- // - protected <DD extends ReferentialDto, EE extends ReferenceEntity> EE toEntity(ReferentialReference<DD> reference, Class<EE> entityType) { + protected <DD extends ReferentialDto, EE extends ReferentialEntity> EE toEntity(ReferentialReference<DD> reference, Class<EE> entityType) { EE entity = null; @@ -167,7 +167,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { // -- REFERENTIAL → ENTITY -------------------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------------------- // - protected <DD extends ReferentialDto, EE extends ReferenceEntity> LinkedHashSet<EE> toEntitySet(Collection<ReferentialReference<DD>> references, Class<EE> entityType) { + protected <DD extends ReferentialDto, EE extends ReferentialEntity> LinkedHashSet<EE> toEntitySet(Collection<ReferentialReference<DD>> references, Class<EE> entityType) { LinkedHashSet<EE> entityList = null; if (CollectionUtils.isNotEmpty(references)) { @@ -194,7 +194,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { // -- ENTITY → REFERENTIAL REFERENCE ---------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------------------- // - protected <EE extends ReferenceEntity, DD extends ReferentialDto> ReferentialReference<DD> toReferentialReference(ReferentialLocale referentialLocale, EE entity, Class<DD> dtoType) { + protected <EE extends ReferentialEntity, DD extends ReferentialDto> ReferentialReference<DD> toReferentialReference(ReferentialLocale referentialLocale, EE entity, Class<DD> dtoType) { ReferentialReference<DD> reference = null; if (entity != null) { @@ -207,7 +207,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { } - protected <EE extends ReferenceEntity, DD extends ReferentialDto> List<ReferentialReference<DD>> toReferentialReferenceList(ReferentialLocale referentialLocale, Collection<EE> entities, Class<DD> dtoType) { + protected <EE extends ReferentialEntity, DD extends ReferentialDto> List<ReferentialReference<DD>> toReferentialReferenceList(ReferentialLocale referentialLocale, Collection<EE> entities, Class<DD> dtoType) { List<ReferentialReference<DD>> references = null; if (CollectionUtils.isNotEmpty(entities)) { @@ -232,7 +232,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { // -- LABELS ---------------------------------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------------------- // - protected String getLabel(ReferentialLocale locale, I18nReferenceEntity entity) { + protected String getLabel(ReferentialLocale locale, I18nReferentialEntity entity) { return I18nReferenceEntities.getLabel(locale.ordinal(), entity); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java index d9672f3..e4ea0f7 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java @@ -1,7 +1,6 @@ package fr.ird.observe.services.binder.data; import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.services.dto.DataReference; @@ -25,7 +24,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineDto dto, ActivityLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setTimeStamp(dto.getTimeStamp()); @@ -41,7 +40,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setTimeStamp(entity.getTimeStamp()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java index 1cb1c99..3fcc387 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java @@ -22,7 +22,7 @@ public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<Activit public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineEncouterDto dto, ActivityLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setEncounter(toEntityCollection(referentialLocale, dto.getEncounter(), Encounter.class, entity.getEncounter())); @@ -33,7 +33,7 @@ public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<Activit public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineEncouterDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setEncounter(toLinkedHashSetData(referentialLocale, entity.getEncounter(), EncounterDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java index ebc943b..5f78391 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java @@ -21,7 +21,7 @@ public class ActivityLonglineSensorUsedDtoBinder extends DataBinderSupport<Activ public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineSensorUsedDto dto, ActivityLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setSensorUsed(toEntityCollection(referentialLocale, dto.getSensorUsed(), SensorUsed.class, entity.getSensorUsed())); @@ -32,7 +32,7 @@ public class ActivityLonglineSensorUsedDtoBinder extends DataBinderSupport<Activ public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineSensorUsedDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setSensorUsed(toLinkedHashSetData(referentialLocale, entity.getSensorUsed(), SensorUsedDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java index ed65f3d..4813198 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java @@ -7,7 +7,6 @@ import fr.ird.observe.entities.referentiel.seine.SurroundingActivity; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.FpaZoneDto; @@ -34,7 +33,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi public void copyToEntity(ReferentialLocale referentialLocale, ActivitySeineDto dto, ActivitySeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setTime(dto.getTime()); @@ -60,7 +59,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi public void copyToDto(ReferentialLocale referentialLocale, ActivitySeine entity, ActivitySeineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setTime(dto.getTime()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java index 352d0f0..a58b4fe 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java @@ -21,7 +21,7 @@ public class ActivitySeineObservedSystemDtoBinder extends DataBinderSupport<Acti public void copyToEntity(ReferentialLocale referentialLocale, ActivitySeineObservedSystemDto dto, ActivitySeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setObservedSystem(toEntitySet(dto.getObservedSystem(), ObservedSystem.class)); @@ -32,7 +32,7 @@ public class ActivitySeineObservedSystemDtoBinder extends DataBinderSupport<Acti public void copyToDto(ReferentialLocale referentialLocale, ActivitySeine entity, ActivitySeineObservedSystemDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setObservedSystem(toReferentialReferenceList(referentialLocale, entity.getObservedSystem(), ObservedSystemDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java index e9b98f4..efe677a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java @@ -26,7 +26,7 @@ public class ActivitySeineStubDtoBinder extends DataBinderSupport<ActivitySeine, dto.setId(entity.getTopiaId()); dto.setTime(entity.getTime()); - dto.setTime(entity.getLastUpdate()); + dto.setTime(entity.getLastUpdateDate()); dto.setLatitude(entity.getLatitude()); dto.setLongitude(entity.getLongitude()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java index 37124db..274989b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java @@ -21,14 +21,14 @@ public class RouteBinder extends DataBinderSupport<Route, RouteDto> { public void copyToEntity(ReferentialLocale referentialLocale, RouteDto dto, Route entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setDate(dto.getDate()); entity.setStartLogValue(dto.getStartLogValue()); entity.setEndLogValue(dto.getEndLogValue()); entity.setCheckLevel(dto.getCheckLevel()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); } @@ -36,14 +36,14 @@ public class RouteBinder extends DataBinderSupport<Route, RouteDto> { public void copyToDto(ReferentialLocale referentialLocale, Route entity, RouteDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setDate(entity.getDate()); dto.setStartLogValue(entity.getStartLogValue()); dto.setEndLogValue(entity.getEndLogValue()); dto.setCheckLevel(entity.getCheckLevel()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setActivitySeine(toLinkedHashSetData(referentialLocale, entity.getActivitySeine(), ActivitySeineStubDto.class)); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java index 2d85efd..bb00070 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java @@ -28,7 +28,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineDto dto, SetLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setHomeId(dto.getHomeId()); @@ -63,7 +63,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin entity.setHaulingEndLongitude(dto.getHaulingEndLongitude()); entity.setHaulingBreaks(dto.getHaulingBreaks()); entity.setMonitored(dto.getMonitored()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setSettingShape(toEntity(dto.getSettingShape(), SettingShape.class)); entity.setLineType(toEntity(dto.getLineType(), LineType.class)); entity.setLightsticksType(toEntity(dto.getLightsticksType(), LightsticksType.class)); @@ -75,7 +75,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setHomeId(entity.getHomeId()); @@ -110,7 +110,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin dto.setHaulingEndLongitude(entity.getHaulingEndLongitude()); dto.setHaulingBreaks(entity.getHaulingBreaks()); dto.setMonitored(entity.getMonitored()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setSettingShape(toReferentialReference(referentialLocale, entity.getSettingShape(), SettingShapeDto.class)); dto.setLineType(toReferentialReference(referentialLocale, entity.getLineType(), LineTypeDto.class)); dto.setLightsticksType(toReferentialReference(referentialLocale, entity.getLightsticksType(), LightsticksTypeDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java index b15ed23..2bf38af 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java @@ -21,7 +21,7 @@ public class SetLonglineCatchDtoBinder extends DataBinderSupport<SetLongline, Se public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineCatchDto dto, SetLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setCatchLongline(toEntitySet(referentialLocale, dto.getCatchLongline(), CatchLongline.class, entity.getCatchLongline())); @@ -31,7 +31,7 @@ public class SetLonglineCatchDtoBinder extends DataBinderSupport<SetLongline, Se public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineCatchDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setCatchLongline(toLinkedHashSetData(referentialLocale, entity.getCatchLongline(), CatchLonglineDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java index 02e4ec5..7db0ee5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java @@ -21,7 +21,7 @@ public class SetLonglineDetailCompositionDtoBinder extends DataBinderSupport<Set public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineDetailCompositionDto dto, SetLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setSection(toEntitySet(referentialLocale, dto.getSection(), Section.class, entity.getSection())); entity.setSettingStartTimeStamp(dto.getSettingStartTimeStamp()); @@ -38,7 +38,7 @@ public class SetLonglineDetailCompositionDtoBinder extends DataBinderSupport<Set public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineDetailCompositionDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setSection(toLinkedHashSetData(referentialLocale, entity.getSection(), SectionDto.class)); dto.setSettingStartTimeStamp(entity.getSettingStartTimeStamp()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java index 8cd837e..fd648ef 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java @@ -29,7 +29,7 @@ public class SetLonglineGlobalCompositionDtoBinder extends DataBinderSupport<Set public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineGlobalCompositionDto dto, SetLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setFloatlinesComposition(toEntityCollection(referentialLocale, dto.getFloatlinesComposition(), FloatlinesComposition.class, entity.getFloatlinesComposition())); @@ -44,7 +44,7 @@ public class SetLonglineGlobalCompositionDtoBinder extends DataBinderSupport<Set public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineGlobalCompositionDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setFloatlinesComposition(toLinkedHashSetData(referentialLocale, entity.getFloatlinesComposition(), FloatlinesCompositionDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java index 19e0bdb..6aa735a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java @@ -19,7 +19,7 @@ public class SetLonglineTdrDtoBinder extends DataBinderSupport<SetLongline, SetL public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineTdrDto dto, SetLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setSettingStartTimeStamp(dto.getSettingStartTimeStamp()); @@ -29,7 +29,7 @@ public class SetLonglineTdrDtoBinder extends DataBinderSupport<SetLongline, SetL public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineTdrDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setSettingStartTimeStamp(entity.getSettingStartTimeStamp()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java index 96bb056..29befd9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java @@ -22,7 +22,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { public void copyToEntity(ReferentialLocale referentialLocale, SetSeineDto dto, SetSeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setStartTime(dto.getStartTime()); @@ -39,7 +39,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { entity.setTargetDiscarded(dto.getTargetDiscarded()); entity.setNonTargetDiscarded(dto.getNonTargetDiscarded()); entity.setCurrentMeasureDepth(dto.getCurrentMeasureDepth()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setSchoolType(SCHOOL_TYPE_TO_ENTITY.apply(dto.getSchoolType())); entity.setReasonForNullSet(toEntity(dto.getReasonForNullSet(), ReasonForNullSet.class)); @@ -49,7 +49,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { public void copyToDto(ReferentialLocale referentialLocale, SetSeine entity, SetSeineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setStartTime(entity.getStartTime()); @@ -66,7 +66,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { dto.setTargetDiscarded(entity.getTargetDiscarded()); dto.setNonTargetDiscarded(entity.getNonTargetDiscarded()); dto.setCurrentMeasureDepth(entity.getCurrentMeasureDepth()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setSchoolType(SCHOOL_TYPE_TO_DTO.apply(entity.getSchoolType())); dto.setReasonForNullSet(toReferentialReference(referentialLocale, entity.getReasonForNullSet(), ReasonForNullSetDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java index 2ab858b..440e79e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java @@ -21,7 +21,7 @@ public class SetSeineSchoolEstimateDtoBinder extends DataBinderSupport<SetSeine, public void copyToEntity(ReferentialLocale referentialLocale, SetSeineSchoolEstimateDto dto, SetSeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setSchoolEstimate(toEntityCollection(referentialLocale, dto.getSchoolEstimate(), SchoolEstimate.class, entity.getSchoolEstimate())); @@ -31,7 +31,7 @@ public class SetSeineSchoolEstimateDtoBinder extends DataBinderSupport<SetSeine, public void copyToDto(ReferentialLocale referentialLocale, SetSeine entity, SetSeineSchoolEstimateDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setSchoolEstimate(toLinkedHashSetData(referentialLocale, entity.getSchoolEstimate(), SchoolEstimateDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java index b3b37cc..e4a0be8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java @@ -21,7 +21,7 @@ public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, Se public void copyToEntity(ReferentialLocale referentialLocale, SetSeineTargetCatchDto dto, SetSeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setTargetCatch(toEntityCollection(referentialLocale, dto.getTargetCatch(), TargetCatch.class, entity.getTargetCatch())); @@ -31,7 +31,7 @@ public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, Se public void copyToDto(ReferentialLocale referentialLocale, SetSeine entity, SetSeineTargetCatchDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setTargetCatch(toLinkedHashSetData(referentialLocale, entity.getTargetCatch(), TargetCatchDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java index 71f2b40..cd23436 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java @@ -34,7 +34,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong public void copyToEntity(ReferentialLocale referentialLocale, TripLonglineDto dto, TripLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setStartDate(dto.getStartDate()); @@ -58,7 +58,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong public void copyToDto(ReferentialLocale referentialLocale, TripLongline entity, TripLonglineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setStartDate(entity.getStartDate()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java index 80148c1..fb991b8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java @@ -21,7 +21,7 @@ public class TripLonglineGearUseDtoBinder extends DataBinderSupport<TripLongline public void copyToEntity(ReferentialLocale referentialLocale, TripLonglineGearUseDto dto, TripLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setGearUseFeaturesLongline(toEntitySet(referentialLocale, dto.getGearUseFeaturesLongline(), GearUseFeaturesLongline.class, entity.getGearUseFeaturesLongline())); @@ -31,7 +31,7 @@ public class TripLonglineGearUseDtoBinder extends DataBinderSupport<TripLongline public void copyToDto(ReferentialLocale referentialLocale, TripLongline entity, TripLonglineGearUseDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setGearUseFeaturesLongline(toLinkedHashSetData(referentialLocale, entity.getGearUseFeaturesLongline(), GearUseFeaturesLonglineDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java index eeb6ca6..aa547e1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java @@ -32,7 +32,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> public void copyToEntity(ReferentialLocale referentialLocale, TripSeineDto dto, TripSeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setComment(dto.getComment()); entity.setStartDate(dto.getStartDate()); @@ -58,7 +58,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> public void copyToDto(ReferentialLocale referentialLocale, TripSeine entity, TripSeineDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setComment(entity.getComment()); dto.setStartDate(entity.getStartDate()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java index 6c062fc..80b6054 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java @@ -21,7 +21,7 @@ public class TripSeineGearUseDtoBinder extends DataBinderSupport<TripSeine, Trip public void copyToEntity(ReferentialLocale referentialLocale, TripSeineGearUseDto dto, TripSeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setGearUseFeaturesSeine(toEntityCollection(referentialLocale, dto.getGearUseFeaturesSeine(), GearUseFeaturesSeine.class, entity.getGearUseFeaturesSeine())); @@ -31,7 +31,7 @@ public class TripSeineGearUseDtoBinder extends DataBinderSupport<TripSeine, Trip public void copyToDto(ReferentialLocale referentialLocale, TripSeine entity, TripSeineGearUseDto dto) { dto.setId(entity.getTopiaId()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setGearUseFeaturesSeine(toLinkedHashSetData(referentialLocale, entity.getGearUseFeaturesSeine(), GearUseFeaturesSeineDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java index fc4a30b..caccfe7 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java @@ -1,7 +1,7 @@ package fr.ird.observe.services.binder.referential; -import fr.ird.observe.entities.referentiel.I18nReferenceEntity; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.I18nReferentialEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.services.binder.BinderSupport; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; @@ -17,7 +17,7 @@ import java.io.Serializable; * * @author Tony Chemit - chemit@codelutin.com */ -public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D extends ReferentialDto> extends BinderSupport<E, D> { +public abstract class ReferentialBinderSupport<E extends ReferentialEntity, D extends ReferentialDto> extends BinderSupport<E, D> { protected final ReferenceSetDefinition<D> definition; @@ -40,7 +40,7 @@ public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D exte reference.setCreateDate(entity.getTopiaCreateDate()); reference.setVersion(entity.getTopiaVersion()); - reference.setLastUpdate(entity.getLastUpdate()); + reference.setLastUpdate(entity.getLastUpdateDate()); reference.setEnabled(entity.isEnabled()); reference.setNeedComment(entity.isNeedComment()); @@ -94,7 +94,7 @@ public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D exte } - protected void copyDtoI18nFieldsToEntity(I18nReferentialDto dto, I18nReferenceEntity entity) { + protected void copyDtoI18nFieldsToEntity(I18nReferentialDto dto, I18nReferentialEntity entity) { entity.setLabel1(dto.getLabel1()); entity.setLabel2(dto.getLabel2()); @@ -107,12 +107,12 @@ public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D exte } - protected void copyDtoReferentialFieldsToEntity(ReferentialDto dto, ReferenceEntity entity) { + protected void copyDtoReferentialFieldsToEntity(ReferentialDto dto, ReferentialEntity entity) { entity.setTopiaId(dto.getId()); entity.setStatus(REFERENCE_STATUS_TO_ENTITY.apply(dto.getStatus())); entity.setNeedComment(dto.isNeedComment()); - entity.setLastUpdate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdate()); entity.setTopiaVersion(dto.getVersion()); entity.setTopiaCreateDate(dto.getCreateDate()); entity.setCode(dto.getCode()); @@ -120,13 +120,13 @@ public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D exte } - protected void copyEntityReferentialFieldsToDto(ReferenceEntity entity, ReferentialDto dto) { + protected void copyEntityReferentialFieldsToDto(ReferentialEntity entity, ReferentialDto dto) { dto.setId(entity.getTopiaId()); dto.setStatus(REFERENCE_STATUS_TO_DTO.apply(entity.getStatus())); dto.setEnabled(entity.isEnabled()); dto.setNeedComment(entity.isNeedComment()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setVersion(entity.getTopiaVersion()); dto.setCreateDate(entity.getTopiaCreateDate()); dto.setCode(entity.getCode()); @@ -134,7 +134,7 @@ public abstract class ReferentialBinderSupport<E extends ReferenceEntity, D exte } - protected void copyEntityI18nFieldsToDto(I18nReferenceEntity entity, I18nReferentialDto dto) { + protected void copyEntityI18nFieldsToDto(I18nReferentialEntity entity, I18nReferentialDto dto) { dto.setLabel2(entity.getLabel2()); dto.setLabel3(entity.getLabel3()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java index 25ee3d0..6f38b87 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java @@ -15,7 +15,7 @@ import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.Persons; import fr.ird.observe.entities.referentiel.ReferenceEntities; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.Vessels; @@ -207,7 +207,7 @@ public class EntitiesSetFactory { return parentType.getName() + "#" + propertyName; } - protected <P extends TopiaEntity, C extends ReferenceEntity> void registerReferentialEntitiesExtractor( + protected <P extends TopiaEntity, C extends ReferentialEntity> void registerReferentialEntitiesExtractor( ImmutableMap.Builder<String, EntitiesExtractor> builder, Class<P> parentType, String propertyName, diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 0af61c7..1b991b1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.EntityMap; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.binder.BinderEngine; @@ -66,7 +66,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> ReferentialReferenceSet<D> getReferenceSet(Class<D> type, Date lastUpdateDate) { - Class<ReferenceEntity> entityType = BinderEngine.get().getReferentialEntityType(type); + Class<ReferentialEntity> entityType = BinderEngine.get().getReferentialEntityType(type); //FIXME A revoir car on devrait toujours avoir une date de dernière mise à jour Optional<Date> lastUpdateOptional = getLastUpdate(entityType); @@ -75,7 +75,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe if (lastUpdateOptional.isPresent() && (lastUpdateDate == null || lastUpdateOptional.get().after(lastUpdateDate))) { - List<ReferenceEntity> entities = loadEntities(entityType); + List<ReferentialEntity> entities = loadEntities(entityType); result = toReferentialReferenceSet(type, entities, lastUpdateOptional.get()); @@ -125,14 +125,14 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> Form<D> loadForm(Class<D> dtoType, String id) { - ReferenceEntity entity = loadEntity(dtoType, id); + ReferentialEntity entity = loadEntity(dtoType, id); //FIXME Definir une definition pour chaque formulaire de référentiel Form<D> form = referentialEntityToForm(dtoType, entity, null); D dto = form.getObject(); dto.setVersion(entity.getTopiaVersion()); dto.setCreateDate(entity.getTopiaCreateDate()); - dto.setLastUpdate(entity.getLastUpdate()); + dto.setLastUpdate(entity.getLastUpdateDate()); dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); dto.setEnabled(entity.isEnabled()); @@ -143,8 +143,8 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> ReferentialReference<D> loadReference(Class<D> type, String id) throws DataNotFoundException { - ReferenceEntity entity = loadEntity(type, id); - ReferentialBinderSupport<ReferenceEntity, D> referentialBinder = getReferentialBinder(type); + ReferentialEntity entity = loadEntity(type, id); + ReferentialBinderSupport<ReferentialEntity, D> referentialBinder = getReferentialBinder(type); ReferentialReference<D> reference = referentialBinder.toReferentialReference(getReferentialLocale(), entity); return reference; @@ -152,8 +152,8 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> Form<D> preCreate(Class<D> dtoType) { - Class<ReferenceEntity> entityType = getReferentialEntityType(dtoType); - ReferenceEntity entity = newEntity(entityType); + Class<ReferentialEntity> entityType = getReferentialEntityType(dtoType); + ReferentialEntity entity = newEntity(entityType); //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser //FIXME Definir une definition pour chaque formulaire de référentiel Form<D> form = referentialEntityToForm(dtoType, entity, null); @@ -162,9 +162,9 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> SaveResultDto save(D dto) { Class<D> dtoType = (Class<D>) dto.getClass(); - Class<ReferenceEntity> entityType = getReferentialEntityType(dtoType); + Class<ReferentialEntity> entityType = getReferentialEntityType(dtoType); - ReferenceEntity entity = loadOrCreateEntityFromReferentialDto(dto); + ReferentialEntity entity = loadOrCreateEntityFromReferentialDto(dto); copyReferentialDtoToEntity(dto, entity); @@ -176,13 +176,13 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, String id) { - Class<? extends ReferenceEntity> entityType = getReferentialEntityType(dtoType); + Class<? extends ReferentialEntity> entityType = getReferentialEntityType(dtoType); deleteEntity(dtoType, entityType, Collections.singleton(id)); } @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, Collection<String> ids) { - Class<? extends ReferenceEntity> entityType = getReferentialEntityType(dtoType); + Class<? extends ReferentialEntity> entityType = getReferentialEntityType(dtoType); deleteEntity(dtoType, entityType, ids); } @@ -190,11 +190,11 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <R extends ReferentialDto> DtoMap findAllUsages(R bean) throws DataNotFoundException { Class<R> referentialDtoType = (Class<R>) bean.getClass(); - Class<ReferenceEntity> entityType = getReferentialEntityType(referentialDtoType); + Class<ReferentialEntity> entityType = getReferentialEntityType(referentialDtoType); - ReferenceEntity entity = loadEntity(referentialDtoType, bean.getId()); + ReferentialEntity entity = loadEntity(referentialDtoType, bean.getId()); - TopiaDao<ReferenceEntity> dao = getTopiaPersistenceContext().getDao(entityType); + TopiaDao<ReferentialEntity> dao = getTopiaPersistenceContext().getDao(entityType); EntityMap allUsages = new EntityMap(dao.findAllUsages(entity)); Set<AbstractReferenceSet<?, ?>> result = new LinkedHashSet<>(allUsages.size()); @@ -204,7 +204,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe List<? extends TopiaEntity> entities = allUsages.get(type); - if (ReferenceEntity.class.isAssignableFrom(type)) { + if (ReferentialEntity.class.isAssignableFrom(type)) { Class<ReferentialDto> dtoType = BINDER_ENGINE.getReferentialDtoType((Class) type); @@ -228,7 +228,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> boolean exists(Class<D> dtoType, String id) { - Class<? extends ReferenceEntity> entityType = getReferentialEntityType(dtoType); + Class<? extends ReferentialEntity> entityType = getReferentialEntityType(dtoType); return existsEntity(entityType, id); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java index 6ab985e..fae5a25 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.actions.report; import com.google.common.collect.Maps; import fr.ird.observe.AbstractObserveTopiaDao; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.binder.data.DataBinderSupport; @@ -81,12 +81,12 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer Class<? extends ReferentialDto> dtoType = (Class<? extends ReferentialDto>) type; - ReferentialBinderSupport<ReferenceEntity, ? extends ReferentialDto> binder = getReferentialBinder(dtoType); + ReferentialBinderSupport<ReferentialEntity, ? extends ReferentialDto> binder = getReferentialBinder(dtoType); List<TopiaEntity> universe = executeRequest(hql, vars); for (TopiaEntity entity : universe) { - ReferentialReference<? extends ReferentialDto> reference = binder.toReferentialReference(getReferentialLocale(), (ReferenceEntity) entity); + ReferentialReference<? extends ReferentialDto> reference = binder.toReferentialReference(getReferentialLocale(), (ReferentialEntity) entity); values.add(reference); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java index 38ea537..36ab68a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java @@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.io.Files; import com.google.gson.Gson; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.IdDto; @@ -76,7 +76,7 @@ public class GenerateValidatorDescriptorsFileTool { NuitonValidatorScope[] scopes = NuitonValidatorScope.values(); - for (Map.Entry<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> entry : BinderEngine.get().getReferentialEntityToDtoTypes().entrySet()) { + for (Map.Entry<Class<? extends ReferentialEntity>, Class<? extends ReferentialDto>> entry : BinderEngine.get().getReferentialEntityToDtoTypes().entrySet()) { Class<? extends TopiaEntity> entityType = entry.getKey(); Class<? extends IdDto> dtoType = entry.getValue(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java index c916706..ef692aa 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java @@ -28,7 +28,7 @@ import com.google.common.collect.Iterables; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.Trip; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; @@ -120,7 +120,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat for (Class<? extends TopiaEntity> entityType : detector.getDetectedEntityTypes()) { - if (ReferenceEntity.class.isAssignableFrom(entityType)) { + if (ReferentialEntity.class.isAssignableFrom(entityType)) { buildResultForReferentialDtoType((Class) entityType, detector, forDtoTypeBuilder); } else { buildResultForDataDtoType((Class) entityType, detector, forDtoTypeBuilder); @@ -133,9 +133,9 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat } - private <E extends ReferenceEntity, D extends ReferentialDto> void buildResultForReferentialDtoType(Class<E> entityType, - ValidationMessageDetector detector, - ImmutableMap.Builder<Class<? extends IdDto>, ValidateResultForDtoType> forDtoTypeBuilder) { + private <E extends ReferentialEntity, D extends ReferentialDto> void buildResultForReferentialDtoType(Class<E> entityType, + ValidationMessageDetector detector, + ImmutableMap.Builder<Class<? extends IdDto>, ValidateResultForDtoType> forDtoTypeBuilder) { ImmutableSet.Builder<ValidateResultForDto<D>> validateResultForDtoMapBuilder = new ImmutableSet.Builder<>(); @@ -143,7 +143,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat for (Map.Entry<TopiaEntity, Collection<ValidationMessage>> entry : detectedMessages.entrySet()) { TopiaEntity entity = entry.getKey(); - ReferentialReference<D> referenceDto = BINDER_ENGINE.transformEntityToReferentialReferenceDto(serviceContext.getReferentialLocale(), (ReferenceEntity) entity); + ReferentialReference<D> referenceDto = BINDER_ENGINE.transformEntityToReferentialReferenceDto(serviceContext.getReferentialLocale(), (ReferentialEntity) entity); Collection<ValidationMessage> validationMessages = entry.getValue(); ValidateResultForDto<D> validateResultForDto = new ValidateResultForDto<>(referenceDto, ImmutableSet.copyOf(validationMessages)); validateResultForDtoMapBuilder.add(validateResultForDto); @@ -181,7 +181,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat } - protected <D extends ReferentialDto, E extends ReferenceEntity> void validateReferential(Class<D> referentialDtoType, ValidationMessageDetector detector) { + protected <D extends ReferentialDto, E extends ReferentialEntity> void validateReferential(Class<D> referentialDtoType, ValidationMessageDetector detector) { Class<E> referentialType = getReferentialEntityType(referentialDtoType); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java index df98b9c..349756a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java @@ -25,7 +25,7 @@ public class BranchlineServiceTopia extends ObserveServiceTopia implements Branc Branchline entity = loadEntity(BranchlineDto.class, id); Form<BranchlineDto> form = dataEntityToForm(BranchlineDto.class, entity, ReferenceSetRequestDefinitions.BRANCHLINE_FORM); - form.getObject().setLastUpdate(setLongline.getLastUpdate()); + form.getObject().setLastUpdate(setLongline.getLastUpdateDate()); return form; 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 431551b..4c91860 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 @@ -133,7 +133,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { entity.setCoefficients("a=3.8E-5:b=2.78"); entity.setLengthWeightFormula("a * Math.pow(L, b)"); entity.setWeightLengthFormula("Math.pow(P/a, 1/b)"); - entity.setLastUpdate(new Date()); + entity.setLastUpdateDate(new Date()); lengthWeightParameterDao.create(entity); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java index 2c51a58..38477e9 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java @@ -5,7 +5,7 @@ import com.google.common.collect.Sets; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.LastUpdateType; import fr.ird.observe.entities.longline.TdrRecord; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; @@ -41,7 +41,7 @@ public class BinderEngineMetadataTest { binderEngine = BinderEngine.get(); for (Class<? extends ReferentialDto> dtoType : binderEngine.getReferentialDtoToEntityTypes().keySet()) { - ReferentialBinderSupport<ReferenceEntity, ? extends ReferentialDto> referentialBinder = binderEngine.getReferentialBinder(dtoType); + ReferentialBinderSupport<ReferentialEntity, ? extends ReferentialDto> referentialBinder = binderEngine.getReferentialBinder(dtoType); Assert.assertNotNull(referentialBinder); } @@ -58,18 +58,18 @@ public class BinderEngineMetadataTest { @Test public void testGetReferentialEntityType() throws Exception { - ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferenceEntity>> referentialDtoToEntityTypes = binderEngine.getReferentialDtoToEntityTypes(); + ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ReferentialEntity>> referentialDtoToEntityTypes = binderEngine.getReferentialDtoToEntityTypes(); Assert.assertNotNull(referentialDtoToEntityTypes); Assert.assertEquals(59, referentialDtoToEntityTypes.size()); - Set<Class<? extends ReferenceEntity>> entityTypesFromEngine = Sets.newHashSet(referentialDtoToEntityTypes.values()); - Set<Class<? extends ReferenceEntity>> referentialEntityTypesFromTopia = getReferentialEntityTypes(); + Set<Class<? extends ReferentialEntity>> entityTypesFromEngine = Sets.newHashSet(referentialDtoToEntityTypes.values()); + Set<Class<? extends ReferentialEntity>> referentialEntityTypesFromTopia = getReferentialEntityTypes(); Assert.assertEquals(referentialEntityTypesFromTopia.size(), entityTypesFromEngine.size()); for (Class<? extends ReferentialDto> dtoType : referentialDtoToEntityTypes.keySet()) { - Class<? extends ReferenceEntity> entityType = binderEngine.getReferentialEntityType(dtoType); + Class<? extends ReferentialEntity> entityType = binderEngine.getReferentialEntityType(dtoType); Assert.assertNotNull(entityType); } @@ -99,12 +99,12 @@ public class BinderEngineMetadataTest { @Test public void testGetReferentialDtoType() throws Exception { - ImmutableMap<Class<? extends ReferenceEntity>, Class<? extends ReferentialDto>> referentialDtoToEntityTypes = binderEngine.getReferentialEntityToDtoTypes(); + ImmutableMap<Class<? extends ReferentialEntity>, Class<? extends ReferentialDto>> referentialDtoToEntityTypes = binderEngine.getReferentialEntityToDtoTypes(); Assert.assertNotNull(referentialDtoToEntityTypes); Assert.assertEquals(2 * 59, referentialDtoToEntityTypes.size()); - for (Class<? extends ReferenceEntity> entityType : referentialDtoToEntityTypes.keySet()) { + for (Class<? extends ReferentialEntity> entityType : referentialDtoToEntityTypes.keySet()) { Class<? extends ReferentialDto> dtoType = binderEngine.getReferentialDtoType(entityType); Assert.assertNotNull(dtoType); @@ -130,16 +130,16 @@ public class BinderEngineMetadataTest { } - protected Set<Class<? extends ReferenceEntity>> getReferentialEntityTypes() { + protected Set<Class<? extends ReferentialEntity>> getReferentialEntityTypes() { - Set<Class<? extends ReferenceEntity>> result = new LinkedHashSet<>(); + Set<Class<? extends ReferentialEntity>> result = new LinkedHashSet<>(); for (ObserveEntityEnum observeEntityEnum : ObserveEntityEnum.values()) { Class<? extends TopiaEntity> contract = observeEntityEnum.getContract(); - if (ReferenceEntity.class.isAssignableFrom(contract) && !Modifier.isAbstract(observeEntityEnum.getImplementation().getModifiers())) { + if (ReferentialEntity.class.isAssignableFrom(contract) && !Modifier.isAbstract(observeEntityEnum.getImplementation().getModifiers())) { - result.add((Class<? extends ReferenceEntity>) contract); + result.add((Class<? extends ReferentialEntity>) contract); } } return result; @@ -152,7 +152,7 @@ public class BinderEngineMetadataTest { for (ObserveEntityEnum observeEntityEnum : ObserveEntityEnum.values()) { - if (!ReferenceEntity.class.isAssignableFrom(observeEntityEnum.getContract()) && !Modifier.isAbstract(observeEntityEnum.getImplementation().getModifiers())) { + if (!ReferentialEntity.class.isAssignableFrom(observeEntityEnum.getContract()) && !Modifier.isAbstract(observeEntityEnum.getImplementation().getModifiers())) { result.add(observeEntityEnum.getContract()); } } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java index c4e7205..426d42a 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.binder; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -329,7 +329,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { } - protected <D extends ReferentialDto, E extends ReferenceEntity> void transformReferentialEntityToDto(Class<D> dtoType) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { + protected <D extends ReferentialDto, E extends ReferentialEntity> void transformReferentialEntityToDto(Class<D> dtoType) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { Class<E> entityType = binderEngine.getReferentialEntityType(dtoType); @@ -349,7 +349,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { Assert.assertEquals(entity.getTopiaId(), dto.getId()); Assert.assertEquals(entity.getTopiaCreateDate(), dto.getCreateDate()); Assert.assertEquals(entity.getTopiaVersion(), dto.getVersion()); - Assert.assertEquals(entity.getLastUpdate(), dto.getLastUpdate()); + Assert.assertEquals(entity.getLastUpdateDate(), dto.getLastUpdate()); Assert.assertEquals(entity.isNeedComment(), dto.isNeedComment()); Assert.assertEquals(entity.isEnabled(), dto.isEnabled()); Assert.assertEquals(entity.getUri(), dto.getUri()); @@ -361,7 +361,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { Assert.assertEquals(entity.getTopiaId(), entity.getTopiaId()); Assert.assertEquals(entity.getTopiaCreateDate(), entity.getTopiaCreateDate()); Assert.assertEquals(entity.getTopiaVersion(), entity.getTopiaVersion()); - Assert.assertEquals(entity.getLastUpdate(), entity.getLastUpdate()); + Assert.assertEquals(entity.getLastUpdateDate(), entity.getLastUpdateDate()); Assert.assertEquals(entity.isNeedComment(), entity.isNeedComment()); Assert.assertEquals(entity.isEnabled(), entity.isEnabled()); Assert.assertEquals(entity.getUri(), entity.getUri()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index f75da3c..37842e0 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.ReferentialEntity; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; @@ -96,7 +96,7 @@ public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { } - protected <D extends ReferentialDto, E extends ReferenceEntity> void loadToEdit(ObserveTopiaPersistenceContext persistenceContext, Class<D> dtoType) { + protected <D extends ReferentialDto, E extends ReferentialEntity> void loadToEdit(ObserveTopiaPersistenceContext persistenceContext, Class<D> dtoType) { Class<E> entityType = BinderEngine.get().getReferentialEntityType(dtoType); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index bb9a2a3..ef33b63 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -141,7 +141,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getFormsUrl(), tripSeineDto.getFormsUrl()); Assert.assertEquals(tripSeine.getReportsUrl(), tripSeineDto.getReportsUrl()); Assert.assertEquals(tripSeine.getComment(), tripSeineDto.getComment()); - Assert.assertEquals(tripSeine.getLastUpdate(), tripSeineDto.getLastUpdate()); + Assert.assertEquals(tripSeine.getLastUpdateDate(), tripSeineDto.getLastUpdate()); loadReferenceSets(referentialService, form); @@ -236,7 +236,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); - Assert.assertNotNull(tripSeine.getLastUpdate()); + Assert.assertNotNull(tripSeine.getLastUpdateDate()); Date lastUpdateAfter = getLastUpdate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); @@ -288,8 +288,8 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); - Assert.assertNotNull(tripSeine.getLastUpdate()); - Assert.assertNotEquals(tripSeineDto.getLastUpdate(), tripSeine.getLastUpdate()); + Assert.assertNotNull(tripSeine.getLastUpdateDate()); + Assert.assertNotEquals(tripSeineDto.getLastUpdate(), tripSeine.getLastUpdateDate()); Date lastUpdateAfter = getLastUpdate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.