[Observe-commits] [Git][ultreiaio/ird-observe][develop-7.x] 2 commits: update pom

27 Jun 2019


      Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe


Commits:
952d393e by tchemit at 2019-06-27T04:18:50Z
update pom

- - - - -
3cf7c59b by tchemit at 2019-06-27T04:18:55Z
[UI REFERENTIEL] Liste des relations taille-poids et taille-taille - Closes #1335 (report V7) + Clés de référentiel non traduite ou nom des clés invalide - See #1336

- - - - -


16 changed files:

- dto/src/main/i18n/getters/java.getter
- dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java
- dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java
- dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
- dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java
- dto/src/main/java/fr/ird/observe/dto/referential/LengthLengthParameterReference.java
- dto/src/main/java/fr/ird/observe/dto/referential/LengthWeightParameterReference.java
- dto/src/main/java/fr/ird/observe/dto/referential/PersonHelper.java
- dto/src/main/models/Observe.model
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
- persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterEntityReferenceBinder.java
- persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityReferenceBinder.java
- pom.xml
- validation/src/main/i18n/getters/validation-fields.getter


Changes:

=====================================
dto/src/main/i18n/getters/java.getter
=====================================
@@ -36,6 +36,12 @@ observe.common.SetLonglineDetailCompositionDto.type
 observe.common.SetLonglineDto.type
 observe.common.SetLonglineGlobalCompositionDto.type
 observe.common.SetSeineDto.type
+observe.common.WithFormula.coefficients
+observe.common.WithFormula.coefficientsInformation
+observe.common.WithFormula.equation
+observe.common.WithFormula.source
+observe.common.WithFormula.speciesFaoCode
+observe.common.WithFormula.speciesLabel
 observe.common.gps.activity
 observe.common.gps.gpsPoint
 observe.common.inconnu


