This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit ea02bf67528e16b33e6e03bd60d61bc971238a28 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 18:02:35 2016 +0200 Utilisation de la dernière version d'eugene avec le nouveau tv java8 --- .../SetLonglineUniqueHomeIdDtoValidator.java | 11 +++++-- .../SetLonglineUniqueNumberDtoValidator.java | 9 +++-- .../ird/observe/ui/storage/tabs/SecurityModel.java | 31 +++++++++++------- .../java/fr/ird/observe/services/dto/IdDtos.java | 15 +++++---- .../ird/observe/services/dto/seine/RouteDto.java | 7 ++-- .../observe/services/dto/seine/TripSeineDto.java | 21 ++++++++---- .../xmi/observe-services-dto-common.properties | 1 + .../xmi/observe-services-dto-longline.properties | 1 + .../main/xmi/observe-services-dto-seine.properties | 1 + .../observe/services/ObserveSecurityHelper.java | 38 +++++++++++----------- .../services/service/DataSourceServiceTopia.java | 2 +- .../services/service/ReferentialServiceTopia.java | 3 +- pom.xml | 2 +- 13 files changed, 85 insertions(+), 57 deletions(-) diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java index e661364..4e9fc1f 100644 --- a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java +++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java @@ -22,8 +22,6 @@ package fr.ird.observe.application.swing.validation.validators; * #L% */ -import com.google.common.base.Optional; -import com.google.common.collect.Iterables; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.application.swing.decoration.DecoratorService; @@ -34,6 +32,8 @@ import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDtos; +import java.util.Optional; + /** * Created on 12/7/14. * @@ -50,7 +50,12 @@ public class SetLonglineUniqueHomeIdDtoValidator extends FieldValidatorSupport { if (homeId != null) { - Optional<SetLonglineStubDto> sameHomeIdSetLonglineOptional = Iterables.tryFind(setLongline.getOtherSets(), SetLonglineStubDtos.newHomeIdPredicate(homeId)); + Optional<SetLonglineStubDto> sameHomeIdSetLonglineOptional = setLongline.getOtherSets() + .stream() + .filter(SetLonglineStubDtos.newHomeIdPredicate(homeId)) + .findFirst(); + +// Iterables.tryFind(setLongline.getOtherSets(), SetLonglineStubDtos.newHomeIdPredicate(homeId)::test); if (sameHomeIdSetLonglineOptional.isPresent()) { diff --git a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java index bf6f04f..12f3734 100644 --- a/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java +++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java @@ -22,8 +22,6 @@ package fr.ird.observe.application.swing.validation.validators; * #L% */ -import com.google.common.base.Optional; -import com.google.common.collect.Iterables; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.application.swing.decoration.DecoratorService; @@ -34,6 +32,8 @@ import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDtos; +import java.util.Optional; + /** * Created on 12/7/14. * @@ -50,7 +50,10 @@ public class SetLonglineUniqueNumberDtoValidator extends FieldValidatorSupport { if (number != null) { - Optional<SetLonglineStubDto> sameNumberSetLonglineOptional = Iterables.tryFind(setLongline.getOtherSets(), SetLonglineStubDtos.newNumberPredicate(number)); + Optional<SetLonglineStubDto> sameNumberSetLonglineOptional = setLongline.getOtherSets() + .stream() + .filter(SetLonglineStubDtos.newNumberPredicate(number)) + .findFirst(); if (sameNumberSetLonglineOptional.isPresent()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SecurityModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SecurityModel.java index ab4b170..5298392 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SecurityModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SecurityModel.java @@ -21,9 +21,6 @@ */ package fr.ird.observe.ui.storage.tabs; -import com.google.common.base.Predicates; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.ObserveDbUserDtos; @@ -34,7 +31,10 @@ import java.beans.PropertyChangeSupport; import java.io.Serializable; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; /** * Le modèle la sécurité à appliquer sur une base postgres @@ -67,15 +67,16 @@ public class SecurityModel implements Serializable { } public Set<ObserveDbUserDto> getUsersByRole(ObserveDbRole role) { - Set<ObserveDbUserDto> roles = Sets.newHashSet(Iterables.filter(users, ObserveDbUserDtos.newRolePredicate(role))); - return roles; + return users.stream() + .filter(ObserveDbUserDtos.newRolePredicate(role)) + .collect(Collectors.toSet()); } public List<String> getUserNamesByRole(ObserveDbRole role) { - List<String> names = Lists.newLinkedList(Iterables.transform( - Iterables.filter(users, ObserveDbUserDtos.newRolePredicate(role)), - ObserveDbUserDtos.getNameFunction())); - return names; + return users.stream() + .filter(ObserveDbUserDtos.newRolePredicate(role)) + .map(ObserveDbUserDtos.NAME_FUNCTION) + .collect(Collectors.toList()); } public List<String> getDataUserNames() { @@ -99,7 +100,8 @@ public class SecurityModel implements Serializable { } public Set<ObserveDbUserDto> getUsersWithoutAdministrator() { - return Sets.newHashSet(Iterables.filter(users, Predicates.not(ObserveDbUserDtos.newRolePredicate(ObserveDbRole.ADMINISTRATOR)))); + Predicate<ObserveDbUserDto> predicate = ObserveDbUserDtos.newRolePredicate(ObserveDbRole.ADMINISTRATOR); + return users.stream().filter(u -> !predicate.test(u)).collect(Collectors.toSet()); } public boolean isRole(ObserveDbRole r, ObserveDbUserDto user) { @@ -110,7 +112,12 @@ public class SecurityModel implements Serializable { this.users.clear(); this.users.addAll(users); - this.administrateur = Iterables.find(users, ObserveDbUserDtos.newRolePredicate(ObserveDbRole.ADMINISTRATOR)); + Optional<ObserveDbUserDto> optionalAdministrator = users.stream().filter(ObserveDbUserDtos.newRolePredicate(ObserveDbRole.ADMINISTRATOR)).findFirst(); + if (optionalAdministrator.isPresent()) { + this.administrateur = optionalAdministrator.get(); + } else { + throw new IllegalStateException("No administrator found"); + } firePropertyChange(PROPERTY_ROLE, null, getUsers()); firePropertyChange(PROPERTY_ADMINISTRATEUR, null, getAdministrateur()); firePropertyChange(PROPERTY_ASSIGNED, null, getAssigned()); @@ -135,7 +142,7 @@ public class SecurityModel implements Serializable { } public int getAssigned() { - int countNotAssigned = Iterables.size(Iterables.filter(users, ObserveDbUserDtos.newRolePredicate(null))); + int countNotAssigned = (int) users.stream().filter(ObserveDbUserDtos.newRolePredicate(null)).count(); int count = users.size() - countNotAssigned; return count; } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java index 57ace7b..c630e6c 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.dto; * #L% */ -import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; @@ -35,10 +34,13 @@ import java.util.Collection; import java.util.Map; import java.util.function.Predicate; +import static fr.ird.observe.services.dto.AbstractReference.newIdPredicate; + public class IdDtos extends AbstractIdDtos { - public static <BeanType extends IdDto> BeanType findById(Iterable<BeanType> source, String id) { - return Iterables.find(source, newIdPredicate(id)); + public static <BeanType extends IdDto> BeanType findById(Collection<BeanType> source, String id) { + return source.stream().filter(newIdPredicate(id)::test).findFirst().orElse(null); +// return Iterables.find(source, newIdPredicate(id)); } public static <BeanType extends IdDto> Predicate<BeanType> newTripSeinePredicate() { @@ -49,8 +51,9 @@ public class IdDtos extends AbstractIdDtos { return input -> isTripLonglineId(input.getId()); } - public static <BeanType extends IdDto> boolean exists(Iterable<BeanType> source, String id) { - return Iterables.tryFind(source, newIdPredicate(id)).isPresent(); + public static <BeanType extends IdDto> boolean exists(Collection<BeanType> source, String id) { + return source.stream().filter(newIdPredicate(id)::test).findFirst().isPresent(); +// return Iterables.tryFind(source, newIdPredicate(id)).isPresent(); } public static boolean isProgram(IdDto dto) { @@ -158,7 +161,7 @@ public class IdDtos extends AbstractIdDtos { } public static <BeanType extends IdDto> Map<String, BeanType> splitById(Collection<BeanType> dtos) { - return Maps.uniqueIndex(dtos, ID_FUNCTION); + return Maps.uniqueIndex(dtos, ID_FUNCTION::apply); } } //IdDtos diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java index e885b45..ed86e13 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java @@ -38,9 +38,8 @@ public class RouteDto extends AbstractRouteDto { private static final long serialVersionUID = 1L; public boolean isActivityFindDeVeilleFound() { - int position = Iterables.indexOf( - getActivitySeine(), - ActivitySeineStubDtos.newActivityFinDeVeillePredicate(true)); + int position = Iterables.indexOf(getActivitySeine(), + ActivitySeineStubDtos.newActivityFinDeVeillePredicate(true)::test); return position >= 0; } @@ -63,7 +62,7 @@ public class RouteDto extends AbstractRouteDto { if (activitySeineId != null) { - int currentPosition = Iterables.indexOf(getActivitySeine(), IdDtos.newIdPredicate(activitySeineId)); + int currentPosition = Iterables.indexOf(getActivitySeine(), IdDtos.newIdPredicate(activitySeineId)::test); if (currentPosition >= 1) { previous = Iterables.get(getActivitySeine(), currentPosition - 1); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java index fd623bf..8c27ba5 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDto.java @@ -22,23 +22,30 @@ package fr.ird.observe.services.dto.seine; * #L% */ -import com.google.common.base.Optional; -import com.google.common.base.Predicates; -import com.google.common.collect.Iterables; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.IdDtos; import java.util.Date; +import java.util.Optional; +import java.util.function.Predicate; public class TripSeineDto extends AbstractTripSeineDto { private static final long serialVersionUID = 3976788848141361507L; public boolean isDateAvailable(String routeId, Date date) { - Optional<RouteStubDto> optional = Iterables.tryFind(getRoute(), - Predicates.and(RouteStubDtos.newDatePredicate(date), - Predicates.not(IdDtos.newIdPredicate(routeId)))); - return ! optional.isPresent(); + Predicate<RouteStubDto> routeStubDtoPredicate = RouteStubDtos.newDatePredicate(date); + Predicate<IdDto> idDtoPredicate = IdDtos.newIdPredicate(routeId); + Optional<RouteStubDto> optional = getRoute().stream() + .filter(r -> routeStubDtoPredicate.test(r) && !idDtoPredicate.test(r)) + .findFirst(); + +// Optional<RouteStubDto> optional = Iterables.tryFind(getRoute(), +// Predicates.and(RouteStubDtos.newDatePredicate(date), +// Predicates.not(IdDtos.newIdPredicate(routeId)))); + + return !optional.isPresent(); } diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.properties b/observe-services-model/src/main/xmi/observe-services-dto-common.properties index 5203942..d865fd0 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-common.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-common.properties @@ -20,6 +20,7 @@ # #L% ### model.tagvalue.version=5.0 +model.tagvalue.java8=true model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties index 9f150eb..977cebc 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties @@ -20,6 +20,7 @@ # #L% ### model.tagvalue.version=5.0 +model.tagvalue.java8=true model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.properties b/observe-services-model/src/main/xmi/observe-services-dto-seine.properties index 9f01271..60bce55 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-seine.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-seine.properties @@ -20,6 +20,7 @@ # #L% ### model.tagvalue.version=5.0 +model.tagvalue.java8=true model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java index 46c7461..1215dbf 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java @@ -45,6 +45,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.function.Function; +import java.util.stream.Collectors; /** * FIXME Ca sert à quoi? @@ -80,11 +81,11 @@ public class ObserveSecurityHelper { TMSVersionHibernateDao.LEGACY_TABLE_NAME); protected static final Set<String> FUNCTION_NAMES_PREFIXS = Sets.newHashSet("ST_MakePoint", - "ST_SetSRID", - "sync_", - "tr_sync", - "ot_enhanced_school_type", - "observe_"); + "ST_SetSRID", + "sync_", + "tr_sync", + "ot_enhanced_school_type", + "observe_"); protected static final String SCHEMA_PUBLIC = "public"; @@ -137,10 +138,10 @@ public class ObserveSecurityHelper { } String administratorName = Iterables.get(getUserNamesByRole(users, ObserveDbRole.ADMINISTRATOR), 0); - Iterable<String> technicalNames = getUserNamesByRole(users, ObserveDbRole.TECHNICAL); - Iterable<String> usersNames = getUserNamesByRole(users, ObserveDbRole.USER); - Iterable<String> referentialNames = getUserNamesByRole(users, ObserveDbRole.REFERENTIAL); - Iterable<String> unusedNames = getUserNamesByRole(users, ObserveDbRole.UNUSED); + List<String> technicalNames = getUserNamesByRole(users, ObserveDbRole.TECHNICAL); + List<String> usersNames = getUserNamesByRole(users, ObserveDbRole.USER); + List<String> referentialNames = getUserNamesByRole(users, ObserveDbRole.REFERENTIAL); + List<String> unusedNames = getUserNamesByRole(users, ObserveDbRole.UNUSED); if (log.isInfoEnabled()) { @@ -170,7 +171,6 @@ public class ObserveSecurityHelper { Set<String> unusedEscapedNames = escapedNames(unusedNames); - // suppression de tous les droits { Set<String> privateRoles = new HashSet<>(); @@ -193,7 +193,7 @@ public class ObserveSecurityHelper { addOnSchemaForRole(GRANT_ON_FUNCTION_PATTERN, builder, allPostgisFunctions, administratorEscapedName); // ajout administrateurs - if ( ! technicalEscapedNames.isEmpty()) { + if (!technicalEscapedNames.isEmpty()) { String roles = StringUtil.join(technicalEscapedNames, ",", true); addOnTablesForRole(GRANT_ON_TABLE_ALL_PATTERN, builder, tables, roles); addOnSchemaForRole(GRANT_ON_SCHEMA_ALL_PATTERN, builder, SCHEMAS, roles); @@ -201,7 +201,7 @@ public class ObserveSecurityHelper { } // ajout utilisateur - if ( ! usersEscapedNames.isEmpty()) { + if (!usersEscapedNames.isEmpty()) { String roles = StringUtil.join(usersEscapedNames, ",", true); addOnTablesForRole(GRANT_ON_TABLE_READ_PATTERN, builder, tables, roles); addOnSchemaForRole(GRANT_ON_SCHEMA_ALL_PATTERN, builder, SCHEMAS, roles); @@ -209,7 +209,7 @@ public class ObserveSecurityHelper { } // ajout referentiel - if ( ! referentialEscapedNames.isEmpty()) { + if (!referentialEscapedNames.isEmpty()) { String roles = StringUtil.join(referentialEscapedNames, ",", true); addOnTablesForRole(GRANT_ON_TABLE_READ_PATTERN, builder, referentielTables, roles); addOnSchemaForRole(GRANT_ON_SCHEMA_ALL_PATTERN, builder, SCHEMAS, roles); @@ -226,13 +226,13 @@ public class ObserveSecurityHelper { } - protected Iterable<String> getUserNamesByRole(Set<ObserveDbUserDto> users, ObserveDbRole role) { - return Iterables.transform(Iterables.filter(users, ObserveDbUserDtos.newRolePredicate(role)), ObserveDbUserDtos.getNameFunction()); + protected List<String> getUserNamesByRole(Set<ObserveDbUserDto> users, ObserveDbRole role) { + return users.stream().filter(ObserveDbUserDtos.newRolePredicate(role)).map(ObserveDbUserDtos.NAME_FUNCTION).collect(Collectors.toList()); +// return Iterables.transform(Iterables.filter(users, ObserveDbUserDtos.newRolePredicate(role)), ObserveDbUserDtos.NAME_FUNCTION::apply); } - protected Set<String> escapedNames(Iterable<String> names) { - Iterable<String> transform = Iterables.transform(names, ESCAPE_STRING::apply); - return Sets.newHashSet(transform); + protected Set<String> escapedNames(List<String> names) { + return names.stream().map(ESCAPE_STRING).collect(Collectors.toSet()); } protected List<Pair<String, String>> getReferentielTables(Iterable<Pair<String, String>> tables) { @@ -252,7 +252,7 @@ public class ObserveSecurityHelper { } protected List<Pair<String, String>> getDataTables(Collection<Pair<String, String>> tables, - Collection<Pair<String, String>> referentielTables) { + Collection<Pair<String, String>> referentielTables) { List<Pair<String, String>> result = new ArrayList<>(tables); result.removeAll(referentielTables); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java index fce5c37..46c08ce 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java @@ -478,7 +478,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS @Override public void applySecurity(ObserveDataSourceConfiguration dataSourceConfiguration, Set<ObserveDbUserDto> users) { if (log.isTraceEnabled()) { - log.trace("applySecurity(" + dataSourceConfiguration + ", [" + Joiner.on(", ").join(Iterables.transform(users, ObserveDbUserDtos.getNameFunction())) + "])"); + log.trace("applySecurity(" + dataSourceConfiguration + ", [" + Joiner.on(", ").join(Iterables.transform(users, ObserveDbUserDtos.NAME_FUNCTION::apply)) + "])"); } // pas de securité pour les bases autres que postgresql 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 a176caa..b057fe8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.EntityMap; +import fr.ird.observe.entities.constants.ReferenceStatusPersist; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.services.ObserveServiceTopia; @@ -148,7 +149,6 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe dto.setCreateDate(entity.getTopiaCreateDate()); dto.setLastUpdateDate(entity.getLastUpdateDate()); dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); - dto.setEnabled(entity.isEnabled()); return form; @@ -175,6 +175,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Class<ObserveReferentialEntity> entityType = getReferentialEntityType(type); ObserveReferentialEntity entity = newEntity(entityType); + entity.setStatus(ReferenceStatusPersist.enabled); //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser //FIXME Definir une definition pour chaque formulaire de référentiel Form<D> form = referentialEntityToForm(type, entity, null); diff --git a/pom.xml b/pom.xml index dfc9f21..b421c3b 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <eugenePluginVersion>3.0-alpha-5</eugenePluginVersion> + <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> <topiaVersion>3.1.3</topiaVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.