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 b6804fd6cf50bff2d7d2287b8a0cda6fda6933be Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 27 19:15:32 2015 +0100 o Introduction ObserveEntity et ObserveDataEntity o Mise en place de la date de dernière mise à jour sur toutes les entités o Alignement du code pour les dto o Optionmisation des dépendences --- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIModel.java | 2 +- .../observe/ObserveTopiaPersistenceContext.java | 5 +-- .../java/fr/ird/observe/entities/Entities.java | 13 +++--- observe-services-configuration-api/pom.xml | 5 --- observe-services-configuration-rest/pom.xml | 26 ----------- ...bserveDataSourceConfigurationRestConstants.java | 4 +- .../src/test/resources/log4j.properties | 32 -------------- observe-services-configuration-topia/pom.xml | 48 --------------------- .../src/test/resources/log4j.properties | 32 -------------- .../observe/services/dto/AbstractReference.java | 12 ++++++ .../fr/ird/observe/services/dto/DataReference.java | 3 +- .../observe/services/dto/FollowedUpdateDto.java | 14 ------ .../java/fr/ird/observe/services/dto/IdDto.java | 5 ++- .../services/dto/referential/ReferentialDto.java | 12 +++--- .../observe/services/dto/result/SaveResultDto.java | 5 +-- .../services/dto/result/SaveResultDtos.java | 4 +- .../dto/result/TripChildSaveResultDtos.java | 6 +-- .../src/main/xmi/observe-services-dto-common.zargo | Bin 43178 -> 42022 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 64908 -> 63930 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60150 -> 59464 bytes observe-services-topia/pom.xml | 9 ++-- .../ird/observe/services/ObserveServiceTopia.java | 23 +++++----- .../ird/observe/services/binder/BinderEngine.java | 28 ++++++------ .../services/binder/BinderEngineInitializer.java | 18 ++++---- .../binder/data/ActivityLonglineBinder.java | 4 +- .../data/ActivityLonglineEncouterDtoBinder.java | 4 +- .../data/ActivityLonglineSensorUsedDtoBinder.java | 4 +- .../services/binder/data/ActivitySeineBinder.java | 4 +- .../data/ActivitySeineObservedSystemDtoBinder.java | 4 +- .../services/binder/data/DataBinderSupport.java | 17 ++++---- .../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 | 6 +-- .../observe/services/entity/EntitiesExtractor.java | 4 +- .../services/entity/EntitiesSetFactory.java | 26 +++++------ .../services/service/ReferentialServiceTopia.java | 7 +-- .../service/actions/report/ReportServiceTopia.java | 12 +++--- .../GenerateValidatorDescriptorsFileTool.java | 15 ++++--- .../actions/validate/ValidateServiceTopia.java | 9 ++-- .../service/longline/BranchlineServiceTopia.java | 2 +- .../services/service/seine/RouteServiceTopia.java | 6 +-- .../services/binder/BinderEngineMetadataTest.java | 20 ++++----- .../observe/services/binder/BinderEngineTest.java | 6 +-- .../service/seine/TripSeineServiceTopiaTest.java | 10 ++--- observe-test-data/pom.xml | 28 ++++-------- 59 files changed, 203 insertions(+), 361 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 9d96dc0..2e59236 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -408,7 +408,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content content.add(new JLabel(t("observe.common.lastUpdateDate"))); - content.add(new JLabel(dateFormat.format(bean.getLastUpdate()))); + content.add(new JLabel(dateFormat.format(bean.getLastUpdateDate()))); content.add(new JLabel(t("observe.common.topiaVersion"))); content.add(new JLabel(String.valueOf(bean.getVersion()))); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index 64459df..124c1a7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -597,7 +597,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat @Override protected void doPersist(SetLonglineCatchDto bean) { SaveResultDto saveResult = getSetLonglineCatchService().save(bean); - bean.setLastUpdate(saveResult.getLastUpdate()); + bean.setLastUpdateDate(saveResult.getLastUpdateDate()); } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java index 4b4df39..8c7766f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java @@ -63,7 +63,7 @@ public class GearUseFeaturesLonglineUIModel extends ContentTableUIModel<TripLong new String[]{ TripLonglineGearUseDto.PROPERTY_ID, TripLonglineGearUseDto.PROPERTY_GEAR_USE_FEATURES_LONGLINE, - TripLonglineGearUseDto.PROPERTY_LAST_UPDATE, + TripLonglineGearUseDto.PROPERTY_LAST_UPDATE_DATE, }, new String[]{ GearUseFeaturesLonglineDto.PROPERTY_ID, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java index f252bde..c76af87 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java @@ -63,7 +63,7 @@ public class GearUseFeaturesSeineUIModel extends ContentTableUIModel<TripSeineGe new String[]{ TripSeineGearUseDto.PROPERTY_ID, TripSeineGearUseDto.PROPERTY_GEAR_USE_FEATURES_SEINE, - TripSeineGearUseDto.PROPERTY_LAST_UPDATE, + TripSeineGearUseDto.PROPERTY_LAST_UPDATE_DATE, }, new String[]{ GearUseFeaturesSeineDto.PROPERTY_ID, diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java index 70330ca..841e2e0 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java @@ -29,7 +29,6 @@ import fr.ird.observe.entities.ObserveEntity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDao; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContextConstructorParameter; import java.util.Date; @@ -81,7 +80,7 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste getHibernateSupport().getHibernateSession().flush(); } - public <E extends TopiaEntity> Class<E> getType(E entity) { + public <E extends ObserveEntity> Class<E> getType(E entity) { ObserveEntityEnum entityEnum = ObserveEntityEnum.valueOf(entity); Preconditions.checkNotNull(entityEnum, "Entity " + entity + " is not managed by ToPIA"); @@ -89,7 +88,7 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste } - public <E extends TopiaEntity> TopiaDao<E> getDao(E entity) { + public <E extends ObserveEntity> TopiaDao<E> getDao(E entity) { return getDao(getType(entity)); } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index 2df93dc..b6a63b4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -34,7 +34,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntities; -import org.nuiton.topia.persistence.TopiaEntity; import java.util.Arrays; import java.util.Collection; @@ -309,10 +308,10 @@ public class Entities { */ public static boolean isReferentielClass( Class<?> klass) { - if (!TopiaEntity.class.isAssignableFrom(klass)) { + if (!ObserveEntity.class.isAssignableFrom(klass)) { return false; } - klass = ObserveEntityEnum.getContractClass((Class<? extends TopiaEntity>) klass); + klass = ObserveEntityEnum.getContractClass((Class<? extends ObserveEntity>) klass); for (ObserveEntityEnum c : REFERENCE_ENTITIES_LIST) { if (c.getContract().equals(klass)) { return true; @@ -339,10 +338,10 @@ public class Entities { * @return {@code true} si c'est une classe de donnée. */ public static boolean isDataClass(Class<?> klass) { - if (!TopiaEntity.class.isAssignableFrom(klass)) { + if (!ObserveEntity.class.isAssignableFrom(klass)) { return false; } - klass = ObserveEntityEnum.getContractClass((Class<? extends TopiaEntity>) klass); + klass = ObserveEntityEnum.getContractClass((Class<? extends ObserveEntity>) klass); for (ObserveEntityEnum c : DATA_ENTITIES_LIST) { if (c.getContract().equals(klass)) { return true; @@ -351,7 +350,7 @@ public class Entities { return false; } - public static <E extends TopiaEntity> Map<String, E> toIdMap(Collection<E> entities) { + public static <E extends ObserveEntity> Map<String, E> toIdMap(Collection<E> entities) { Map<String, E> map = CollectionUtils.isEmpty(entities) ? Maps.<String, E>newHashMap() @@ -361,7 +360,7 @@ public class Entities { } - public static <E extends TopiaEntity> String getTableName(E entity) { + public static <E extends ObserveEntity> String getTableName(E entity) { ObserveEntityEnum entityEnum = ObserveEntityEnum.valueOf(entity); return entityEnum.dbSchemaName() + "." + entityEnum.dbTableName(); diff --git a/observe-services-configuration-api/pom.xml b/observe-services-configuration-api/pom.xml index bbae81e..eae3ae5 100644 --- a/observe-services-configuration-api/pom.xml +++ b/observe-services-configuration-api/pom.xml @@ -19,11 +19,6 @@ <!-- commons dependencies --> - <!--dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency--> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> diff --git a/observe-services-configuration-rest/pom.xml b/observe-services-configuration-rest/pom.xml index b789c89..e50756e 100644 --- a/observe-services-configuration-rest/pom.xml +++ b/observe-services-configuration-rest/pom.xml @@ -23,11 +23,6 @@ <artifactId>observe-services-configuration-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>observe-services-api</artifactId> - <version>${project.version}</version> - </dependency> <!-- commons dependencies --> @@ -42,27 +37,6 @@ <artifactId>nuiton-utils</artifactId> </dependency> - <!-- Logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - - <!-- test dependencies --> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java index 2570a0d..5e83140 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java @@ -22,8 +22,6 @@ package fr.ird.observe.services.configuration; * #L% */ -import fr.ird.observe.services.service.DataSourceService; - /** * Created on 04/09/15. * @@ -31,7 +29,7 @@ import fr.ird.observe.services.service.DataSourceService; */ public interface ObserveDataSourceConfigurationRestConstants { - Package ROOT_SERVICES_PACKAGE = DataSourceService.class.getPackage(); + Package ROOT_SERVICES_PACKAGE = ObserveDataSourceConfigurationRestConstants.class.getPackage(); String PARAMETER_DATA_SOURCE_CONFIGURATION = "dataSourceConfiguration"; diff --git a/observe-services-configuration-rest/src/test/resources/log4j.properties b/observe-services-configuration-rest/src/test/resources/log4j.properties deleted file mode 100644 index 0f21768..0000000 --- a/observe-services-configuration-rest/src/test/resources/log4j.properties +++ /dev/null @@ -1,32 +0,0 @@ -### -# #%L -# ObServe :: Swing -# %% -# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -# Global logging configuration -log4j.rootLogger=ERROR, stdout -#log4j.rootLogger=ERROR, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n -#log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -log4j.logger.fr.ird.observe=INFO diff --git a/observe-services-configuration-topia/pom.xml b/observe-services-configuration-topia/pom.xml index 5d22416..53510e1 100644 --- a/observe-services-configuration-topia/pom.xml +++ b/observe-services-configuration-topia/pom.xml @@ -25,19 +25,6 @@ </dependency> <!-- commons dependencies --> - - <!--dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency--> - <!--dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency--> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -49,41 +36,6 @@ <artifactId>nuiton-utils</artifactId> </dependency> - <!-- persistence --> - <!--dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency--> - <!--dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency--> - <!--dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-replication</artifactId> - </dependency--> - - <!-- Logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - - <!-- test dependencies --> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> diff --git a/observe-services-configuration-topia/src/test/resources/log4j.properties b/observe-services-configuration-topia/src/test/resources/log4j.properties deleted file mode 100644 index 0f21768..0000000 --- a/observe-services-configuration-topia/src/test/resources/log4j.properties +++ /dev/null @@ -1,32 +0,0 @@ -### -# #%L -# ObServe :: Swing -# %% -# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -# Global logging configuration -log4j.rootLogger=ERROR, stdout -#log4j.rootLogger=ERROR, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n -#log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -log4j.logger.fr.ird.observe=INFO diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java index 7992da5..0c972be 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java @@ -24,6 +24,8 @@ public abstract class AbstractReference<D extends IdDto> implements ObserveDto, public static final String PROPERTY_ID = "id"; + public static final String PROPERTY_LAST_UPDATE_DATE = "lastUpdateDate"; + public static final String PROPERTY_TYPE = "type"; public static final String PROPERTY_CREATE_DATE = "createDate"; @@ -45,6 +47,8 @@ public abstract class AbstractReference<D extends IdDto> implements ObserveDto, protected String id; + protected Date lastUpdateDate; + protected Date createDate; protected long version; @@ -140,6 +144,14 @@ public abstract class AbstractReference<D extends IdDto> implements ObserveDto, this.version = version; } + public Date getLastUpdateDate() { + return lastUpdateDate; + } + + public void setLastUpdateDate(Date lastUpdateDate) { + this.lastUpdateDate = lastUpdateDate; + } + public Serializable getPropertyValue(String propertyName) { int propertyIndex = getPropertyIndex(propertyName); return labelPropertyValues[propertyIndex]; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java index e4e7554..bd421f1 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java @@ -55,7 +55,8 @@ public class DataReference<D extends DataDto> extends AbstractReference<D> { public String toString() { MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this) .add(PROPERTY_TYPE, type.getSimpleName()) - .add(PROPERTY_ID, id); + .add(PROPERTY_ID, id) + .add(PROPERTY_LAST_UPDATE_DATE, lastUpdateDate); if (log.isDebugEnabled()) { toStringHelper diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java deleted file mode 100644 index f304477..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package fr.ird.observe.services.dto; - -import java.util.Date; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public interface FollowedUpdateDto { - - Date getLastUpdate(); - - void setLastUpdate(Date lastUpdate); - -} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java index 3d40e1d..e8f2815 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java @@ -31,6 +31,8 @@ public abstract class IdDto extends AbstractIdDto { private static final long serialVersionUID = 1L; + public static final String PROPERTY_LAST_UPDATE_DATE = "lastUpdateDate"; + public boolean isPersisted() { return StringUtils.isNotBlank(id); } @@ -55,7 +57,8 @@ public abstract class IdDto extends AbstractIdDto { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("id", id) + .add(PROPERTY_ID, id) + .add(PROPERTY_LAST_UPDATE_DATE, lastUpdateDate) .toString(); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java index e9507ff..e3b450c 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java @@ -9,12 +9,12 @@ public abstract class ReferentialDto extends AbstractReferentialDto { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("id", id) - .add("enabled", enabled) - .add("needComment", needComment) - .add("createDate", createDate) - .add("lastUpdate", lastUpdate) - .add("version", version) + .add(PROPERTY_ID, id) + .add(PROPERTY_ENABLED, enabled) + .add(PROPERTY_NEED_COMMENT, needComment) + .add(PROPERTY_CREATE_DATE, createDate) + .add(PROPERTY_LAST_UPDATE_DATE, lastUpdateDate) + .add(PROPERTY_VERSION, version) .toString(); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java index bd7d551..691365c 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java @@ -1,15 +1,14 @@ package fr.ird.observe.services.dto.result; -import fr.ird.observe.services.dto.FollowedUpdateDto; import fr.ird.observe.services.dto.IdDto; public class SaveResultDto extends AbstractSaveResultDto { private static final long serialVersionUID = 1L; - public <D extends IdDto & FollowedUpdateDto> void toDto(D dto) { + public <D extends IdDto> void toDto(D dto) { dto.setId(getId()); - dto.setLastUpdate(getLastUpdate()); + dto.setLastUpdateDate(getLastUpdateDate()); } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java index cd6f2fc..f4fb3aa 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDtos.java @@ -4,10 +4,10 @@ import java.util.Date; public class SaveResultDtos extends AbstractSaveResultDtos { - public static SaveResultDto of(String id, Date lastUpdate) { + public static SaveResultDto of(String id, Date lastUpdateDate) { SaveResultDto result = new SaveResultDto(); result.setId(id); - result.setLastUpdate(lastUpdate); + result.setLastUpdateDate(lastUpdateDate); return result; } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java index 56d2d6c..128e800 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java @@ -2,10 +2,10 @@ package fr.ird.observe.services.dto.result; public class TripChildSaveResultDtos extends AbstractTripChildSaveResultDtos { - public static TripChildSaveResultDto of(SaveResultDto incoming) { - TripChildSaveResultDto result = new TripChildSaveResultDto(); + public static TripChildSaveResultDto of(SaveResultDto incoming) { + TripChildSaveResultDto result = new TripChildSaveResultDto(); result.setId(incoming.getId()); - result.setLastUpdate(incoming.getLastUpdate()); + result.setLastUpdateDate(incoming.getLastUpdateDate()); return result; } diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 41fc634..7ad6973 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index a4fa3e2..5747114 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 2d55d89..779c220 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index 2957acc..89366ed 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -63,6 +63,10 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> @@ -93,11 +97,6 @@ <artifactId>nuiton-validator</artifactId> </dependency> - <!-- persistence --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> 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 c192c5c..91cf69a 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 @@ -42,7 +42,6 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.FollowedUpdateDto; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; @@ -86,7 +85,7 @@ public abstract class ObserveServiceTopia implements ObserveService { protected ObserveServiceContextTopia serviceContext; - public static <D extends DataDto, E extends ObserveEntity> Class<E> getDataEntityType(Class<D> dtoType) { + public static <D extends DataDto, E extends ObserveDataEntity> Class<E> getDataEntityType(Class<D> dtoType) { Class<E> dataEntityType = BINDER_ENGINE.getDataEntityType(dtoType); return dataEntityType; } @@ -191,7 +190,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <E extends ObserveEntity, D extends DataDto> Form<D> dataEntityToForm(Class<D> dtoType, + protected <E extends ObserveDataEntity, D extends DataDto> Form<D> dataEntityToForm(Class<D> dtoType, E entity, ReferenceSetRequestDefinitions referentialRequestDefinition) { @@ -215,7 +214,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <E extends ObserveEntity, D extends DataDto> void copyDataDtoToEntity(D dto, E entity) { + protected <E extends ObserveDataEntity, D extends DataDto> void copyDataDtoToEntity(D dto, E entity) { BINDER_ENGINE.copyDataDtoToEntity(serviceContext.getReferentialLocale(), dto, entity); @@ -227,7 +226,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <E extends ObserveEntity, D extends DataDto> E loadOrCreateEntityFromDataDto(D dto) { + protected <E extends ObserveDataEntity, D extends DataDto> E loadOrCreateEntityFromDataDto(D dto) { Class<D> dtoType = (Class<D>) dto.getClass(); @@ -263,13 +262,13 @@ public abstract class ObserveServiceTopia implements ObserveService { return entity; } - protected <E extends ObserveEntity, D extends FollowedUpdateDto> void checkLastUpdateDate(E entity, D dto) { + protected <E extends ObserveEntity, D extends IdDto> void checkLastUpdateDate(E entity, D dto) { if (entity.isPersisted()) { Date lastUpdateDate = entity.getLastUpdateDate(); - Date currentUpdateDate = dto.getLastUpdate(); + Date currentUpdateDate = dto.getLastUpdateDate(); if (lastUpdateDate.after(currentUpdateDate)) { @@ -430,10 +429,10 @@ public abstract class ObserveServiceTopia implements ObserveService { } } - protected <D extends DataDto, E extends ObserveEntity> D loadEntityToDataDto(Class<D> dtoType, String id) { + protected <D extends DataDto, E extends ObserveDataEntity> D loadEntityToDataDto(Class<D> dtoType, String id) { E entity = loadEntity(dtoType, id); - DataBinderSupport<ObserveEntity, D> binder = getDataBinder(dtoType); + DataBinderSupport<E, D> binder = getDataBinder(dtoType); D dto = binder.toData(getReferentialLocale(), entity); return dto; @@ -452,7 +451,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <D extends DataDto> DataReference<D> toReference(ObserveEntity entity) { + protected <D extends DataDto> DataReference<D> toReference(ObserveDataEntity entity) { DataReference<D> reference = BinderEngine.get().transformEntityToDataReferenceDto(getReferentialLocale(), entity); return reference; @@ -460,7 +459,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <D extends DataDto, E extends ObserveEntity> DataReferenceSet<D> toDataReferenceSet(Class<D> dtoType, List<E> allStubByTripId) { + protected <D extends DataDto, E extends ObserveDataEntity> DataReferenceSet<D> toDataReferenceSet(Class<D> dtoType, List<E> allStubByTripId) { DataBinderSupport<E, D> binder = getDataBinder(dtoType); @@ -496,7 +495,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } - protected <D extends DataDto, E extends ObserveEntity> DataBinderSupport<E, D> getDataBinder(Class<D> dtoType) { + protected <D extends DataDto, E extends ObserveDataEntity> DataBinderSupport<E, D> getDataBinder(Class<D> dtoType) { DataBinderSupport<E, D> reference = BINDER_ENGINE.getDataBinder(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 c4c04d6..cf6a780 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,6 +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.ObserveDataEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; @@ -12,7 +13,6 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.ReferenceBinderEngine; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; @@ -31,11 +31,11 @@ public class BinderEngine implements ReferenceBinderEngine { protected ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ObserveReferentialEntity>> referentialDtoToEntityTypes; - protected ImmutableMap<Class<? extends DataDto>, Class<? extends TopiaEntity>> dataDtoToEntityTypes; + protected ImmutableMap<Class<? extends DataDto>, Class<? extends ObserveDataEntity>> dataDtoToEntityTypes; protected ImmutableMap<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> referentialEntityToDtoTypes; - protected ImmutableMap<Class<? extends TopiaEntity>, Class<? extends DataDto>> dataEntityToDtoTypes; + protected ImmutableMap<Class<? extends ObserveDataEntity>, Class<? extends DataDto>> dataEntityToDtoTypes; public static BinderEngine get() { return INSTANCE; @@ -61,26 +61,26 @@ public class BinderEngine implements ReferenceBinderEngine { return (ReferentialBinderSupport) referentialBinders.get(dtoType); } - public <D extends DataDto, E extends TopiaEntity> DataBinderSupport<E, D> getDataBinder(Class<D> dtoType) { + public <D extends DataDto, E extends ObserveDataEntity> DataBinderSupport<E, D> getDataBinder(Class<D> dtoType) { return (DataBinderSupport) dataBinders.get(dtoType); } - public <D extends DataDto, E extends TopiaEntity> DataBinderSupport<E, D> getDataBinder(D dtoType) { + public <D extends DataDto, E extends ObserveDataEntity> DataBinderSupport<E, D> getDataBinder(D dtoType) { return (DataBinderSupport) dataBinders.get(dtoType.getClass()); } - public <D extends DataDto, E extends TopiaEntity> Class<E> getDataEntityType(Class<D> dtoType) { + public <D extends DataDto, E extends ObserveDataEntity> Class<E> getDataEntityType(Class<D> dtoType) { return (Class<E>) dataDtoToEntityTypes.get(dtoType); } - public <D extends DataDto, E extends TopiaEntity> Class<D> getDataDtoType(Class<E> entityType) { + public <D extends DataDto, E extends ObserveDataEntity> Class<D> getDataDtoType(Class<E> entityType) { Class<D> result = (Class<D>) dataEntityToDtoTypes.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 TopiaEntity>, Class<? extends DataDto>> entry : dataEntityToDtoTypes.entrySet()) { + for (Map.Entry<Class<? extends ObserveDataEntity>, Class<? extends DataDto>> entry : dataEntityToDtoTypes.entrySet()) { if (name.startsWith(entry.getKey().getName())) { result = (Class<D>) entry.getValue(); break; @@ -150,14 +150,14 @@ public class BinderEngine implements ReferenceBinderEngine { public <D extends DataDto> DataReference<D> transformDataDtoToReference(ReferentialLocale referentialLocale, D dto) { Class<D> dtoType = (Class<D>) dto.getClass(); - DataBinderSupport<?, D> binder = getDataBinder(dtoType); + DataBinderSupport<?, D> binder = getDataBinder((Class)dtoType); DataReference<D> reference = binder.toDataReference(referentialLocale, dto); return reference; } - public <D extends DataDto, E extends TopiaEntity> D transformEntityToDataDto(ReferentialLocale referentialLocale, Class<D> dtoType, E entity) { + public <D extends DataDto, E extends ObserveDataEntity> D transformEntityToDataDto(ReferentialLocale referentialLocale, Class<D> dtoType, E entity) { DataBinderSupport<E, D> binder = getDataBinder(dtoType); @@ -168,7 +168,7 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends DataDto, E extends TopiaEntity> DataReference<D> transformEntityToDataReferenceDto(ReferentialLocale referentialLocale, E entity) { + public <D extends DataDto, E extends ObserveDataEntity> DataReference<D> transformEntityToDataReferenceDto(ReferentialLocale referentialLocale, E entity) { Class<D> dtoType = getDataDtoType(entity.getClass()); DataBinderSupport<E, D> binder = getDataBinder(dtoType); @@ -188,7 +188,7 @@ public class BinderEngine implements ReferenceBinderEngine { } - public <D extends DataDto, E extends TopiaEntity> void copyDataDtoToEntity(ReferentialLocale referentialLocale, D dto, E entity) { + public <D extends DataDto, E extends ObserveDataEntity> void copyDataDtoToEntity(ReferentialLocale referentialLocale, D dto, E entity) { Class<D> dtoType = (Class<D>) dto.getClass(); DataBinderSupport<E, D> binder = getDataBinder(dtoType); @@ -214,11 +214,11 @@ public class BinderEngine implements ReferenceBinderEngine { return referentialEntityToDtoTypes; } - public ImmutableMap<Class<? extends TopiaEntity>, Class<? extends DataDto>> getDataEntityToDtoTypes() { + public ImmutableMap<Class<? extends ObserveDataEntity>, Class<? extends DataDto>> getDataEntityToDtoTypes() { return dataEntityToDtoTypes; } - protected ImmutableMap<Class<? extends DataDto>, Class<? extends TopiaEntity>> getDataDtoToEntityTypes() { + protected ImmutableMap<Class<? extends DataDto>, Class<? extends ObserveDataEntity>> getDataDtoToEntityTypes() { return dataDtoToEntityTypes; } 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 7a969f8..82b6873 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 @@ -2,6 +2,7 @@ package fr.ird.observe.services.binder; import com.google.common.collect.ImmutableMap; import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.BaitsComposition; import fr.ird.observe.entities.longline.Basket; @@ -27,11 +28,11 @@ import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.entities.referentiel.GearCaracteristicType; import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.LengthWeightParameter; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; 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.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Sex; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesGroup; @@ -328,15 +329,14 @@ import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; -import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; class BinderEngineInitializer implements ObserveModelInitializer { - ImmutableMap.Builder<Class<? extends DataDto>, Class<? extends TopiaEntity>> dataDtoToEntityTypeBuilder; + ImmutableMap.Builder<Class<? extends DataDto>, Class<? extends ObserveDataEntity>> dataDtoToEntityTypeBuilder; - ImmutableMap.Builder<Class<? extends TopiaEntity>, Class<? extends DataDto>> dataEntityToDtoTypeBuilder; + ImmutableMap.Builder<Class<? extends ObserveDataEntity>, Class<? extends DataDto>> dataEntityToDtoTypeBuilder; ImmutableMap.Builder<Class<? extends DataDto>, BinderSupport> dataBinderBuilder; @@ -346,9 +346,9 @@ class BinderEngineInitializer implements ObserveModelInitializer { ImmutableMap.Builder<Class<? extends ReferentialDto>, BinderSupport> referentialBinderBuilder; - ImmutableMap<Class<? extends DataDto>, Class<? extends TopiaEntity>> dataDtoToEntityTypes; + ImmutableMap<Class<? extends DataDto>, Class<? extends ObserveDataEntity>> dataDtoToEntityTypes; - ImmutableMap<Class<? extends TopiaEntity>, Class<? extends DataDto>> dataEntityToDtoTypes; + ImmutableMap<Class<? extends ObserveDataEntity>, Class<? extends DataDto>> dataEntityToDtoTypes; ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ObserveReferentialEntity>> referentialDtoToEntityTypes; @@ -380,15 +380,15 @@ class BinderEngineInitializer implements ObserveModelInitializer { dataBinders = dataBinderBuilder.build(); referentialBinders = referentialBinderBuilder.build(); - for (Map.Entry<Class<? extends DataDto>, Class<? extends TopiaEntity>> entry : dataDtoToEntityTypes.entrySet()) { + for (Map.Entry<Class<? extends DataDto>, Class<? extends ObserveDataEntity>> entry : dataDtoToEntityTypes.entrySet()) { Class<? extends DataDto> dtoType = entry.getKey(); - Class<? extends TopiaEntity> entityType = entry.getValue(); + Class<? extends ObserveDataEntity> entityType = entry.getValue(); if ((entityType.getSimpleName() + "Dto").equals(dtoType.getSimpleName())) { ObserveEntityEnum observeEntityEnum = ObserveEntityEnum.valueOf(entityType); dataEntityToDtoTypeBuilder.put(entityType, dtoType); - dataEntityToDtoTypeBuilder.put(observeEntityEnum.getImplementation(), dtoType); + dataEntityToDtoTypeBuilder.put((Class<? extends ObserveDataEntity>) observeEntityEnum.getImplementation(), dtoType); } } 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 e4ea0f7..f3481f7 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 @@ -24,7 +24,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineDto dto, ActivityLongline entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); entity.setComment(dto.getComment()); entity.setTimeStamp(dto.getTimeStamp()); @@ -40,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.getLastUpdateDate()); + dto.setLastUpdateDate(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 3fcc387..087fd8c 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 5f78391..50673ad 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 4813198..95f8dc1 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 @@ -33,7 +33,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi public void copyToEntity(ReferentialLocale referentialLocale, ActivitySeineDto dto, ActivitySeine entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); entity.setComment(dto.getComment()); entity.setTime(dto.getTime()); @@ -59,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.getLastUpdateDate()); + dto.setLastUpdateDate(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 a58b4fe..dc7b5c9 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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/DataBinderSupport.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java index f89ffab..ca41c91 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,6 +4,7 @@ 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.ObserveDataEntity; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.BinderSupport; import fr.ird.observe.services.dto.DataDto; @@ -13,7 +14,6 @@ import fr.ird.observe.services.dto.reference.DataReferenceSetDefinitions; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import org.apache.commons.collections4.CollectionUtils; import org.nuiton.topia.persistence.TopiaEntities; -import org.nuiton.topia.persistence.TopiaEntity; import java.io.Serializable; import java.util.Collection; @@ -25,7 +25,7 @@ import java.util.Set; * * @author Tony Chemit - chemit@codelutin.com */ -public abstract class DataBinderSupport<E extends TopiaEntity, D extends DataDto> extends BinderSupport<E, D> { +public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends DataDto> extends BinderSupport<E, D> { protected final ReferenceSetDefinition<D> definition; @@ -71,7 +71,7 @@ public abstract class DataBinderSupport<E extends TopiaEntity, D extends DataDto return reference; } - protected <EE extends TopiaEntity, DD extends DataDto> DataReference<DD> toDataReference(ReferentialLocale referentialLocale, EE entity, Class<DD> dtoType) { + protected <EE extends ObserveDataEntity, DD extends DataDto> DataReference<DD> toDataReference(ReferentialLocale referentialLocale, EE entity, Class<DD> dtoType) { DataReference<DD> reference = null; if (entity != null) { @@ -84,7 +84,7 @@ public abstract class DataBinderSupport<E extends TopiaEntity, D extends DataDto } - protected <EE extends TopiaEntity, DD extends DataDto> LinkedHashSet<DD> toLinkedHashSetData(ReferentialLocale referentialLocale, Collection<EE> entities, Class<DD> dtoType) { + protected <EE extends ObserveDataEntity, DD extends DataDto> LinkedHashSet<DD> toLinkedHashSetData(ReferentialLocale referentialLocale, Collection<EE> entities, Class<DD> dtoType) { LinkedHashSet<DD> dtos = null; if (CollectionUtils.isNotEmpty(entities)) { @@ -135,7 +135,7 @@ public abstract class DataBinderSupport<E extends TopiaEntity, D extends DataDto return entity; } - protected <DD extends DataDto, EE extends TopiaEntity> Set<EE> toEntitySet(ReferentialLocale referentialLocale, Collection<DD> dtos, Class<EE> entityType, Set<EE> entityList) { + protected <DD extends DataDto, EE extends ObserveDataEntity> Set<EE> toEntitySet(ReferentialLocale referentialLocale, Collection<DD> dtos, Class<EE> entityType, Set<EE> entityList) { if (entityList == null) { @@ -148,7 +148,7 @@ public abstract class DataBinderSupport<E extends TopiaEntity, D extends DataDto } - protected <DD extends DataDto, EE extends TopiaEntity> Collection<EE> toEntityCollection(ReferentialLocale referentialLocale, Collection<DD> dtos, Class<EE> entityType, Collection<EE> entityList) { + protected <DD extends DataDto, EE extends ObserveDataEntity> Collection<EE> toEntityCollection(ReferentialLocale referentialLocale, Collection<DD> dtos, Class<EE> entityType, Collection<EE> entityList) { if (entityList == null) { @@ -161,7 +161,7 @@ public abstract class DataBinderSupport<E extends TopiaEntity, D extends DataDto } - protected <DD extends DataDto, EE extends TopiaEntity, C extends Collection<EE>> void fillEntityCollection(ReferentialLocale referentialLocale, Collection<DD> dtos, C entityList) { + protected <DD extends DataDto, EE extends ObserveDataEntity, C extends Collection<EE>> void fillEntityCollection(ReferentialLocale referentialLocale, Collection<DD> dtos, C entityList) { ImmutableMap<String, EE> entitiesById = Maps.uniqueIndex(entityList, TopiaEntities.getTopiaIdFunction()); @@ -211,7 +211,8 @@ public abstract class DataBinderSupport<E extends TopiaEntity, D extends DataDto return entity; } - protected <DD extends DataDto, EE extends TopiaEntity> EE toEntity(DataReference<DD> reference, Class<EE> entityType) { + + protected <DD extends DataDto, EE extends ObserveDataEntity> EE toEntity(DataReference<DD> reference, Class<EE> entityType) { Class<DD> type = reference.getType(); DataBinderSupport<EE, DD> binder = BinderEngine.get().getDataBinder(type); 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 274989b..0fe15d9 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); entity.setComment(dto.getComment()); entity.setDate(dto.getDate()); entity.setStartLogValue(dto.getStartLogValue()); entity.setEndLogValue(dto.getEndLogValue()); entity.setCheckLevel(dto.getCheckLevel()); - entity.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); } @@ -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.getLastUpdateDate()); + dto.setLastUpdateDate(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.getLastUpdateDate()); + 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/SetLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java index bb00070..e1f1350 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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.getLastUpdateDate()); + 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 2bf38af..021db91 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 7db0ee5..589287b 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 fd648ef..a94da46 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 6aa735a..b4ad017 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 29befd9..4cfbf59 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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.getLastUpdateDate()); + 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/SetSeineSchoolEstimateDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java index 440e79e..30186cd 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 e4a0be8..623e223 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 cd23436..c12eab5 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 fb991b8..4781322 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 aa547e1..946f0a2 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 80b6054..1e21186 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.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); 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.getLastUpdateDate()); + dto.setLastUpdateDate(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 6f00bea..ac31029 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 @@ -63,7 +63,7 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit reference.setCreateDate(dto.getCreateDate()); reference.setVersion(dto.getVersion()); - reference.setLastUpdate(dto.getLastUpdate()); + reference.setLastUpdate(dto.getLastUpdateDate()); reference.setEnabled(dto.isEnabled()); reference.setNeedComment(dto.isNeedComment()); @@ -112,7 +112,7 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit entity.setTopiaId(dto.getId()); entity.setStatus(REFERENCE_STATUS_TO_ENTITY.apply(dto.getStatus())); entity.setNeedComment(dto.isNeedComment()); - entity.setLastUpdateDate(dto.getLastUpdate()); + entity.setLastUpdateDate(dto.getLastUpdateDate()); entity.setTopiaVersion(dto.getVersion()); entity.setTopiaCreateDate(dto.getCreateDate()); entity.setCode(dto.getCode()); @@ -126,7 +126,7 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit dto.setStatus(REFERENCE_STATUS_TO_DTO.apply(entity.getStatus())); dto.setEnabled(entity.isEnabled()); dto.setNeedComment(entity.isNeedComment()); - dto.setLastUpdate(entity.getLastUpdateDate()); + dto.setLastUpdateDate(entity.getLastUpdateDate()); dto.setVersion(entity.getTopiaVersion()); dto.setCreateDate(entity.getTopiaCreateDate()); dto.setCode(entity.getCode()); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java index 8e2b26e..8ea35b6 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java @@ -4,8 +4,8 @@ import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.entities.ObserveEntity; import org.nuiton.topia.persistence.TopiaDao; -import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; @@ -16,7 +16,7 @@ import java.util.Map; * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class EntitiesExtractor<E extends TopiaEntity> { +public class EntitiesExtractor<E extends ObserveEntity> { /** * Le type de l'entité dont on cherche des éléments. 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 e623342..b43159b 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 @@ -5,6 +5,7 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.Entities; +import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.CatchLongline; @@ -12,10 +13,10 @@ import fr.ird.observe.entities.longline.Encounter; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.Tdr; import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntities; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.Persons; -import fr.ird.observe.entities.referentiel.ObserveReferentialEntities; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.Vessels; @@ -27,7 +28,6 @@ import fr.ird.observe.entities.seine.TargetCatch; import fr.ird.observe.entities.seine.TargetCatchImpl; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveSpeciesListConfiguration; -import org.nuiton.topia.persistence.TopiaEntity; /** * Une usine de {@link EntitiesExtractor}. @@ -170,9 +170,9 @@ public class EntitiesSetFactory { } - public <P extends TopiaEntity, C extends TopiaEntity> EntitiesExtractor<C> newEntitiesSet(Class<P> parentType, - Class<C> propertyType, - String propertyName) { + public <P extends ObserveEntity, C extends ObserveEntity> EntitiesExtractor<C> newEntitiesSet(Class<P> parentType, + Class<C> propertyType, + String propertyName) { Preconditions.checkNotNull(parentType, "Parent type is required"); Preconditions.checkNotNull(propertyName, "Property name is required"); @@ -203,11 +203,11 @@ public class EntitiesSetFactory { } - protected <P extends TopiaEntity> String buildKey(Class<P> parentType, String propertyName) { + protected <P extends ObserveEntity> String buildKey(Class<P> parentType, String propertyName) { return parentType.getName() + "#" + propertyName; } - protected <P extends TopiaEntity, C extends ObserveReferentialEntity> void registerReferentialEntitiesExtractor( + protected <P extends ObserveEntity, C extends ObserveReferentialEntity> void registerReferentialEntitiesExtractor( ImmutableMap.Builder<String, EntitiesExtractor> builder, Class<P> parentType, String propertyName, @@ -221,7 +221,7 @@ public class EntitiesSetFactory { } - protected <P extends TopiaEntity> void registerSpeciesListEntitiesExtractor( + protected <P extends ObserveEntity> void registerSpeciesListEntitiesExtractor( ImmutableMap.Builder<String, EntitiesExtractor> builder, Class<P> parentType, String propertyName, @@ -232,7 +232,7 @@ public class EntitiesSetFactory { } - protected <P extends TopiaEntity> void registerSpeciesListOceanEntitiesExtractor( + protected <P extends ObserveEntity> void registerSpeciesListOceanEntitiesExtractor( ImmutableMap.Builder<String, EntitiesExtractor> builder, Class<P> parentType, String propertyName, @@ -243,7 +243,7 @@ public class EntitiesSetFactory { } - protected <P extends TopiaEntity> void registerSectionEntitiesExtractor( + protected <P extends ObserveEntity> void registerSectionEntitiesExtractor( ImmutableMap.Builder<String, EntitiesExtractor> builder, Class<P> parentType, String propertyName) { @@ -253,7 +253,7 @@ public class EntitiesSetFactory { } - protected <P extends TopiaEntity> void registerBasketEntitiesExtractor( + protected <P extends ObserveEntity> void registerBasketEntitiesExtractor( ImmutableMap.Builder<String, EntitiesExtractor> builder, Class<P> parentType, String propertyName) { @@ -263,7 +263,7 @@ public class EntitiesSetFactory { } - protected <P extends TopiaEntity> void registerBranchlineEntitiesExtractor( + protected <P extends ObserveEntity> void registerBranchlineEntitiesExtractor( ImmutableMap.Builder<String, EntitiesExtractor> builder, Class<P> parentType, String propertyName) { @@ -273,7 +273,7 @@ public class EntitiesSetFactory { } - protected <P extends TopiaEntity, C extends TopiaEntity> void registerEntitiesExtractor( + protected <P extends ObserveEntity, C extends ObserveEntity> void registerEntitiesExtractor( 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 4b6df57..949fe9e 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 @@ -131,7 +131,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe D dto = form.getObject(); dto.setVersion(entity.getTopiaVersion()); dto.setCreateDate(entity.getTopiaCreateDate()); - dto.setLastUpdate(entity.getLastUpdateDate()); + dto.setLastUpdateDate(entity.getLastUpdateDate()); dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); dto.setEnabled(entity.isEnabled()); @@ -200,14 +200,11 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe if (ObserveReferentialEntity.class.isAssignableFrom(type)) { Class<ReferentialDto> dtoType = BINDER_ENGINE.getReferentialDtoType((Class) type); - referenceSet = toReferentialReferenceSet(dtoType, (List) entities, null); } else { - Class<DataDto> dtoType = BINDER_ENGINE.getDataDtoType(type); - - + Class<DataDto> dtoType = BINDER_ENGINE.getDataDtoType((Class)type); referenceSet = toDataReferenceSet(dtoType, (List) entities); } 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 9952c19..224f461 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,6 +24,8 @@ package fr.ird.observe.services.service.actions.report; import com.google.common.collect.Maps; import fr.ird.observe.AbstractObserveTopiaDao; +import fr.ird.observe.entities.ObserveDataEntity; +import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; @@ -82,7 +84,7 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer Class<? extends ReferentialDto> dtoType = (Class<? extends ReferentialDto>) type; ReferentialBinderSupport<ObserveReferentialEntity, ? extends ReferentialDto> binder = getReferentialBinder(dtoType); - List<TopiaEntity> universe = executeRequest(hql, vars); + List<ObserveEntity> universe = executeRequest(hql, vars); for (TopiaEntity entity : universe) { @@ -95,12 +97,12 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer Class<? extends DataDto> dtoType = (Class<? extends DataDto>) type; - DataBinderSupport<TopiaEntity, ? extends DataDto> binder = getDataBinder(dtoType); - List<TopiaEntity> universe = executeRequest(hql, vars); + DataBinderSupport<ObserveDataEntity, ? extends DataDto> binder = getDataBinder(dtoType); + List<ObserveEntity> universe = executeRequest(hql, vars); - for (TopiaEntity entity : universe) { + for (ObserveEntity entity : universe) { - DataReference<? extends DataDto> reference = binder.toDataReference(getReferentialLocale(), entity); + DataReference<? extends DataDto> reference = binder.toDataReference(getReferentialLocale(), (ObserveDataEntity) 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 6f60048..2e3f42d 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,6 +5,8 @@ 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.ObserveDataEntity; +import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.dto.DataDto; @@ -13,7 +15,6 @@ import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidator; @@ -78,8 +79,8 @@ public class GenerateValidatorDescriptorsFileTool { for (Map.Entry<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> entry : BinderEngine.get().getReferentialEntityToDtoTypes().entrySet()) { - Class<? extends TopiaEntity> entityType = entry.getKey(); - Class<? extends IdDto> dtoType = entry.getValue(); + Class<? extends ObserveReferentialEntity> entityType = entry.getKey(); + Class<? extends ReferentialDto> dtoType = entry.getValue(); for (String context : ValidateServiceTopia.AVAILABLE_CONTEXT_NAMES) { Set<ValidatorDto> validatorDtos = getValidatorDtos(context, scopes, entityType, dtoType); @@ -88,10 +89,10 @@ public class GenerateValidatorDescriptorsFileTool { } - for (Map.Entry<Class<? extends TopiaEntity>, Class<? extends DataDto>> entry : BinderEngine.get().getDataEntityToDtoTypes().entrySet()) { + for (Map.Entry<Class<? extends ObserveDataEntity>, Class<? extends DataDto>> entry : BinderEngine.get().getDataEntityToDtoTypes().entrySet()) { - Class<? extends TopiaEntity> entityType = entry.getKey(); - Class<? extends IdDto> dtoType = entry.getValue(); + Class<? extends ObserveDataEntity> entityType = entry.getKey(); + Class<? extends DataDto> dtoType = entry.getValue(); for (String context : ValidateServiceTopia.AVAILABLE_CONTEXT_NAMES) { Set<ValidatorDto> validatorDtos = getValidatorDtos(context, scopes, entityType, dtoType); @@ -114,7 +115,7 @@ public class GenerateValidatorDescriptorsFileTool { */ protected static Set<ValidatorDto> getValidatorDtos(String context, NuitonValidatorScope[] scopes, - Class<? extends TopiaEntity> entityType, + Class<? extends ObserveEntity> entityType, Class<? extends IdDto> dtoType) { SimpleBeanValidator valitator = SimpleBeanValidator.newValidator( 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 c22bc47..2606cd4 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 @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.Entities; +import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.ObserveServiceTopia; @@ -157,16 +158,16 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat } - private <E extends TopiaEntity, D extends DataDto> void buildResultForDataDtoType(Class<E> entityType, - ValidationMessageDetector detector, - ImmutableMap.Builder<Class<? extends IdDto>, ValidateResultForDtoType> forDtoTypeBuilder) { + private <E extends ObserveDataEntity, D extends DataDto> void buildResultForDataDtoType(Class<E> entityType, + ValidationMessageDetector detector, + ImmutableMap.Builder<Class<? extends IdDto>, ValidateResultForDtoType> forDtoTypeBuilder) { ImmutableSet.Builder<ValidateResultForDto<D>> validateResultForDtoMapBuilder = new ImmutableSet.Builder<>(); Map<TopiaEntity, Collection<ValidationMessage>> detectedMessages = detector.getDetectedMessages(entityType); for (Map.Entry<TopiaEntity, Collection<ValidationMessage>> entry : detectedMessages.entrySet()) { - TopiaEntity entity = entry.getKey(); + ObserveDataEntity entity = (ObserveDataEntity) entry.getKey(); DataReference<D> referenceDto = BINDER_ENGINE.transformEntityToDataReferenceDto(serviceContext.getReferentialLocale(), entity); Collection<ValidationMessage> validationMessages = entry.getValue(); ValidateResultForDto<D> validateResultForDto = new ValidateResultForDto<>(referenceDto, ImmutableSet.copyOf(validationMessages)); 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 cb4e638..e1d60c5 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 @@ -22,7 +22,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.getLastUpdateDate()); + form.getObject().setLastUpdateDate(setLongline.getLastUpdateDate()); return form; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 4f298be..79a84d5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -40,6 +40,7 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; +import fr.ird.observe.services.dto.result.TripChildSaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -182,8 +183,6 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public TripChildSaveResultDto save(String tripSeineId, RouteDto dto) { - TripChildSaveResultDto result = new TripChildSaveResultDto(); - TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); Date oldRouteDate; @@ -201,8 +200,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi SaveResultDto saveResultDto = saveEntity(entity); - result.setId(saveResultDto.getId()); - result.setLastUpdate(saveResultDto.getLastUpdate()); + TripChildSaveResultDto result = TripChildSaveResultDtos.of(saveResultDto); if (dto.isNotPersisted()) { 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 ff73bfd..1afdc5c 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 @@ -48,7 +48,7 @@ public class BinderEngineMetadataTest { for (Class<? extends DataDto> dtoType : binderEngine.getDataDtoToEntityTypes().keySet()) { - DataBinderSupport<TopiaEntity, ? extends DataDto> referentialBinder = binderEngine.getDataBinder(dtoType); + DataBinderSupport<ObserveDataEntity, ? extends DataDto> referentialBinder = binderEngine.getDataBinder(dtoType); Assert.assertNotNull("No binder for " + dtoType, referentialBinder); } @@ -79,17 +79,17 @@ public class BinderEngineMetadataTest { @Test public void testGetDataEntityType() throws Exception { - ImmutableMap<Class<? extends DataDto>, Class<? extends TopiaEntity>> dataDtoToEntityTypes = binderEngine.getDataDtoToEntityTypes(); + ImmutableMap<Class<? extends DataDto>, Class<? extends ObserveDataEntity>> dataDtoToEntityTypes = binderEngine.getDataDtoToEntityTypes(); Assert.assertNotNull(dataDtoToEntityTypes); Assert.assertEquals(55, dataDtoToEntityTypes.size()); - Set<Class<? extends TopiaEntity>> entityTypesFromEngine = Sets.newConcurrentHashSet(dataDtoToEntityTypes.values()); - Set<Class<? extends TopiaEntity>> dataEntityTypesFromTopia = getDataEntityTypesFromTopia(); + Set<Class<? extends ObserveDataEntity>> entityTypesFromEngine = Sets.newConcurrentHashSet(dataDtoToEntityTypes.values()); + Set<Class<? extends ObserveDataEntity>> dataEntityTypesFromTopia = getDataEntityTypesFromTopia(); Assert.assertEquals(dataEntityTypesFromTopia.size(), entityTypesFromEngine.size()); for (Class<? extends DataDto> dtoType : dataDtoToEntityTypes.keySet()) { - Class<TopiaEntity> entityType = binderEngine.getDataEntityType(dtoType); + Class<ObserveDataEntity> entityType = binderEngine.getDataEntityType(dtoType); Assert.assertNotNull(entityType); } @@ -116,12 +116,12 @@ public class BinderEngineMetadataTest { @Test public void testGetDataDtoType() throws Exception { - ImmutableMap<Class<? extends TopiaEntity>, Class<? extends DataDto>> referentialDtoToEntityTypes = binderEngine.getDataEntityToDtoTypes(); + ImmutableMap<Class<? extends ObserveDataEntity>, Class<? extends DataDto>> referentialDtoToEntityTypes = binderEngine.getDataEntityToDtoTypes(); Assert.assertNotNull(referentialDtoToEntityTypes); Assert.assertEquals(2 * 35, referentialDtoToEntityTypes.size()); - for (Class<? extends TopiaEntity> entityType : referentialDtoToEntityTypes.keySet()) { + for (Class<? extends ObserveDataEntity> entityType : referentialDtoToEntityTypes.keySet()) { Class<? extends DataDto> dtoType = binderEngine.getDataDtoType(entityType); Assert.assertNotNull(dtoType); @@ -146,14 +146,14 @@ public class BinderEngineMetadataTest { } - protected Set<Class<? extends TopiaEntity>> getDataEntityTypesFromTopia() { + protected Set<Class<? extends ObserveDataEntity>> getDataEntityTypesFromTopia() { - Set<Class<? extends TopiaEntity>> result = new LinkedHashSet<>(); + Set<Class<? extends ObserveDataEntity>> result = new LinkedHashSet<>(); for (ObserveEntityEnum observeEntityEnum : ObserveEntityEnum.values()) { if (ObserveDataEntity.class.isAssignableFrom(observeEntityEnum.getContract()) && !Modifier.isAbstract(observeEntityEnum.getImplementation().getModifiers())) { - result.add(observeEntityEnum.getContract()); + result.add((Class<? extends ObserveDataEntity>) 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 0d95dff..899a3bf 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 @@ -1,6 +1,7 @@ package fr.ird.observe.services.binder; import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -131,7 +132,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.topia.persistence.TopiaDao; -import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; @@ -282,7 +282,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { } - protected <D extends DataDto, E extends TopiaEntity> void transformDataEntityToDto(Class<D> dtoType) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { + protected <D extends DataDto, E extends ObserveDataEntity> void transformDataEntityToDto(Class<D> dtoType) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { Class<E> entityType = binderEngine.getDataEntityType(dtoType); @@ -338,7 +338,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.getLastUpdateDate(), dto.getLastUpdate()); + Assert.assertEquals(entity.getLastUpdateDate(), dto.getLastUpdateDate()); Assert.assertEquals(entity.isNeedComment(), dto.isNeedComment()); Assert.assertEquals(entity.isEnabled(), dto.isEnabled()); Assert.assertEquals(entity.getUri(), dto.getUri()); 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 c7a06a4..0d8b333 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 @@ -129,7 +129,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.getLastUpdateDate(), tripSeineDto.getLastUpdate()); + Assert.assertEquals(tripSeine.getLastUpdateDate(), tripSeineDto.getLastUpdateDate()); loadReferenceSets(referentialService, form); @@ -164,7 +164,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNull(tripSeineDto.getFormsUrl()); Assert.assertNull(tripSeineDto.getReportsUrl()); Assert.assertNull(tripSeineDto.getComment()); - Assert.assertNull(tripSeineDto.getLastUpdate()); + Assert.assertNull(tripSeineDto.getLastUpdateDate()); //FIXME Topia test // assertTripFormLabels(formDto); @@ -279,7 +279,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); Assert.assertNotNull(tripSeine.getLastUpdateDate()); - Assert.assertNotEquals(tripSeineDto.getLastUpdate(), tripSeine.getLastUpdateDate()); + Assert.assertNotEquals(tripSeineDto.getLastUpdateDate(), tripSeine.getLastUpdateDate()); Date lastUpdateAfter = getLastUpdateDate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); @@ -306,9 +306,9 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { // on fait croire que notre version est plus ancienne Calendar calendar = Calendar.getInstance(); - calendar.setTime(tripSeineDto.getLastUpdate()); + calendar.setTime(tripSeineDto.getLastUpdateDate()); calendar.add(Calendar.HOUR, -1); - tripSeineDto.setLastUpdate(calendar.getTime()); + tripSeineDto.setLastUpdateDate(calendar.getTime()); service.save(form.getObject()); diff --git a/observe-test-data/pom.xml b/observe-test-data/pom.xml index 3695e16..f4e3f7f 100644 --- a/observe-test-data/pom.xml +++ b/observe-test-data/pom.xml @@ -37,17 +37,11 @@ <dependencies> - <!-- Sibling dependencies --> - <!--dependency> - <groupId>${project.groupId}</groupId> - <artifactId>observe-services-configuration-api</artifactId> - <version>${project.version}</version> - </dependency--> + <!-- Commons --> - <!-- Nuiton --> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> @@ -55,6 +49,12 @@ <artifactId>commons-logging</artifactId> </dependency> + <!-- Nuiton --> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> @@ -66,16 +66,6 @@ <artifactId>junit</artifactId> <scope>compile</scope> </dependency> - <!--dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency--> </dependencies> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.