[Observe-commits] 19/38: Refactor des binders

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 a736d267ac97730bbf50c8436cd1569a552144b2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 27 22:27:27 2015 +0100 Refactor des binders --- .../binder/data/ActivityLonglineBinder.java | 8 ++------ .../data/ActivityLonglineEncouterDtoBinder.java | 8 ++------ .../data/ActivityLonglineSensorUsedDtoBinder.java | 8 ++------ .../binder/data/ActivityLonglineStubDtoBinder.java | 4 ++-- .../services/binder/data/ActivitySeineBinder.java | 8 ++------ .../data/ActivitySeineObservedSystemDtoBinder.java | 8 ++------ .../binder/data/ActivitySeineStubDtoBinder.java | 2 +- .../binder/data/BaitsCompositionBinder.java | 4 ++-- .../observe/services/binder/data/BasketBinder.java | 4 ++-- .../services/binder/data/BranchlineBinder.java | 6 ++---- .../binder/data/BranchlinesCompositionBinder.java | 4 ++-- .../services/binder/data/CatchLonglineBinder.java | 6 ++---- .../services/binder/data/DataBinderSupport.java | 21 +++++++++++++++++++++ .../services/binder/data/EncounterBinder.java | 5 +++-- .../services/binder/data/FloatingObjectBinder.java | 6 ++---- .../FloatingObjectObservedSpeciesDtoBinder.java | 6 ++---- .../data/FloatingObjectSchoolEstimateDtoBinder.java | 6 ++---- .../FloatingObjectTransmittingBuoyDtoBinder.java | 6 ++---- .../binder/data/FloatlinesCompositionBinder.java | 4 ++-- .../binder/data/GearUseFeaturesLonglineBinder.java | 6 ++---- .../GearUseFeaturesMeasurementLonglineBinder.java | 4 ++-- .../data/GearUseFeaturesMeasurementSeineBinder.java | 4 ++-- .../binder/data/GearUseFeaturesSeineBinder.java | 6 ++---- .../binder/data/HooksCompositionBinder.java | 4 ++-- .../services/binder/data/NonTargetCatchBinder.java | 6 ++---- .../services/binder/data/NonTargetLengthBinder.java | 4 ++-- .../services/binder/data/NonTargetSampleBinder.java | 6 ++---- .../binder/data/ObjectObservedSpeciesBinder.java | 6 ++---- .../binder/data/ObjectSchoolEstimateBinder.java | 4 ++-- .../observe/services/binder/data/RouteBinder.java | 10 +++------- .../services/binder/data/RouteStubDtoBinder.java | 4 ++-- .../services/binder/data/SchoolEstimateBinder.java | 4 ++-- .../observe/services/binder/data/SectionBinder.java | 4 ++-- .../services/binder/data/SensorUsedBinder.java | 4 ++-- .../services/binder/data/SetLonglineBinder.java | 10 +++------- .../binder/data/SetLonglineCatchDtoBinder.java | 6 ++---- .../data/SetLonglineDetailCompositionDtoBinder.java | 6 ++---- .../data/SetLonglineGlobalCompositionDtoBinder.java | 8 ++------ .../binder/data/SetLonglineStubDtoBinder.java | 2 +- .../binder/data/SetLonglineTdrDtoBinder.java | 6 ++---- .../services/binder/data/SetSeineBinder.java | 10 +++------- .../data/SetSeineNonTargetCatchDtoBinder.java | 4 ++-- .../data/SetSeineSchoolEstimateDtoBinder.java | 8 ++------ .../binder/data/SetSeineTargetCatchDtoBinder.java | 6 ++---- .../services/binder/data/SizeMeasureBinder.java | 4 ++-- .../services/binder/data/TargetCatchBinder.java | 6 ++---- .../services/binder/data/TargetLengthBinder.java | 4 ++-- .../services/binder/data/TargetSampleBinder.java | 6 ++---- .../ird/observe/services/binder/data/TdrBinder.java | 4 ++-- .../binder/data/TransmittingBuoyBinder.java | 4 ++-- .../binder/data/TripLonglineActivityDtoBinder.java | 4 ++-- .../services/binder/data/TripLonglineBinder.java | 8 ++------ .../binder/data/TripLonglineGearUseDtoBinder.java | 6 ++---- .../services/binder/data/TripSeineBinder.java | 8 ++------ .../binder/data/TripSeineGearUseDtoBinder.java | 6 ++---- .../services/binder/data/WeightMeasureBinder.java | 4 ++-- 56 files changed, 133 insertions(+), 197 deletions(-) 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 f3481f7..b9beb1a 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 @@ -23,9 +23,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, @Override public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineDto dto, ActivityLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setTimeStamp(dto.getTimeStamp()); entity.setLatitude(dto.getLatitude()); @@ -39,9 +37,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, @Override public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setTimeStamp(entity.getTimeStamp()); dto.setLatitude(entity.getLatitude()); 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 087fd8c..73ec21f 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 @@ -21,9 +21,7 @@ public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<Activit @Override public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineEncouterDto dto, ActivityLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setEncounter(toEntityCollection(referentialLocale, dto.getEncounter(), Encounter.class, entity.getEncounter())); @@ -32,9 +30,7 @@ public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<Activit @Override public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineEncouterDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); 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 50673ad..9138c04 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 @@ -20,9 +20,7 @@ public class ActivityLonglineSensorUsedDtoBinder extends DataBinderSupport<Activ @Override public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineSensorUsedDto dto, ActivityLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setSensorUsed(toEntityCollection(referentialLocale, dto.getSensorUsed(), SensorUsed.class, entity.getSensorUsed())); @@ -31,9 +29,7 @@ public class ActivityLonglineSensorUsedDtoBinder extends DataBinderSupport<Activ @Override public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineSensorUsedDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setSensorUsed(toLinkedHashSetData(referentialLocale, entity.getSensorUsed(), SensorUsedDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java index 30c2f1a..1ad7a31 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java @@ -18,7 +18,7 @@ public class ActivityLonglineStubDtoBinder extends DataBinderSupport<ActivityLon @Override public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineStubDto dto, ActivityLongline entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); } @@ -26,7 +26,7 @@ public class ActivityLonglineStubDtoBinder extends DataBinderSupport<ActivityLon @Override public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineStubDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setVesselActivityLonglineLabel(getLabel(referentialLocale, entity.getVesselActivityLongline())); dto.setHasSetLongline(entity.getSetLongline() != null); 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 95f8dc1..3ed93ba 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 @@ -32,9 +32,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi @Override public void copyToEntity(ReferentialLocale referentialLocale, ActivitySeineDto dto, ActivitySeine entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setTime(dto.getTime()); entity.setLatitude(dto.getLatitude()); @@ -58,9 +56,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi @Override public void copyToDto(ReferentialLocale referentialLocale, ActivitySeine entity, ActivitySeineDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setTime(dto.getTime()); dto.setLatitude(dto.getLatitude()); 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 dc7b5c9..72b5661 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 @@ -20,9 +20,7 @@ public class ActivitySeineObservedSystemDtoBinder extends DataBinderSupport<Acti @Override public void copyToEntity(ReferentialLocale referentialLocale, ActivitySeineObservedSystemDto dto, ActivitySeine entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setObservedSystem(toEntitySet(dto.getObservedSystem(), ObservedSystem.class)); @@ -31,9 +29,7 @@ public class ActivitySeineObservedSystemDtoBinder extends DataBinderSupport<Acti @Override public void copyToDto(ReferentialLocale referentialLocale, ActivitySeine entity, ActivitySeineObservedSystemDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); 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 efe677a..94ebb92 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 @@ -23,7 +23,7 @@ public class ActivitySeineStubDtoBinder extends DataBinderSupport<ActivitySeine, @Override public void copyToDto(ReferentialLocale referentialLocale, ActivitySeine entity, ActivitySeineStubDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setTime(entity.getTime()); dto.setTime(entity.getLastUpdateDate()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java index 087b809..f7fdd54 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java @@ -22,7 +22,7 @@ public class BaitsCompositionBinder extends DataBinderSupport<BaitsComposition, @Override public void copyToEntity(ReferentialLocale referentialLocale, BaitsCompositionDto dto, BaitsComposition entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setProportion(dto.getProportion()); entity.setIndividualSize(dto.getIndividualSize()); @@ -35,7 +35,7 @@ public class BaitsCompositionBinder extends DataBinderSupport<BaitsComposition, @Override public void copyToDto(ReferentialLocale referentialLocale, BaitsComposition entity, BaitsCompositionDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setProportion(entity.getProportion()); dto.setIndividualSize(entity.getIndividualSize()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java index 4e7837b..e681e29 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java @@ -21,7 +21,7 @@ public class BasketBinder extends DataBinderSupport<Basket, BasketDto> { @Override public void copyToEntity(ReferentialLocale referentialLocale, BasketDto dto, Basket entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setSettingIdentifier(dto.getSettingIdentifier()); entity.setHaulingIdentifier(dto.getHaulingIdentifier()); @@ -34,7 +34,7 @@ public class BasketBinder extends DataBinderSupport<Basket, BasketDto> { @Override public void copyToDto(ReferentialLocale referentialLocale, Basket entity, BasketDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setSettingIdentifier(entity.getSettingIdentifier()); dto.setHaulingIdentifier(entity.getHaulingIdentifier()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java index 03dec1a..d7dd9c4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java @@ -31,8 +31,7 @@ public class BranchlineBinder extends DataBinderSupport<Branchline, BranchlineDt @Override public void copyToEntity(ReferentialLocale referentialLocale, BranchlineDto dto, Branchline entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setSettingIdentifier(dto.getSettingIdentifier()); entity.setHaulingIdentifier(dto.getHaulingIdentifier()); @@ -63,8 +62,7 @@ public class BranchlineBinder extends DataBinderSupport<Branchline, BranchlineDt @Override public void copyToDto(ReferentialLocale referentialLocale, Branchline entity, BranchlineDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setSettingIdentifier(entity.getSettingIdentifier()); dto.setHaulingIdentifier(entity.getHaulingIdentifier()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java index 1452288..0259589 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java @@ -20,7 +20,7 @@ public class BranchlinesCompositionBinder extends DataBinderSupport<BranchlinesC @Override public void copyToEntity(ReferentialLocale referentialLocale, BranchlinesCompositionDto dto, BranchlinesComposition entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setLength(dto.getLength()); entity.setProportion(dto.getProportion()); @@ -32,7 +32,7 @@ public class BranchlinesCompositionBinder extends DataBinderSupport<BranchlinesC @Override public void copyToDto(ReferentialLocale referentialLocale, BranchlinesComposition entity, BranchlinesCompositionDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setLength(entity.getLength()); dto.setProportion(entity.getProportion()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java index af83484..d8e11bd 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java @@ -43,8 +43,7 @@ public class CatchLonglineBinder extends DataBinderSupport<CatchLongline, CatchL @Override public void copyToEntity(ReferentialLocale referentialLocale, CatchLonglineDto dto, CatchLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setHomeId(dto.getHomeId()); entity.setCount(dto.getCount()); @@ -76,8 +75,7 @@ public class CatchLonglineBinder extends DataBinderSupport<CatchLongline, CatchL @Override public void copyToDto(ReferentialLocale referentialLocale, CatchLongline entity, CatchLonglineDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setHomeId(entity.getHomeId()); dto.setCount(entity.getCount()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java index ca41c91..dce95d3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java @@ -4,9 +4,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import fr.ird.observe.entities.CommentableEntity; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.BinderSupport; +import fr.ird.observe.services.dto.CommentableDto; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -50,6 +52,15 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D } + protected void copyEntityDataFieldsToDto(E entity, D dto) { + dto.setId(entity.getTopiaId()); + dto.setLastUpdateDate(entity.getLastUpdateDate()); + + if (dto instanceof CommentableDto && entity instanceof CommentableEntity) { + ((CommentableDto)dto).setComment(((CommentableEntity)entity).getComment()); + } + } + // -------------------------------------------------------------------------------------------------------------- // // -- ENTITY → DATA REFERENCE ----------------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------------------- // @@ -135,6 +146,14 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D return entity; } + protected void copyDtoDataFieldsToEntity(D dto, E entity) { + entity.setTopiaId(dto.getId()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); + if (dto instanceof CommentableDto && entity instanceof CommentableEntity) { + ((CommentableEntity)entity).setComment(((CommentableDto)dto).getComment()); + } + } + protected <DD extends DataDto, EE extends ObserveDataEntity> Set<EE> toEntitySet(ReferentialLocale referentialLocale, Collection<DD> dtos, Class<EE> entityType, Set<EE> entityList) { if (entityList == null) { @@ -208,6 +227,7 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D public E toEntity(DataReference<D> reference) { E entity = newEntity(); entity.setTopiaId(reference.getId()); + entity.setLastUpdateDate(reference.getLastUpdateDate()); return entity; } @@ -218,6 +238,7 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D DataBinderSupport<EE, DD> binder = BinderEngine.get().getDataBinder(type); EE entity = binder.toEntity(reference); entity.setTopiaId(reference.getId()); + entity.setLastUpdateDate(reference.getLastUpdateDate()); return entity; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java index 83d5418..97e6197 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java @@ -23,7 +23,7 @@ public class EncounterBinder extends DataBinderSupport<Encounter, EncounterDto> @Override public void copyToEntity(ReferentialLocale referentialLocale, EncounterDto dto, Encounter entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); entity.setEncounterType(toEntity(dto.getEncounterType(), EncounterType.class)); @@ -36,7 +36,8 @@ public class EncounterBinder extends DataBinderSupport<Encounter, EncounterDto> @Override public void copyToDto(ReferentialLocale referentialLocale, Encounter entity, EncounterDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); + dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); dto.setEncounterType(toReferentialReference(referentialLocale, entity.getEncounterType(), EncounterTypeDto.class)); dto.setDistance(entity.getDistance()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java index a9e8fb0..683d5e4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java @@ -25,8 +25,7 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa @Override public void copyToEntity(ReferentialLocale referentialLocale, FloatingObjectDto dto, FloatingObject entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setDaysAtSeaCount(dto.getDaysAtSeaCount()); entity.setSupportVesselName(dto.getSupportVesselName()); @@ -39,8 +38,7 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa @Override public void copyToDto(ReferentialLocale referentialLocale, FloatingObject entity, FloatingObjectDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setDaysAtSeaCount(entity.getDaysAtSeaCount()); dto.setSupportVesselName(entity.getSupportVesselName()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java index 0e765c7..b542707 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java @@ -20,8 +20,7 @@ public class FloatingObjectObservedSpeciesDtoBinder extends DataBinderSupport<Fl @Override public void copyToEntity(ReferentialLocale referentialLocale, FloatingObjectObservedSpeciesDto dto, FloatingObject entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setObjectObservedSpecies(toEntityCollection(referentialLocale, dto.getObjectObservedSpecies(), ObjectObservedSpecies.class, entity.getObjectObservedSpecies())); @@ -30,8 +29,7 @@ public class FloatingObjectObservedSpeciesDtoBinder extends DataBinderSupport<Fl @Override public void copyToDto(ReferentialLocale referentialLocale, FloatingObject entity, FloatingObjectObservedSpeciesDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setObjectObservedSpecies(toLinkedHashSetData(referentialLocale, entity.getObjectObservedSpecies(), ObjectObservedSpeciesDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java index b2e75d0..9f169a3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java @@ -20,8 +20,7 @@ public class FloatingObjectSchoolEstimateDtoBinder extends DataBinderSupport<Flo @Override public void copyToEntity(ReferentialLocale referentialLocale, FloatingObjectSchoolEstimateDto dto, FloatingObject entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setObjectSchoolEstimate(toEntityCollection(referentialLocale, dto.getObjectSchoolEstimate(), ObjectSchoolEstimate.class, entity.getObjectSchoolEstimate())); @@ -30,8 +29,7 @@ public class FloatingObjectSchoolEstimateDtoBinder extends DataBinderSupport<Flo @Override public void copyToDto(ReferentialLocale referentialLocale, FloatingObject entity, FloatingObjectSchoolEstimateDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setObjectSchoolEstimate(toLinkedHashSetData(referentialLocale, entity.getObjectSchoolEstimate(), ObjectSchoolEstimateDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java index 7f43381..120f9a6 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java @@ -20,8 +20,7 @@ public class FloatingObjectTransmittingBuoyDtoBinder extends DataBinderSupport<F @Override public void copyToEntity(ReferentialLocale referentialLocale, FloatingObjectTransmittingBuoyDto dto, FloatingObject entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setTransmittingBuoy(toEntitySet(referentialLocale, dto.getTransmittingBuoy(), TransmittingBuoy.class, entity.getTransmittingBuoy())); @@ -30,8 +29,7 @@ public class FloatingObjectTransmittingBuoyDtoBinder extends DataBinderSupport<F @Override public void copyToDto(ReferentialLocale referentialLocale, FloatingObject entity, FloatingObjectTransmittingBuoyDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setTransmittingBuoy(toLinkedHashSetData(referentialLocale, entity.getTransmittingBuoy(), TransmittingBuoyDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java index 09fe24e..fb05bd3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java @@ -20,7 +20,7 @@ public class FloatlinesCompositionBinder extends DataBinderSupport<FloatlinesCom @Override public void copyToEntity(ReferentialLocale referentialLocale, FloatlinesCompositionDto dto, FloatlinesComposition entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setLength(dto.getLength()); entity.setProportion(dto.getProportion()); @@ -31,7 +31,7 @@ public class FloatlinesCompositionBinder extends DataBinderSupport<FloatlinesCom @Override public void copyToDto(ReferentialLocale referentialLocale, FloatlinesComposition entity, FloatlinesCompositionDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setLength(entity.getLength()); dto.setProportion(entity.getProportion()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java index 9c05d7d..7e3b659 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java @@ -22,8 +22,7 @@ public class GearUseFeaturesLonglineBinder extends DataBinderSupport<GearUseFeat @Override public void copyToEntity(ReferentialLocale referentialLocale, GearUseFeaturesLonglineDto dto, GearUseFeaturesLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setNumber(dto.getNumber()); entity.setUsedInTrip(dto.getUsedInTrip()); @@ -34,8 +33,7 @@ public class GearUseFeaturesLonglineBinder extends DataBinderSupport<GearUseFeat @Override public void copyToDto(ReferentialLocale referentialLocale, GearUseFeaturesLongline entity, GearUseFeaturesLonglineDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setNumber(entity.getNumber()); dto.setUsedInTrip(entity.getUsedInTrip()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java index 5ac6435..ad83ddf 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java @@ -20,7 +20,7 @@ public class GearUseFeaturesMeasurementLonglineBinder extends DataBinderSupport< @Override public void copyToEntity(ReferentialLocale referentialLocale, GearUseFeaturesMeasurementLonglineDto dto, GearUseFeaturesMeasurementLongline entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setMeasurementValue(dto.getMeasurementValue()); entity.setGearCaracteristic(toEntity(dto.getGearCaracteristic(), GearCaracteristic.class)); @@ -30,7 +30,7 @@ public class GearUseFeaturesMeasurementLonglineBinder extends DataBinderSupport< @Override public void copyToDto(ReferentialLocale referentialLocale, GearUseFeaturesMeasurementLongline entity, GearUseFeaturesMeasurementLonglineDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setMeasurementValue(entity.getMeasurementValue()); dto.setGearCaracteristic(toReferentialReference(referentialLocale, entity.getGearCaracteristic(), GearCaracteristicDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java index 98ff84d..000d686 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java @@ -20,7 +20,7 @@ public class GearUseFeaturesMeasurementSeineBinder extends DataBinderSupport<Gea @Override public void copyToEntity(ReferentialLocale referentialLocale, GearUseFeaturesMeasurementSeineDto dto, GearUseFeaturesMeasurementSeine entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setMeasurementValue(dto.getMeasurementValue()); entity.setGearCaracteristic(toEntity(dto.getGearCaracteristic(), GearCaracteristic.class)); @@ -31,7 +31,7 @@ public class GearUseFeaturesMeasurementSeineBinder extends DataBinderSupport<Gea @Override public void copyToDto(ReferentialLocale referentialLocale, GearUseFeaturesMeasurementSeine entity, GearUseFeaturesMeasurementSeineDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setMeasurementValue(entity.getMeasurementValue()); dto.setGearCaracteristic(toReferentialReference(referentialLocale, entity.getGearCaracteristic(), GearCaracteristicDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java index ecb11c2..2df4e9a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java @@ -22,8 +22,7 @@ public class GearUseFeaturesSeineBinder extends DataBinderSupport<GearUseFeature @Override public void copyToEntity(ReferentialLocale referentialLocale, GearUseFeaturesSeineDto dto, GearUseFeaturesSeine entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setNumber(dto.getNumber()); entity.setUsedInTrip(dto.getUsedInTrip()); @@ -35,8 +34,7 @@ public class GearUseFeaturesSeineBinder extends DataBinderSupport<GearUseFeature @Override public void copyToDto(ReferentialLocale referentialLocale, GearUseFeaturesSeine entity, GearUseFeaturesSeineDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setNumber(entity.getNumber()); dto.setUsedInTrip(entity.getUsedInTrip()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java index 061d94d..661f17f 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java @@ -22,7 +22,7 @@ public class HooksCompositionBinder extends DataBinderSupport<HooksComposition, @Override public void copyToEntity(ReferentialLocale referentialLocale, HooksCompositionDto dto, HooksComposition entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setProportion(dto.getProportion()); entity.setHookOffset(dto.getHookOffset()); @@ -34,7 +34,7 @@ public class HooksCompositionBinder extends DataBinderSupport<HooksComposition, @Override public void copyToDto(ReferentialLocale referentialLocale, HooksComposition entity, HooksCompositionDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setProportion(entity.getProportion()); dto.setHookOffset(entity.getHookOffset()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java index 1c08288..74b2208 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java @@ -25,8 +25,7 @@ public class NonTargetCatchBinder extends DataBinderSupport<NonTargetCatch, NonT @Override public void copyToEntity(ReferentialLocale referentialLocale, NonTargetCatchDto dto, NonTargetCatch entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setCatchWeight(dto.getCatchWeight()); entity.setMeanWeight(dto.getMeanWeight()); @@ -46,8 +45,7 @@ public class NonTargetCatchBinder extends DataBinderSupport<NonTargetCatch, NonT @Override public void copyToDto(ReferentialLocale referentialLocale, NonTargetCatch entity, NonTargetCatchDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setCatchWeight(entity.getCatchWeight()); dto.setMeanWeight(entity.getMeanWeight()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java index 05f8e35..5a25365 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java @@ -22,7 +22,7 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No @Override public void copyToEntity(ReferentialLocale referentialLocale, NonTargetLengthDto dto, NonTargetLength entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setLength(dto.getLength()); entity.setWeight(dto.getWeight()); @@ -40,7 +40,7 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No @Override public void copyToDto(ReferentialLocale referentialLocale, NonTargetLength entity, NonTargetLengthDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setLength(entity.getLength()); dto.setWeight(entity.getWeight()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java index c0d8cc6..094ee8c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java @@ -20,8 +20,7 @@ public class NonTargetSampleBinder extends DataBinderSupport<NonTargetSample, No @Override public void copyToEntity(ReferentialLocale referentialLocale, NonTargetSampleDto dto, NonTargetSample entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setNonTargetLength(toEntitySet(referentialLocale, dto.getNonTargetLength(), NonTargetLength.class, entity.getNonTargetLength())); @@ -30,8 +29,7 @@ public class NonTargetSampleBinder extends DataBinderSupport<NonTargetSample, No @Override public void copyToDto(ReferentialLocale referentialLocale, NonTargetSample entity, NonTargetSampleDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setNonTargetLength(toLinkedHashSetData(referentialLocale, entity.getNonTargetLength(), NonTargetLengthDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java index 76d559f..52387ac 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java @@ -22,8 +22,7 @@ public class ObjectObservedSpeciesBinder extends DataBinderSupport<ObjectObserve @Override public void copyToEntity(ReferentialLocale referentialLocale, ObjectObservedSpeciesDto dto, ObjectObservedSpecies entity) { - entity.setTopiaId(dto.getId()); - + copyDtoDataFieldsToEntity(dto, entity); entity.setCount(entity.getCount()); entity.setStatut(entity.getStatut()); @@ -35,8 +34,7 @@ public class ObjectObservedSpeciesBinder extends DataBinderSupport<ObjectObserve @Override public void copyToDto(ReferentialLocale referentialLocale, ObjectObservedSpecies entity, ObjectObservedSpeciesDto dto) { - dto.setId(entity.getTopiaId()); - + copyEntityDataFieldsToDto(entity, dto); dto.setCount(entity.getCount()); dto.setStatut(entity.getStatut()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java index bb429b3..6790643 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java @@ -20,7 +20,7 @@ public class ObjectSchoolEstimateBinder extends DataBinderSupport<ObjectSchoolEs @Override public void copyToEntity(ReferentialLocale referentialLocale, ObjectSchoolEstimateDto dto, ObjectSchoolEstimate entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setTotalWeight(dto.getTotalWeight()); entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); @@ -30,7 +30,7 @@ public class ObjectSchoolEstimateBinder extends DataBinderSupport<ObjectSchoolEs @Override public void copyToDto(ReferentialLocale referentialLocale, ObjectSchoolEstimate entity, ObjectSchoolEstimateDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setTotalWeight(entity.getTotalWeight()); dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); 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 0fe15d9..3afb393 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 @@ -20,10 +20,8 @@ public class RouteBinder extends DataBinderSupport<Route, RouteDto> { @Override public void copyToEntity(ReferentialLocale referentialLocale, RouteDto dto, Route entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); + copyDtoDataFieldsToEntity(dto, entity); - entity.setComment(dto.getComment()); entity.setDate(dto.getDate()); entity.setStartLogValue(dto.getStartLogValue()); entity.setEndLogValue(dto.getEndLogValue()); @@ -35,15 +33,13 @@ public class RouteBinder extends DataBinderSupport<Route, RouteDto> { @Override public void copyToDto(ReferentialLocale referentialLocale, Route entity, RouteDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); + copyEntityDataFieldsToDto(entity, dto); - dto.setComment(entity.getComment()); dto.setDate(entity.getDate()); dto.setStartLogValue(entity.getStartLogValue()); dto.setEndLogValue(entity.getEndLogValue()); dto.setCheckLevel(entity.getCheckLevel()); - dto.setLastUpdateDate(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/RouteStubDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java index 6f5c765..7691089 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java @@ -18,7 +18,7 @@ public class RouteStubDtoBinder extends DataBinderSupport<Route, RouteStubDto> { @Override public void copyToEntity(ReferentialLocale referentialLocale, RouteStubDto dto, Route entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setDate(dto.getDate()); entity.setStartLogValue(dto.getStartLogValue()); @@ -29,7 +29,7 @@ public class RouteStubDtoBinder extends DataBinderSupport<Route, RouteStubDto> { @Override public void copyToDto(ReferentialLocale referentialLocale, Route entity, RouteStubDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setDate(entity.getDate()); dto.setStartLogValue(entity.getStartLogValue()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java index d5c908c..8fe6dde 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java @@ -21,7 +21,7 @@ public class SchoolEstimateBinder extends DataBinderSupport<SchoolEstimate, Scho @Override public void copyToEntity(ReferentialLocale referentialLocale, SchoolEstimateDto dto, SchoolEstimate entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setTotalWeight(dto.getTotalWeight()); entity.setMeanWeight(dto.getMeanWeight()); @@ -32,7 +32,7 @@ public class SchoolEstimateBinder extends DataBinderSupport<SchoolEstimate, Scho @Override public void copyToDto(ReferentialLocale referentialLocale, SchoolEstimate entity, SchoolEstimateDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setTotalWeight(entity.getTotalWeight()); dto.setMeanWeight(entity.getMeanWeight()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java index 986d51e..4102ccb 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java @@ -21,7 +21,7 @@ public class SectionBinder extends DataBinderSupport<Section, SectionDto> { @Override public void copyToEntity(ReferentialLocale referentialLocale, SectionDto dto, Section entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setSettingIdentifier(dto.getSettingIdentifier()); entity.setHaulingIdentifier(dto.getHaulingIdentifier()); @@ -32,7 +32,7 @@ public class SectionBinder extends DataBinderSupport<Section, SectionDto> { @Override public void copyToDto(ReferentialLocale referentialLocale, Section entity, SectionDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setSettingIdentifier(entity.getSettingIdentifier()); dto.setHaulingIdentifier(entity.getHaulingIdentifier()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java index 5df54cf..5983504 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java @@ -24,7 +24,7 @@ public class SensorUsedBinder extends DataBinderSupport<SensorUsed, SensorUsedDt @Override public void copyToEntity(ReferentialLocale referentialLocale, SensorUsedDto dto, SensorUsed entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setData(dto.getData()); entity.setDataFilename(dto.getDataFilename()); @@ -39,7 +39,7 @@ public class SensorUsedBinder extends DataBinderSupport<SensorUsed, SensorUsedDt @Override public void copyToDto(ReferentialLocale referentialLocale, SensorUsed entity, SensorUsedDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setData(entity.getData()); dto.setDataFilename(entity.getDataFilename()); 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 e1f1350..d25dace 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 @@ -27,9 +27,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin @Override public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineDto dto, SetLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setHomeId(dto.getHomeId()); entity.setNumber(dto.getNumber()); @@ -74,9 +72,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin @Override public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setHomeId(entity.getHomeId()); dto.setNumber(entity.getNumber()); @@ -110,7 +106,7 @@ public class SetLonglineBinder extends DataBinderSupport<SetLongline, SetLonglin dto.setHaulingEndLongitude(entity.getHaulingEndLongitude()); dto.setHaulingBreaks(entity.getHaulingBreaks()); dto.setMonitored(entity.getMonitored()); - dto.setLastUpdateDate(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 021db91..10dad09 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 @@ -20,8 +20,7 @@ public class SetLonglineCatchDtoBinder extends DataBinderSupport<SetLongline, Se @Override public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineCatchDto dto, SetLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); + copyDtoDataFieldsToEntity(dto, entity); entity.setCatchLongline(toEntitySet(referentialLocale, dto.getCatchLongline(), CatchLongline.class, entity.getCatchLongline())); @@ -30,8 +29,7 @@ public class SetLonglineCatchDtoBinder extends DataBinderSupport<SetLongline, Se @Override public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineCatchDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); + copyEntityDataFieldsToDto(entity, dto); 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 589287b..ad9a2b1 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 @@ -20,8 +20,7 @@ public class SetLonglineDetailCompositionDtoBinder extends DataBinderSupport<Set @Override public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineDetailCompositionDto dto, SetLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); + copyDtoDataFieldsToEntity(dto, entity); entity.setSection(toEntitySet(referentialLocale, dto.getSection(), Section.class, entity.getSection())); entity.setSettingStartTimeStamp(dto.getSettingStartTimeStamp()); @@ -37,8 +36,7 @@ public class SetLonglineDetailCompositionDtoBinder extends DataBinderSupport<Set @Override public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineDetailCompositionDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); + copyEntityDataFieldsToDto(entity, dto); 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 a94da46..f079563 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 @@ -28,9 +28,7 @@ public class SetLonglineGlobalCompositionDtoBinder extends DataBinderSupport<Set @Override public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineGlobalCompositionDto dto, SetLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setFloatlinesComposition(toEntityCollection(referentialLocale, dto.getFloatlinesComposition(), FloatlinesComposition.class, entity.getFloatlinesComposition())); entity.setBranchlinesComposition(toEntityCollection(referentialLocale, dto.getBranchlinesComposition(), BranchlinesComposition.class, entity.getBranchlinesComposition())); @@ -43,9 +41,7 @@ public class SetLonglineGlobalCompositionDtoBinder extends DataBinderSupport<Set @Override public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineGlobalCompositionDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setFloatlinesComposition(toLinkedHashSetData(referentialLocale, entity.getFloatlinesComposition(), FloatlinesCompositionDto.class)); dto.setBranchlinesComposition(toLinkedHashSetData(referentialLocale, entity.getBranchlinesComposition(), BranchlinesCompositionDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java index 9fe3c24..11c6139 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java @@ -24,7 +24,7 @@ public class SetLonglineStubDtoBinder extends DataBinderSupport<SetLongline, Set @Override public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineStubDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setHomeId(entity.getHomeId()); dto.setNumber(entity.getNumber()); 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 b4ad017..c4f3253 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 @@ -18,8 +18,7 @@ public class SetLonglineTdrDtoBinder extends DataBinderSupport<SetLongline, SetL @Override public void copyToEntity(ReferentialLocale referentialLocale, SetLonglineTdrDto dto, SetLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); + copyDtoDataFieldsToEntity(dto, entity); entity.setSettingStartTimeStamp(dto.getSettingStartTimeStamp()); @@ -28,8 +27,7 @@ public class SetLonglineTdrDtoBinder extends DataBinderSupport<SetLongline, SetL @Override public void copyToDto(ReferentialLocale referentialLocale, SetLongline entity, SetLonglineTdrDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); + copyEntityDataFieldsToDto(entity, dto); 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 4cfbf59..824e1c0 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 @@ -21,9 +21,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { @Override public void copyToEntity(ReferentialLocale referentialLocale, SetSeineDto dto, SetSeine entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setStartTime(dto.getStartTime()); entity.setEndPursingTimeStamp(dto.getEndPursingTimeStamp()); @@ -48,9 +46,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { @Override public void copyToDto(ReferentialLocale referentialLocale, SetSeine entity, SetSeineDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setStartTime(entity.getStartTime()); dto.setEndPursingTimeStamp(entity.getEndPursingTimeStamp()); @@ -66,7 +62,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { dto.setTargetDiscarded(entity.getTargetDiscarded()); dto.setNonTargetDiscarded(entity.getNonTargetDiscarded()); dto.setCurrentMeasureDepth(entity.getCurrentMeasureDepth()); - dto.setLastUpdateDate(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/SetSeineNonTargetCatchDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java index 9637541..e5041b6 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java @@ -20,7 +20,7 @@ public class SetSeineNonTargetCatchDtoBinder extends DataBinderSupport<SetSeine, @Override public void copyToEntity(ReferentialLocale referentialLocale, SetSeineNonTargetCatchDto dto, SetSeine entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setNonTargetCatch(toEntityCollection(referentialLocale, dto.getNonTargetCatch(), NonTargetCatch.class, entity.getNonTargetCatch())); @@ -29,7 +29,7 @@ public class SetSeineNonTargetCatchDtoBinder extends DataBinderSupport<SetSeine, @Override public void copyToDto(ReferentialLocale referentialLocale, SetSeine entity, SetSeineNonTargetCatchDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setNonTargetCatch(toLinkedHashSetData(referentialLocale, entity.getNonTargetCatch(), NonTargetCatchDto.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 30186cd..104b1fa 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 @@ -20,9 +20,7 @@ public class SetSeineSchoolEstimateDtoBinder extends DataBinderSupport<SetSeine, @Override public void copyToEntity(ReferentialLocale referentialLocale, SetSeineSchoolEstimateDto dto, SetSeine entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setSchoolEstimate(toEntityCollection(referentialLocale, dto.getSchoolEstimate(), SchoolEstimate.class, entity.getSchoolEstimate())); } @@ -30,9 +28,7 @@ public class SetSeineSchoolEstimateDtoBinder extends DataBinderSupport<SetSeine, @Override public void copyToDto(ReferentialLocale referentialLocale, SetSeine entity, SetSeineSchoolEstimateDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); 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 623e223..f4ef420 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 @@ -20,8 +20,7 @@ public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, Se @Override public void copyToEntity(ReferentialLocale referentialLocale, SetSeineTargetCatchDto dto, SetSeine entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); + copyDtoDataFieldsToEntity(dto, entity); entity.setTargetCatch(toEntityCollection(referentialLocale, dto.getTargetCatch(), TargetCatch.class, entity.getTargetCatch())); @@ -30,8 +29,7 @@ public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, Se @Override public void copyToDto(ReferentialLocale referentialLocale, SetSeine entity, SetSeineTargetCatchDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); + copyEntityDataFieldsToDto(entity, dto); dto.setTargetCatch(toLinkedHashSetData(referentialLocale, entity.getTargetCatch(), TargetCatchDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java index 35c3bf0..7eebb80 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java @@ -20,7 +20,7 @@ public class SizeMeasureBinder extends DataBinderSupport<SizeMeasure, SizeMeasur @Override public void copyToEntity(ReferentialLocale referentialLocale, SizeMeasureDto dto, SizeMeasure entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setSize(dto.getSize()); entity.setSizeMeasureType(toEntity(dto.getSizeMeasureType(), SizeMeasureType.class)); @@ -31,7 +31,7 @@ public class SizeMeasureBinder extends DataBinderSupport<SizeMeasure, SizeMeasur @Override public void copyToDto(ReferentialLocale referentialLocale, SizeMeasure entity, SizeMeasureDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setSize(entity.getSize()); dto.setSizeMeasureType(toReferentialReference(referentialLocale, entity.getSizeMeasureType(), SizeMeasureTypeDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java index 33724dd..dd59de1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java @@ -24,8 +24,7 @@ public class TargetCatchBinder extends DataBinderSupport<TargetCatch, TargetCatc @Override public void copyToEntity(ReferentialLocale referentialLocale, TargetCatchDto dto, TargetCatch entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setCatchWeight(dto.getCatchWeight()); entity.setWell(dto.getWell()); @@ -40,8 +39,7 @@ public class TargetCatchBinder extends DataBinderSupport<TargetCatch, TargetCatc @Override public void copyToDto(ReferentialLocale referentialLocale, TargetCatch entity, TargetCatchDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setCatchWeight(entity.getCatchWeight()); dto.setWell(entity.getWell()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java index 79338c6..348fac3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java @@ -21,7 +21,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe @Override public void copyToEntity(ReferentialLocale referentialLocale, TargetLengthDto dto, TargetLength entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); entity.setMeasureType(dto.getMeasureType()); @@ -39,7 +39,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe @Override public void copyToDto(ReferentialLocale referentialLocale, TargetLength entity, TargetLengthDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); dto.setMeasureType(entity.getMeasureType()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java index 0b5d176..b2a36ae 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java @@ -20,8 +20,7 @@ public class TargetSampleBinder extends DataBinderSupport<TargetSample, TargetSa @Override public void copyToEntity(ReferentialLocale referentialLocale, TargetSampleDto dto, TargetSample entity) { - entity.setTopiaId(dto.getId()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setNature(dto.getNature()); entity.setDiscarded(dto.getDiscarded()); @@ -32,8 +31,7 @@ public class TargetSampleBinder extends DataBinderSupport<TargetSample, TargetSa @Override public void copyToDto(ReferentialLocale referentialLocale, TargetSample entity, TargetSampleDto dto) { - dto.setId(entity.getTopiaId()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setNature(entity.getNature()); dto.setDiscarded(entity.getDiscarded()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java index 66ed5a4..92d1ca1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java @@ -32,7 +32,7 @@ public class TdrBinder extends DataBinderSupport<Tdr, TdrDto> { @Override public void copyToEntity(ReferentialLocale referentialLocale, TdrDto dto, Tdr entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setHomeId(dto.getHomeId()); entity.setFloatline1Length(dto.getFloatline1Length()); @@ -66,7 +66,7 @@ public class TdrBinder extends DataBinderSupport<Tdr, TdrDto> { @Override public void copyToDto(ReferentialLocale referentialLocale, Tdr entity, TdrDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setHomeId(entity.getHomeId()); dto.setFloatline1Length(entity.getFloatline1Length()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java index cd1a70b..3fa5660 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java @@ -25,7 +25,7 @@ public class TransmittingBuoyBinder extends DataBinderSupport<TransmittingBuoy, @Override public void copyToEntity(ReferentialLocale referentialLocale, TransmittingBuoyDto dto, TransmittingBuoy entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setCode(dto.getCode()); entity.setBrand(dto.getBrand()); @@ -39,7 +39,7 @@ public class TransmittingBuoyBinder extends DataBinderSupport<TransmittingBuoy, @Override public void copyToDto(ReferentialLocale referentialLocale, TransmittingBuoy entity, TransmittingBuoyDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setCode(entity.getCode()); dto.setBrand(entity.getBrand()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java index 5c39510..51b5b8e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java @@ -18,7 +18,7 @@ public class TripLonglineActivityDtoBinder extends DataBinderSupport<ActivityLon @Override public void copyToEntity(ReferentialLocale referentialLocale, TripLonglineActivityDto dto, ActivityLongline entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setTimeStamp(dto.getTimeStamp()); @@ -27,7 +27,7 @@ public class TripLonglineActivityDtoBinder extends DataBinderSupport<ActivityLon @Override public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, TripLonglineActivityDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setTimeStamp(entity.getTimeStamp()); 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 c12eab5..e238d37 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 @@ -33,9 +33,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong @Override public void copyToEntity(ReferentialLocale referentialLocale, TripLonglineDto dto, TripLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setStartDate(dto.getStartDate()); entity.setEndDate(dto.getEndDate()); @@ -57,9 +55,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong @Override public void copyToDto(ReferentialLocale referentialLocale, TripLongline entity, TripLonglineDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setStartDate(entity.getStartDate()); dto.setEndDate(entity.getEndDate()); 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 4781322..fab4dba 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 @@ -20,8 +20,7 @@ public class TripLonglineGearUseDtoBinder extends DataBinderSupport<TripLongline @Override public void copyToEntity(ReferentialLocale referentialLocale, TripLonglineGearUseDto dto, TripLongline entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); + copyDtoDataFieldsToEntity(dto, entity); entity.setGearUseFeaturesLongline(toEntitySet(referentialLocale, dto.getGearUseFeaturesLongline(), GearUseFeaturesLongline.class, entity.getGearUseFeaturesLongline())); @@ -30,8 +29,7 @@ public class TripLonglineGearUseDtoBinder extends DataBinderSupport<TripLongline @Override public void copyToDto(ReferentialLocale referentialLocale, TripLongline entity, TripLonglineGearUseDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); + copyEntityDataFieldsToDto(entity, dto); 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 946f0a2..0279961 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 @@ -31,9 +31,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> @Override public void copyToEntity(ReferentialLocale referentialLocale, TripSeineDto dto, TripSeine entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); - entity.setComment(dto.getComment()); + copyDtoDataFieldsToEntity(dto, entity); entity.setStartDate(dto.getStartDate()); entity.setEndDate(dto.getEndDate()); @@ -57,9 +55,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> @Override public void copyToDto(ReferentialLocale referentialLocale, TripSeine entity, TripSeineDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); - dto.setComment(entity.getComment()); + copyEntityDataFieldsToDto(entity, dto); dto.setStartDate(entity.getStartDate()); dto.setEndDate(entity.getEndDate()); 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 1e21186..bc7720b 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 @@ -20,8 +20,7 @@ public class TripSeineGearUseDtoBinder extends DataBinderSupport<TripSeine, Trip @Override public void copyToEntity(ReferentialLocale referentialLocale, TripSeineGearUseDto dto, TripSeine entity) { - entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); + copyDtoDataFieldsToEntity(dto, entity); entity.setGearUseFeaturesSeine(toEntityCollection(referentialLocale, dto.getGearUseFeaturesSeine(), GearUseFeaturesSeine.class, entity.getGearUseFeaturesSeine())); @@ -30,8 +29,7 @@ public class TripSeineGearUseDtoBinder extends DataBinderSupport<TripSeine, Trip @Override public void copyToDto(ReferentialLocale referentialLocale, TripSeine entity, TripSeineGearUseDto dto) { - dto.setId(entity.getTopiaId()); - dto.setLastUpdateDate(entity.getLastUpdateDate()); + copyEntityDataFieldsToDto(entity, dto); dto.setGearUseFeaturesSeine(toLinkedHashSetData(referentialLocale, entity.getGearUseFeaturesSeine(), GearUseFeaturesSeineDto.class)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java index 4173926..81ccb85 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java @@ -20,7 +20,7 @@ public class WeightMeasureBinder extends DataBinderSupport<WeightMeasure, Weight @Override public void copyToEntity(ReferentialLocale referentialLocale, WeightMeasureDto dto, WeightMeasure entity) { - entity.setTopiaId(dto.getId()); + copyDtoDataFieldsToEntity(dto, entity); entity.setWeight(dto.getWeight()); entity.setWeightMeasureType(toEntity(dto.getWeightMeasureType(), WeightMeasureType.class)); @@ -30,7 +30,7 @@ public class WeightMeasureBinder extends DataBinderSupport<WeightMeasure, Weight @Override public void copyToDto(ReferentialLocale referentialLocale, WeightMeasure entity, WeightMeasureDto dto) { - dto.setId(entity.getTopiaId()); + copyEntityDataFieldsToDto(entity, dto); dto.setWeight(entity.getWeight()); dto.setWeightMeasureType(toReferentialReference(referentialLocale, entity.getWeightMeasureType(), WeightMeasureTypeDto.class)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.