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

Commits:

8 changed files:

Changes:

  • dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java
    ... ... @@ -53,7 +53,9 @@ public class LengthLengthParameterDtoReferenceBinder extends ReferentialDtoRefer
    53 53 
                     Optional.ofNullable(dto.getSex()).map(SexReference::getLabel).orElse(null),
    54 54 
                     dto.getStartDate(),
    55 55 
                     dto.getEndDate(),
    56 
    +                Optional.ofNullable(dto.getInputSizeMeasureType()).map(SizeMeasureTypeReference::getCode).orElse(null),
    56 57 
                     Optional.ofNullable(dto.getInputSizeMeasureType()).map(SizeMeasureTypeReference::getLabel).orElse(null),
    58 
    +                Optional.ofNullable(dto.getOutputSizeMeasureType()).map(SizeMeasureTypeReference::getCode).orElse(null),
    57 59 
                     Optional.ofNullable(dto.getOutputSizeMeasureType()).map(SizeMeasureTypeReference::getLabel).orElse(null),
    58 60 
                     dto.getInputOutputFormula(),
    59 61 
                     dto.getOutputInputFormula());

  • dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java
    ... ... @@ -53,7 +53,8 @@ public class LengthWeightParameterDtoReferenceBinder extends ReferentialDtoRefer
    53 53 
                     dto.getStartDate(),
    54 54 
                     dto.getEndDate(),
    55 55 
                     dto.getLengthWeightFormula(),
    56 
    -                dto.getWeightLengthFormula());
    56 
    +                dto.getWeightLengthFormula(),
    57 
    +                dto.getCode());
    57 58
    58 59 
         }
    59 60 
     }

  • dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
    ... ... @@ -558,13 +558,13 @@ public class DecoratorService extends DecoratorProvider {
    558 558 
             @Override
    559 559 
             public void initLengthLengthParameterDto() {
    560 560 
                 registerDecorator(new LengthLengthParameterDecorator(libelle));
    561 
    -            registerReferentialReferenceDecorator(LengthLengthParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${inputSizeMeasureTypeLabel}$s##${outputSizeMeasureTypeLabel}$s");
    561 
    +            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");
    562 562 
             }
    563 563
    564 564 
             @Override
    565 565 
             public void initLengthWeightParameterDto() {
    566 566 
                 registerDecorator(new LengthWeightParameterDecorator(libelle));
    567 
    -            registerReferentialReferenceDecorator(LengthWeightParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY");
    567 
    +            registerReferentialReferenceDecorator(LengthWeightParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${sizeMeasureTypeCode}$s");
    568 568 
             }
    569 569
    570 570 
             @Override

  • dto/src/main/java/fr/ird/observe/dto/decoration/decorators/LengthLengthParameterDecorator.java
    ... ... @@ -37,7 +37,7 @@ public class LengthLengthParameterDecorator extends ObserveDecorator<LengthLengt
    37 37 
         private static final long serialVersionUID = 1L;
    38 38
    39 39 
         public LengthLengthParameterDecorator(String libelle) throws IllegalArgumentException, NullPointerException {
    40 
    -        super(LengthLengthParameterDto.class, "${species/scientificLabel}$s##${ocean/" + libelle + "}$s##${sex/" + libelle + "}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${inputSizeMeasureType/" + libelle + "}$s##${outputSizeMeasureType/" + libelle + "}$s");
    40 
    +        super(LengthLengthParameterDto.class, "${species/scientificLabel}$s##${ocean/" + libelle + "}$s##${sex/" + libelle + "}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${inputSizeMeasureType/code}$s##${outputSizeMeasureType/code}$s");
    41 41 
         }
    42 42
    43 43 
         @SuppressWarnings({"unchecked"})

  • dto/src/main/java/fr/ird/observe/dto/decoration/decorators/LengthWeightParameterDecorator.java
    ... ... @@ -38,7 +38,7 @@ public class LengthWeightParameterDecorator extends ObserveDecorator<LengthWeigh
    38 38
    39 39 
         public LengthWeightParameterDecorator(String libelle) throws IllegalArgumentException, NullPointerException {
    40 40 
             super(LengthWeightParameterDto.class,
    41 
    -                "${species/scientificLabel}$s##${ocean/" + libelle + "}$s##${sex}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY"
    41 
    +                "${species/scientificLabel}$s##${ocean/" + libelle + "}$s##${sex}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${sizeMeasureType/code}$s"
    42 42 
             );
    43 43 
         }
    44 44
    ... ... @@ -62,15 +62,12 @@ public class LengthWeightParameterDecorator extends ObserveDecorator<LengthWeigh
    62 62 
             if (token.startsWith(LengthWeightParameterDto.PROPERTY_OCEAN)) {
    63 63 
                 return t("observe.common.inconnu");
    64 64 
             }
    65 
    -//        if (token.equals(LengthWeightParameterDto.PROPERTY_START_DATE) || token.equals(LengthWeightParameterDto.PROPERTY_END_DATE)) {
    66 
    -//            return null;
    67 
    -//        }
    68 65 
             return super.getDefaultUndefinedValue(token);
    69 66 
         }
    70 67
    71 68 
         @Override
    72 69 
         protected Comparable<?> getDefaultNullValue(String token) {
    73 
    -        if (token.equals(LengthWeightParameterDto.PROPERTY_START_DATE) || token.equals(LengthWeightParameterDto.PROPERTY_END_DATE)) {
    70 
    +        if (token.startsWith(LengthWeightParameterDto.PROPERTY_START_DATE) || token.startsWith(LengthWeightParameterDto.PROPERTY_END_DATE)) {
    74 71 
                 return null;
    75 72 
             }
    76 73 
             return super.getDefaultNullValue(token);

  • dto/src/main/models/Observe.model
    ... ... @@ -393,7 +393,7 @@ longitude + {*:1} Float
    393 393 
     quadrant + {*:1} Integer
    394 394 
     country {*:0..1} fr.ird.observe.dto.referential.CountryReference
    395 395
    396 
    -referential.LengthLengthParameter > referential.LengthFormulaSupport | references=oceanLabel,speciesLabel,sexLabel,startDate,endDate,inputSizeMeasureTypeLabel,outputSizeMeasureTypeLabel,inputOutputFormula,outputInputFormula
    396 
    +referential.LengthLengthParameter > referential.LengthFormulaSupport | references=oceanLabel,speciesLabel,sexLabel,startDate,endDate,inputSizeMeasureTypeCode,inputSizeMeasureTypeLabel,outputSizeMeasureTypeCode,outputSizeMeasureTypeLabel,inputOutputFormula,outputInputFormula
    397 397 
     inputOutputFormula + {*:1} String
    398 398 
     inputOutputFormulaValid + {*:1} boolean
    399 399 
     outputInputFormula + {*:1} String
    ... ... @@ -401,7 +401,7 @@ outputInputFormulaValid + {*:1} boolean
    401 401 
     inputSizeMeasureType {*:1} fr.ird.observe.dto.referential.SizeMeasureTypeReference
    402 402 
     outputSizeMeasureType {*:1} fr.ird.observe.dto.referential.SizeMeasureTypeReference
    403 403
    404 
    -referential.LengthWeightParameter > referential.LengthFormulaSupport | references=oceanLabel,speciesLabel,sexLabel,startDate,endDate,lengthWeightFormula,weightLengthFormula
    404 
    +referential.LengthWeightParameter > referential.LengthFormulaSupport | references=oceanLabel,speciesLabel,sexLabel,startDate,endDate,lengthWeightFormula,weightLengthFormula,sizeMeasureTypeCode
    405 405 
     lengthWeightFormula + {*:1} String
    406 406 
     weightLengthFormula + {*:1} String
    407 407 
     meanLength + {*:1} Float

  • persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterEntityReferenceBinder.java
    ... ... @@ -10,12 +10,12 @@ package fr.ird.observe.binder.referential.common;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -27,6 +27,9 @@ import fr.ird.observe.dto.referential.LengthLengthParameterDto;
    27 27 
     import fr.ird.observe.dto.referential.LengthLengthParameterReference;
    28 28 
     import fr.ird.observe.dto.referential.ReferentialLocale;
    29 29 
     import fr.ird.observe.entities.referentiel.LengthLengthParameter;
    30 
    +import fr.ird.observe.entities.referentiel.SizeMeasureType;
    31 
    +
    32 
    +import java.util.Optional;
    30 33
    31 34 
     /**
    32 35 
      * Created on 24/11/15.
    ... ... @@ -47,9 +50,11 @@ public class LengthLengthParameterEntityReferenceBinder extends ReferentialEntit
    47 50 
                     dto.getSex().getLabel(referentialLocale),
    48 51 
                     dto.getStartDate(),
    49 52 
                     dto.getEndDate(),
    50 
    -                                                  dto.getInputSizeMeasureType().getLabel(referentialLocale),
    51 
    -                                                  dto.getOutputSizeMeasureType().getLabel(referentialLocale),
    52 
    -                                                  dto.getInputOutputFormula(),
    53 
    -                                                  dto.getOutputInputFormula());
    53 
    +                Optional.ofNullable(dto.getInputSizeMeasureType()).map(SizeMeasureType::getCode).orElse(null),
    54 
    +                Optional.ofNullable(dto.getInputSizeMeasureType()).map(e -> e.getLabel(referentialLocale)).orElse(null),
    55 
    +                Optional.ofNullable(dto.getOutputSizeMeasureType()).map(SizeMeasureType::getCode).orElse(null),
    56 
    +                Optional.ofNullable(dto.getOutputSizeMeasureType()).map(e -> e.getLabel(referentialLocale)).orElse(null),
    57 
    +                dto.getInputOutputFormula(),
    58 
    +                dto.getOutputInputFormula());
    54 59 
         }
    55 60 
     }

  • persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityReferenceBinder.java
    ... ... @@ -10,12 +10,12 @@ package fr.ird.observe.binder.referential.common;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -27,6 +27,9 @@ import fr.ird.observe.dto.referential.LengthWeightParameterDto;
    27 27 
     import fr.ird.observe.dto.referential.LengthWeightParameterReference;
    28 28 
     import fr.ird.observe.dto.referential.ReferentialLocale;
    29 29 
     import fr.ird.observe.entities.referentiel.LengthWeightParameter;
    30 
    +import fr.ird.observe.entities.referentiel.SizeMeasureType;
    31 
    +
    32 
    +import java.util.Optional;
    30 33
    31 34 
     /**
    32 35 
      * Created on 24/11/15.
    ... ... @@ -43,13 +46,14 @@ public class LengthWeightParameterEntityReferenceBinder extends ReferentialEntit
    43 46 
         public LengthWeightParameterReference toReference(ReferentialLocale referentialLocale, LengthWeightParameter dto) {
    44 47
    45 48 
             return new LengthWeightParameterReference(dto,
    46 
    -                                                  dto.getOcean().getLabel(referentialLocale),
    47 
    -                                                  dto.getSpecies().getScientificLabel(),
    48 
    -                                                  dto.getSex().getLabel(referentialLocale),
    49 
    +                dto.getOcean().getLabel(referentialLocale),
    50 
    +                dto.getSpecies().getScientificLabel(),
    51 
    +                dto.getSex().getLabel(referentialLocale),
    49 52 
                     dto.getStartDate(),
    50 53 
                     dto.getEndDate(),
    51 
    -                                                  dto.getLengthWeightFormula(),
    52 
    -                                                  dto.getWeightLengthFormula());
    54 
    +                dto.getLengthWeightFormula(),
    55 
    +                dto.getWeightLengthFormula(),
    56 
    +                Optional.ofNullable(dto.getSizeMeasureType()).map(SizeMeasureType::getCode).orElse(null));
    53 57
    54 58 
         }
    55 59 
     }

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.