=====================================
dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java
=====================================
@@ -50,6 +50,7 @@ public class LengthLengthParameterDtoReferenceBinder extends ReferentialDtoRefer
         return new LengthLengthParameterReference(dto,
                                                   dto.getUri(),
                                                   Optional.ofNullable(dto.getOcean()).map(OceanReference::getLabel).orElse(null),
+                                                  Optional.ofNullable(dto.getSpecies()).map(SpeciesReference::getFaoCode).orElse(null),
                                                   Optional.ofNullable(dto.getSpecies()).map(SpeciesReference::getScientificLabel).orElse(null),
                                                   Optional.ofNullable(dto.getSex()).map(SexReference::getLabel).orElse(null),
                                                   dto.getStartDate(),


=====================================
dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java
=====================================
@@ -49,6 +49,7 @@ public class LengthWeightParameterDtoReferenceBinder extends ReferentialDtoRefer
         return new LengthWeightParameterReference(dto,
                                                   dto.getUri(),
                                                   Optional.ofNullable(dto.getOcean()).map(OceanReference::getLabel).orElse(null),
+                                                  Optional.ofNullable(dto.getSpecies()).map(SpeciesReference::getFaoCode).orElse(null),
                                                   Optional.ofNullable(dto.getSpecies()).map(SpeciesReference::getScientificLabel).orElse(null),
                                                   Optional.ofNullable(dto.getSex()).map(SexReference::getLabel).orElse(null),
                                                   dto.getStartDate(),


=====================================
dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
=====================================
@@ -561,13 +561,13 @@ public class DecoratorService extends DecoratorProvider {
         @Override
         public void initLengthLengthParameterDto() {
             registerDecorator(new LengthLengthParameterDecorator(libelle));
-            registerReferentialReferenceDecorator(LengthLengthParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${inputSizeMeasureTypeCode}$s##${outputSizeMeasureTypeCode}$s");
+            registerReferentialReferenceDecorator(LengthLengthParameterReference.class, "${speciesFaoCode}$s##${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%5$tm/%5$tY##${endDate}$td/%6$tm/%6$tY##${inputSizeMeasureTypeCode}$s##${outputSizeMeasureTypeCode}$s");
         }
 
         @Override
         public void initLengthWeightParameterDto() {
             registerDecorator(new LengthWeightParameterDecorator(libelle));
-            registerReferentialReferenceDecorator(LengthWeightParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${sizeMeasureTypeCode}$s");
+            registerReferentialReferenceDecorator(LengthWeightParameterReference.class, "${speciesFaoCode}$s##${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%5$tm/%5$tY##${endDate}$td/%6$tm/%6$tY##${sizeMeasureTypeCode}$s");
         }
 
         @Override


=====================================
dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java
=====================================
@@ -23,14 +23,21 @@ package fr.ird.observe.dto.decoration;
  */
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.dto.IdDto;
 import fr.ird.observe.dto.IdHelper;
 import fr.ird.observe.dto.data.DataDto;
 import fr.ird.observe.dto.referential.I18nReferentialDto;
+import fr.ird.observe.dto.referential.LengthLengthParameterDto;
+import fr.ird.observe.dto.referential.LengthLengthParameterReference;
 import fr.ird.observe.dto.referential.ReferentialDto;
+import fr.ird.observe.dto.referential.SpeciesDto;
+import fr.ird.observe.dto.referential.WithFormula;
 import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerSupport;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;
+import java.util.Objects;
 
 import static io.ultreia.java4all.i18n.I18n.n;
 
@@ -84,11 +91,26 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport
         n("observe.common.ReferentialDto.uri");
         n("observe.common.SetLonglineGlobalCompositionDto.type");
         n("observe.common.SetLonglineDetailCompositionDto.type");
+
+        n("observe.common.WithFormula.equation");
+        n("observe.common.WithFormula.coefficients");
+        n("observe.common.WithFormula.coefficientsInformation");
+        n("observe.common.WithFormula.source");
+        n("observe.common.WithFormula.speciesLabel");
+        n("observe.common.WithFormula.speciesFaoCode");
     }
 
-    public ObserveI18nLabelsBuilder() {
+    ObserveI18nLabelsBuilder() {
         super(ObserveI18nDecoratorHelper.OBSERVE_COMMON_PREFIX);
     }
+    @Override
+    protected Map<String, String> createPropertyKeyMapping() {
+        return ImmutableMap.<String, String>builder()
+                .put("sizeMeasureTypeCode", "sizeMeasureType")
+                .put("inputSizeMeasureTypeCode", "inputSizeMeasureType")
+                .put("outputSizeMeasureTypeCode", "outputSizeMeasureType")
+                .build();
+    }
 
     @Override
     protected Map<String, String> createMapping() {
@@ -141,11 +163,35 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport
                 .put("traceCutOff", DataDto.class.getSimpleName() + ".")
                 .put("baitHaulingStatus", DataDto.class.getSimpleName() + ".")
 
+                .put("coefficientsInformation", WithFormula.class.getSimpleName() + ".")
+                .put(WithFormula.PROPERTY_COEFFICIENTS, WithFormula.class.getSimpleName() + ".")
+                .put("equation", WithFormula.class.getSimpleName() + ".")
+                .put(WithFormula.PROPERTY_SOURCE, WithFormula.class.getSimpleName() + ".")
+
+                .put("speciesLabel", WithFormula.class.getSimpleName() + ".")
+                .put("speciesFaoCode", WithFormula.class.getSimpleName() + ".")
+
                 .build();
     }
 
+    private static final ImmutableSet<String> SKIP_LABEL = ImmutableSet.of(
+            "speciesLabel",
+            "scientificLabel",
+            "capacityLabel",
+            "gaugeLabel"
+    );
+
+    @Override
+    public String getPropertyMapping(String property) {
+        if (Objects.requireNonNull(property).endsWith("Label") && !SKIP_LABEL.contains(property)) {
+            property = StringUtils.removeEnd(property, "Label");
+        }
+        return super.getPropertyMapping(property);
+    }
+
     @Override
     public String getI18nTypeKey(Class type) {
         return IdHelper.getDtoShortName(type) + "Dto";
     }
+
 }


=====================================
dto/src/main/java/fr/ird/observe/dto/referential/LengthLengthParameterReference.java
=====================================
@@ -28,8 +28,8 @@ import java.util.Date;
 
 public class LengthLengthParameterReference extends GeneratedLengthLengthParameterReference implements WithStartEndDate {
 
-    public LengthLengthParameterReference(ReferentialDtoReferenceAware dto, String uri, String oceanLabel, String speciesLabel, String sexLabel, Date startDate, Date endDate, String inputSizeMeasureTypeCode, String inputSizeMeasureTypeLabel, String outputSizeMeasureTypeCode, String outputSizeMeasureTypeLabel, String inputOutputFormula, String outputInputFormula) {
-        super(dto, uri, oceanLabel, speciesLabel, sexLabel, startDate, endDate, inputSizeMeasureTypeCode, inputSizeMeasureTypeLabel, outputSizeMeasureTypeCode, outputSizeMeasureTypeLabel, inputOutputFormula, outputInputFormula);
+    public LengthLengthParameterReference(ReferentialDtoReferenceAware dto, String uri, String oceanLabel, String speciesFaoCode, String speciesLabel, String sexLabel, Date startDate, Date endDate, String inputSizeMeasureTypeCode, String inputSizeMeasureTypeLabel, String outputSizeMeasureTypeCode, String outputSizeMeasureTypeLabel, String inputOutputFormula, String outputInputFormula) {
+        super(dto, uri, oceanLabel, speciesFaoCode, speciesLabel, sexLabel, startDate, endDate, inputSizeMeasureTypeCode, inputSizeMeasureTypeLabel, outputSizeMeasureTypeCode, outputSizeMeasureTypeLabel, inputOutputFormula, outputInputFormula);
     }
 
 }


=====================================
dto/src/main/java/fr/ird/observe/dto/referential/LengthWeightParameterReference.java
=====================================
@@ -28,8 +28,8 @@ import java.util.Date;
 
 public class LengthWeightParameterReference extends GeneratedLengthWeightParameterReference implements WithStartEndDate {
 
-    public LengthWeightParameterReference(ReferentialDtoReferenceAware dto, String uri, String oceanLabel, String speciesLabel, String sexLabel, Date startDate, Date endDate, String lengthWeightFormula, String weightLengthFormula, String sizeMeasureTypeCode) {
-        super(dto, uri, oceanLabel, speciesLabel, sexLabel, startDate, endDate, lengthWeightFormula, weightLengthFormula, sizeMeasureTypeCode);
+    public LengthWeightParameterReference(ReferentialDtoReferenceAware dto, String uri, String oceanLabel, String speciesFaoCode, String speciesLabel, String sexLabel, Date startDate, Date endDate, String lengthWeightFormula, String weightLengthFormula, String sizeMeasureTypeCode) {
+        super(dto, uri, oceanLabel, speciesFaoCode,speciesLabel, sexLabel, startDate, endDate, lengthWeightFormula, weightLengthFormula, sizeMeasureTypeCode);
 }
 
 }


=====================================
dto/src/main/java/fr/ird/observe/dto/referential/PersonHelper.java
=====================================
@@ -25,40 +25,20 @@ package fr.ird.observe.dto.referential;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public class PersonHelper extends GeneratedPersonHelper {
 
     public static List<PersonReference> filterCaptainReferences(Collection<PersonReference> incoming) {
-        return incoming.stream().filter(newCaptainReferencePredicate()).collect(Collectors.toList());
+        return incoming.stream().filter(PersonReference::isCaptain).collect(Collectors.toList());
     }
 
     public static List<PersonReference> filterObserverReferences(Collection<PersonReference> incoming) {
-        return incoming.stream().filter(newObserverReferencePredicate()).collect(Collectors.toList());
+        return incoming.stream().filter(PersonReference::isObserver).collect(Collectors.toList());
     }
 
     public static List<PersonReference> filterDataEntryOperatorReferences(Collection<PersonReference> incoming) {
-        return incoming.stream().filter(newDataEntryOperatorReferencePredicate()).collect(Collectors.toList());
-    }
-
-    public static Predicate<PersonReference> newCaptainReferencePredicate() {
-        return input -> input.getPropertyNames().contains(PersonDto.PROPERTY_CAPTAIN)
-                && Objects.equals(true, input.isCaptain());
-
-    }
-
-    public static Predicate<PersonReference> newDataEntryOperatorReferencePredicate() {
-        return input -> input.getPropertyNames().contains(PersonDto.PROPERTY_DATA_ENTRY_OPERATOR)
-                && Objects.equals(true, input.isDataEntryOperator());
-
-    }
-
-    public static Predicate<PersonReference> newObserverReferencePredicate() {
-        return input -> input.getPropertyNames().contains(PersonDto.PROPERTY_OBSERVER)
-                && Objects.equals(true, input.isObserver());
-
+        return incoming.stream().filter(PersonReference::isDataEntryOperator).collect(Collectors.toList());
     }
 
     public static String getNames(PersonDto person) {


=====================================
dto/src/main/models/Observe.model
=====================================
@@ -385,7 +385,7 @@ longitude + {*:1} Float
 quadrant + {*:1} Integer
 country {*:0..1} fr.ird.observe.dto.referential.CountryReference
 
-referential.LengthLengthParameter > referential.LengthFormulaSupport | references=uri,oceanLabel,speciesLabel,sexLabel,startDate,endDate,inputSizeMeasureTypeCode,inputSizeMeasureTypeLabel,outputSizeMeasureTypeCode,outputSizeMeasureTypeLabel,inputOutputFormula,outputInputFormula
+referential.LengthLengthParameter > referential.LengthFormulaSupport | references=uri,oceanLabel,speciesFaoCode,speciesLabel,sexLabel,startDate,endDate,inputSizeMeasureTypeCode,inputSizeMeasureTypeLabel,outputSizeMeasureTypeCode,outputSizeMeasureTypeLabel,inputOutputFormula,outputInputFormula
 inputOutputFormula + {*:1} String
 inputOutputFormulaValid + {*:1} boolean
 outputInputFormula + {*:1} String
@@ -393,7 +393,7 @@ outputInputFormulaValid + {*:1} boolean
 inputSizeMeasureType {*:1} fr.ird.observe.dto.referential.SizeMeasureTypeReference
 outputSizeMeasureType {*:1} fr.ird.observe.dto.referential.SizeMeasureTypeReference
 
-referential.LengthWeightParameter > referential.LengthFormulaSupport | references=uri,oceanLabel,speciesLabel,sexLabel,startDate,endDate,lengthWeightFormula,weightLengthFormula,sizeMeasureTypeCode
+referential.LengthWeightParameter > referential.LengthFormulaSupport | references=uri,oceanLabel,speciesFaoCode,speciesLabel,sexLabel,startDate,endDate,lengthWeightFormula,weightLengthFormula,sizeMeasureTypeCode
 lengthWeightFormula + {*:1} String
 weightLengthFormula + {*:1} String
 meanLength + {*:1} Float


=====================================
observe-i18n/src/main/i18n/translations/observe_en_GB.properties
=====================================
@@ -1627,6 +1627,8 @@ observe.common.WithFormula.coefficients=Coefficients
 observe.common.WithFormula.coefficientsInformation=Coefficients of relations msut follow the syntax name\=value and are separated by \: (example \: a\=1\:b\=2\:c\=3)
 observe.common.WithFormula.equation=Equation
 observe.common.WithFormula.source=Source
+observe.common.WithFormula.speciesFaoCode=Species - FAO Code
+observe.common.WithFormula.speciesLabel=Species - Scientific label
 observe.common.acquisitionMode=Acquisition mode
 observe.common.action.moveCatchDown=Move down
 observe.common.action.moveCatchDown.tip=Move down the catch


=====================================
observe-i18n/src/main/i18n/translations/observe_es_ES.properties
=====================================
@@ -1627,6 +1627,8 @@ observe.common.WithFormula.coefficients=Coeficientes
 observe.common.WithFormula.coefficientsInformation=Los coeficientes de relaciones son de la forma texto\=valor y están separados por \: (ejemplo \: a\=1\:b\=2\:c\=3)
 observe.common.WithFormula.equation=Relación talla-peso
 observe.common.WithFormula.source=Fuente
+observe.common.WithFormula.speciesFaoCode=Especie - Codigo FAO
+observe.common.WithFormula.speciesLabel=Especie - Texto científico
 observe.common.acquisitionMode=Modo de entrada de datos
 observe.common.action.moveCatchDown=Descender
 observe.common.action.moveCatchDown.tip=Descender la captura


=====================================
observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
=====================================
@@ -1627,6 +1627,8 @@ observe.common.WithFormula.coefficients=Coefficients
 observe.common.WithFormula.coefficientsInformation=Les coefficients des relations sont de la forme nom\=valeur et sont séparé par des \: (exemple \: a\=1\:b\=2\:c\=3)
 observe.common.WithFormula.equation=Relation Taille-Poids
 observe.common.WithFormula.source=Source
+observe.common.WithFormula.speciesFaoCode=Espèce - Code FAO
+observe.common.WithFormula.speciesLabel=Espèce - Libéllé scientifique
 observe.common.acquisitionMode=Mode de saisie
 observe.common.action.moveCatchDown=Descendre
 observe.common.action.moveCatchDown.tip=Descendre la capture


=====================================
persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterEntityReferenceBinder.java
=====================================
@@ -47,6 +47,7 @@ public class LengthLengthParameterEntityReferenceBinder extends ReferentialEntit
         return new LengthLengthParameterReference(dto,
                                                   dto.getUri(),
                                                   dto.getOcean().getLabel(referentialLocale),
+                                                  dto.getSpecies().getFaoCode(),
                                                   dto.getSpecies().getScientificLabel(),
                                                   dto.getSex().getLabel(referentialLocale),
                                                   dto.getStartDate(),


=====================================
persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityReferenceBinder.java
=====================================
@@ -48,6 +48,7 @@ public class LengthWeightParameterEntityReferenceBinder extends ReferentialEntit
         return new LengthWeightParameterReference(dto,
                                                   dto.getUri(),
                                                   dto.getOcean().getLabel(referentialLocale),
+                                                  dto.getSpecies().getFaoCode(),
                                                   dto.getSpecies().getScientificLabel(),
                                                   dto.getSex().getLabel(referentialLocale),
                                                   dto.getStartDate(),


=====================================
pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2019.8.18</version>
+    <version>2019.8.22</version>
   </parent>
 
   <groupId>fr.ird.observe</groupId>
@@ -163,7 +163,7 @@
     <!--can't use 1.4.197 (date has changed + blob also-->
     <lib.version.h2>1.4.196</lib.version.h2>
     <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene>
-    <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx>
+    <!--lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx-->
     <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>-->
     <lib.version.java4all.topia>1.1.14</lib.version.java4all.topia>
 


=====================================
validation/src/main/i18n/getters/validation-fields.getter
=====================================
@@ -254,3 +254,4 @@ observe.common.VesselSizeCategoryDto.capacityLabel
 observe.common.VesselSizeCategoryDto.gaugeLabel
 observe.common.WindDto.speedRange
 observe.common.WindDto.waveHeight
+observe.common.WithFormula.coefficients



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b6863d974e651cb8a97f4936595...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b6863d974e651cb8a97f4936595...
You're receiving this email because of your account on gitlab.com.

    