This is an automated email from the git hooks/post-receive script. New commit to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git commit ffa3d7213f8d389129bdce70cb5cc29d40abd4ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 18 09:16:35 2015 +0200 Suppression des traductions sur les constantes + prise en compte dans le builder de Dto --- observe-services-model/pom.xml | 12 ------ .../seine/NonTargetCatchComputedValueSource.java | 23 ++--------- .../services/dto/constants/seine/Ownership.java | 24 ++--------- .../services/dto/constants/seine/SchoolType.java | 24 ++--------- .../seine/TypeTransmittingBuoyOperation.java | 28 +++---------- .../services/service/ReferentialDtoBuilder.java | 47 ++++++++++++++++++---- .../services/service/ReferentialServiceTopia.java | 35 ++++++++-------- 7 files changed, 73 insertions(+), 120 deletions(-) diff --git a/observe-services-model/pom.xml b/observe-services-model/pom.xml index 71ecda3..a35de0f 100644 --- a/observe-services-model/pom.xml +++ b/observe-services-model/pom.xml @@ -59,18 +59,6 @@ <!-- comons --> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java index 762049e..40469be 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java @@ -22,9 +22,6 @@ package fr.ird.observe.services.dto.constants.seine; * #L% */ -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - /** * Pour définir comment a été calculé une donnée d'une discarded faune. * @@ -38,32 +35,18 @@ public enum NonTargetCatchComputedValueSource { * * @since 3.0 */ - FROM_DATA(n("observe.common.computedValueSource.fromData")), + FROM_DATA, /** * Donnée calculée à partir de l'échantillon pour la même espèce et la même calée. * * @since 3.0 */ - FROM_SAMPLE(n("observe.common.computedValueSource.fromSample")), + FROM_SAMPLE, /** * Donnée calculée à partir du référentiel. * * @since 3.0 */ - FROM_REFERENTIEL(n("observe.common.computedValueSource.fromReferentiel")); - - private final String i18nKey; - - private NonTargetCatchComputedValueSource(String i18nKey) { - this.i18nKey = i18nKey; - } - - public String getI18nKey() { - return i18nKey; - } + FROM_REFERENTIEL; - @Override - public String toString() { - return t(i18nKey); - } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java index fd5ec49..ec9e47b 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java @@ -21,9 +21,6 @@ */ package fr.ird.observe.services.dto.constants.seine; -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - /** * An enum to define the ownership of a DCP. * @@ -32,28 +29,13 @@ import static org.nuiton.i18n.I18n.t; public enum Ownership implements Comparable<Ownership> { /** inconnue */ - unknown(n("observe.common.ownership.unknown")), + unknown, /** appartient a ce vessel */ - ceVessel(n("observe.common.ownership.ceVessel")), + ceVessel, /** appartien a un autre vessel */ - autreVessel(n("observe.common.ownership.autreVessel")); - - private String i18nKey; - - Ownership(String i18nKey) { - this.i18nKey = i18nKey; - } - - public String getI18nKey() { - return i18nKey; - } - - @Override - public String toString() { - return t(i18nKey); - } + autreVessel; public static Ownership valueOf(int ordinal) throws IllegalArgumentException { diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java index c047dc7..ab341df 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java @@ -21,9 +21,6 @@ */ package fr.ird.observe.services.dto.constants.seine; -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - /** * Une énumération pour caractériser les valeurs d'un type de banc d'une calée. * @@ -33,27 +30,12 @@ import static org.nuiton.i18n.I18n.t; public enum SchoolType { /** banc indéterminé (valeur par défaut) // was 3 before version 4.0 */ - undefined(n("observe.common.schoolType.undefined")), + undefined, /** banc objet // was 1 before version 4.0 */ - objet(n("observe.common.schoolType.objet")), + objet, /** banc libre // was 2 before version 4.0 */ - libre(n("observe.common.schoolType.libre")); - - private String i18nKey; - - SchoolType(String i18nKey) { - this.i18nKey = i18nKey; - } - - public String getI18nKey() { - return i18nKey; - } - - @Override - public String toString() { - return t(i18nKey); - } + libre; } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java index 81bac85..ef57b3c 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java @@ -21,24 +21,18 @@ */ package fr.ird.observe.services.dto.constants.seine; -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - /** @author Tony Chemit - chemit@codelutin.com */ public enum TypeTransmittingBuoyOperation { // pas de balise lue - pasDeBalise(n("observe.common.balise.objectOperation.no.balise")), + pasDeBalise, // une balise lue - visite(n("observe.common.balise.objectOperation.visite"), "1"), - recuperation(n("observe.common.balise.objectOperation.recupere"), "2"), - pose(n("observe.common.balise.objectOperation.pose"), "3"), + visite("1"), + recuperation("2"), + pose("3"), // deux balises lues - recuperationEtRemplacement(n("observe.common.balise.objectOperation.recupere.et.change"), "2", "3"); - - /** clef i18n du type d'opération sur balise */ - private String i18nKey; + recuperationEtRemplacement("2", "3"); /** les codes des opérations sur balise */ private String[] codeOperation; @@ -46,16 +40,11 @@ public enum TypeTransmittingBuoyOperation { /** le count de balises lues */ private int nbBalises; - TypeTransmittingBuoyOperation(String i18nKey, String... codeOperation) { - this.i18nKey = i18nKey; + TypeTransmittingBuoyOperation(String... codeOperation) { this.codeOperation = codeOperation; nbBalises = codeOperation.length; } - public String getI18nKey() { - return i18nKey; - } - public int getNbBalises() { return nbBalises; } @@ -64,11 +53,6 @@ public enum TypeTransmittingBuoyOperation { return codeOperation; } - @Override - public String toString() { - return t(i18nKey); - } - public static TypeTransmittingBuoyOperation valueOf(int ordinal) throws IllegalArgumentException { for (TypeTransmittingBuoyOperation o : values()) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java index 3495485..bf9ccb0 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java @@ -2,9 +2,13 @@ package fr.ird.observe.services.service; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceStatus; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; +import fr.ird.observe.services.dto.constants.seine.Ownership; +import fr.ird.observe.services.dto.constants.seine.SchoolType; +import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDtos; @@ -16,6 +20,7 @@ import org.nuiton.util.beans.BinderFactory; import java.io.Closeable; import java.util.Collection; import java.util.LinkedHashSet; +import java.util.Set; /** * Created on 16/08/15. @@ -32,6 +37,8 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl private final EntityVisitor visitor; + private ImmutableSet.Builder<Class<? extends ReferentialDto>> referentialDtoTypesBuilder; + public static <M extends ReferentialDto> ReferentialDtoBuilder<M> create(Class<M> modelType) { Preconditions.checkNotNull(modelType, "modelType can't be null."); @@ -58,36 +65,60 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl } + public Set<Class<? extends ReferentialDto>> getReferentialDtoTypes() { + return referentialDtoTypesBuilder.build(); + } + protected ReferentialDtoBuilder(M result) { this.result = result; this.binder = (Binder<M, M>) BinderFactory.newBinder(result.getClass()); this.valuesBuilder = new ImmutableMap.Builder<>(); this.visitor = new ToModelVisitor(); + this.referentialDtoTypesBuilder = new ImmutableSet.Builder<>(); } protected void putPropertyValue(String propertyName, Object propertyValue) { if (TopiaEntity.TOPIA_ID.equals(propertyName)) { propertyName = ReferentialDto.PROPERTY_ID; - } else if (Program.PROPERTY_GEAR_TYPE.equals(propertyName)) { + } else if (propertyValue instanceof GearType) { GearType entityGearType = (GearType) propertyValue; propertyValue = fr.ird.observe.services.dto.constants.GearType.valueOf(entityGearType.name()); - } else if (Program.PROPERTY_STATUS.equals(propertyName)) { + } else if (propertyValue instanceof ReferenceStatus) { + + ReferenceStatus referenceStatus = (ReferenceStatus) propertyValue; + propertyValue = fr.ird.observe.services.dto.constants.ReferenceStatus.valueOf(referenceStatus.name()); + + } else if (propertyValue instanceof Ownership) { + + Ownership ownership = (Ownership) propertyValue; + propertyValue = fr.ird.observe.services.dto.constants.seine.Ownership.valueOf(ownership.name()); - ReferenceStatus entityGearType = (ReferenceStatus) propertyValue; - propertyValue = fr.ird.observe.services.dto.constants.ReferenceStatus.valueOf(entityGearType.name()); + } else if (propertyValue instanceof SchoolType) { + + SchoolType schoolType = (SchoolType) propertyValue; + propertyValue = fr.ird.observe.services.dto.constants.seine.SchoolType.valueOf(schoolType.name()); + + } else if (propertyValue instanceof TypeTransmittingBuoyOperation) { + + TypeTransmittingBuoyOperation typeTransmittingBuoyOperation = (TypeTransmittingBuoyOperation) propertyValue; + propertyValue = fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.valueOf(typeTransmittingBuoyOperation.name()); + + } else if (propertyValue instanceof NonTargetCatchComputedValueSource) { + + NonTargetCatchComputedValueSource nonTargetCatchComputedValueSource = (NonTargetCatchComputedValueSource) propertyValue; + propertyValue = fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.valueOf(nonTargetCatchComputedValueSource.name()); } - //TODO Ajouter les autres exceptions de transformations valuesBuilder.put(propertyName, propertyValue); } protected <R extends ReferentialDto> ReferentialLabelDto<R> entityToRef(Class<R> dtoType, TopiaEntity entityValue) { - + referentialDtoTypesBuilder.add(dtoType); ReferentialLabelDto<R> label = ReferentialLabelDtos.newReferentialLabelDto(dtoType, entityValue); label.setId(entityValue.getTopiaId()); return label; @@ -102,7 +133,7 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl visitor.clear(); } - class ToModelVisitor implements EntityVisitor { + protected class ToModelVisitor implements EntityVisitor { @Override public void start(TopiaEntity entity) { 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 9fe646c..4916b1c 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 @@ -1,6 +1,7 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.referentiel.Gear; @@ -61,6 +62,8 @@ import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.FormDtos; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -73,8 +76,6 @@ import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.FormDtos; import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -128,6 +129,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import java.util.Collection; import java.util.Map; +import java.util.Set; /** * Created on 16/08/15. @@ -266,10 +268,21 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } protected <D extends ReferentialDto> FormDto<D> entityToReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { - D dto = toDto(dtoType, entity); - FormDto<D> form = FormDtos.newFormDto(dtoType); - form.setForm(dto); - return form; + try (ReferentialDtoBuilder<D> dtoBuilder = ReferentialDtoBuilder.create(dtoType)) { + dtoBuilder.copyEntity(entity); + D dto = dtoBuilder.build(); + Set<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); + + ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); + for (Class<? extends ReferentialDto> referentialDtoType : referentialDtoTypes) { + ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(referentialDtoType); + labels.add(referentialLabelSet); + } + FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); + form.setForm(dto); + + return form; + } } protected <D extends ReferentialDto, E extends TopiaEntity> E referentialDtoToEntity(D dto) { @@ -289,14 +302,4 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return (Class<M>) modelType; } - protected <D extends ReferentialDto> D toDto(Class<D> dtoType, TopiaEntity entity) { - - try (ReferentialDtoBuilder<D> dtoBuilder = ReferentialDtoBuilder.create(dtoType)) { - dtoBuilder.copyEntity(entity); - D model = dtoBuilder.build(); - return model; - } - - } - } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.