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

Commits:

18 changed files:

Changes:

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java
    ... ... @@ -30,6 +30,7 @@ import fr.ird.observe.client.util.UIHelper;
    30 30
     import fr.ird.observe.dto.data.AcquisitionMode;
    
    31 31
     import fr.ird.observe.dto.data.ps.observation.SampleDto;
    
    32 32
     import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto;
    
    33
    +import fr.ird.observe.dto.form.Form;
    
    33 34
     import fr.ird.observe.dto.referential.common.SpeciesReference;
    
    34 35
     import fr.ird.observe.dto.referential.ps.common.SpeciesFateReference;
    
    35 36
     import fr.ird.observe.navigation.id.Project;
    
    ... ... @@ -78,10 +79,15 @@ public class SampleUIModelStates extends SampleContentTableUIModelStates<SampleD
    78 79
     
    
    79 80
         @Override
    
    80 81
         public void onAfterInitAddReferentialFilters(ClientConfig clientConfig, Project observeSelectModel, ObserveServicesProvider servicesProvider, ReferencesCache referenceCache) {
    
    81
    -        speciesFateBySpeciesMap = servicesProvider.getPsCommonTripService().getPsObservationCatchesSpeciesFateBySpeciesId(observeSelectModel.getPs().getObservationSet().getId());
    
    82
    -        referenceCache.addReferentialFilter(SampleMeasureDto.PROPERTY_SPECIES, ReferencesFilterHelper.<SampleDto, SpeciesReference>newSubList(e -> speciesFateBySpeciesMap.keySet()));
    
    82
    +        referenceCache.addReferentialFilter(SampleMeasureDto.PROPERTY_SPECIES, ReferencesFilterHelper.<SampleDto, SpeciesReference>newSubList(e -> e.getSpeciesFateBySpeciesMap().keySet()));
    
    83 83
             referenceCache.addReferentialFilter(SampleMeasureDto.PROPERTY_SPECIES_FATE, ReferencesFilterHelper.<SampleDto, SpeciesFateReference>newSubList(
    
    84
    -                e -> speciesFateBySpeciesMap.values().stream().flatMap(Set::stream).collect(Collectors.toSet())));
    
    84
    +                e -> e.getSpeciesFateBySpeciesMap().values().stream().flatMap(Set::stream).collect(Collectors.toSet())));
    
    85
    +    }
    
    86
    +
    
    87
    +    @Override
    
    88
    +    protected void copyFormToBean(Form<SampleDto> form) {
    
    89
    +        this.speciesFateBySpeciesMap = form.getObject().getSpeciesFateBySpeciesMap();
    
    90
    +        super.copyFormToBean(form);
    
    85 91
         }
    
    86 92
     
    
    87 93
         @Override
    

  • client/runner/src/main/assembly/bin.xml
    ... ... @@ -33,7 +33,7 @@
    33 33
           <includes>
    
    34 34
             <include>${applicationJarName}.jar</include>
    
    35 35
     <!--        FIXME - See https://gitlab.com/ultreiaio/ird-observe/-/issues/2454-->
    
    36
    -<!--        <include>${applicationJarName}.exe</include>-->
    
    36
    +        <include>${applicationJarName}.exe</include>
    
    37 37
           </includes>
    
    38 38
         </fileSet>
    
    39 39
     
    

  • core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SampleDto.java
    1
    +package fr.ird.observe.dto.data.ps.observation;
    
    2
    +
    
    3
    +/*-
    
    4
    + * #%L
    
    5
    + * ObServe Core :: API :: Dto
    
    6
    + * %%
    
    7
    + * Copyright (C) 2008 - 2022 IRD, Ultreia.io
    
    8
    + * %%
    
    9
    + * This program is free software: you can redistribute it and/or modify
    
    10
    + * it under the terms of the GNU General Public License as
    
    11
    + * published by the Free Software Foundation, either version 3 of the
    
    12
    + * License, or (at your option) any later version.
    
    13
    + *
    
    14
    + * This program is distributed in the hope that it will be useful,
    
    15
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    16
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    17
    + * GNU General Public License for more details.
    
    18
    + *
    
    19
    + * You should have received a copy of the GNU General Public
    
    20
    + * License along with this program.  If not, see
    
    21
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    22
    + * #L%
    
    23
    + */
    
    24
    +
    
    25
    +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;
    
    26
    +
    
    27
    +import java.util.Map;
    
    28
    +import java.util.Set;
    
    29
    +
    
    30
    +/**
    
    31
    + * Created on 23/11/2022.
    
    32
    + *
    
    33
    + * @author Tony Chemit - dev@tchemit.fr
    
    34
    + * @since 9.0.19
    
    35
    + */
    
    36
    +@GenerateJavaBeanDefinition
    
    37
    +public class SampleDto extends GeneratedSampleDto {
    
    38
    +
    
    39
    +    /**
    
    40
    +     * To get all species fate used per species in Set catches.
    
    41
    +     * <p>
    
    42
    +     * Only used when loading form.
    
    43
    +     */
    
    44
    +    private Map<String, Set<String>> speciesFateBySpeciesMap;
    
    45
    +
    
    46
    +    public Map<String, Set<String>> getSpeciesFateBySpeciesMap() {
    
    47
    +        return speciesFateBySpeciesMap;
    
    48
    +    }
    
    49
    +
    
    50
    +    public void setSpeciesFateBySpeciesMap(Map<String, Set<String>> speciesFateBySpeciesMap) {
    
    51
    +        this.speciesFateBySpeciesMap = speciesFateBySpeciesMap;
    
    52
    +    }
    
    53
    +}

  • core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java
    ... ... @@ -33,9 +33,6 @@ import io.ultreia.java4all.http.spi.Get;
    33 33
     import io.ultreia.java4all.http.spi.Nullable;
    
    34 34
     import io.ultreia.java4all.http.spi.Service;
    
    35 35
     
    
    36
    -import java.util.Map;
    
    37
    -import java.util.Set;
    
    38
    -
    
    39 36
     /**
    
    40 37
      * Created on 26/07/2021.
    
    41 38
      *
    
    ... ... @@ -57,10 +54,6 @@ public interface TripService extends TripAwareService {
    57 54
         @MethodCredential(Permission.READ_DATA)
    
    58 55
         boolean isActivityEndOfSearchFound(String routeId);
    
    59 56
     
    
    60
    -    @Get
    
    61
    -    @MethodCredential(Permission.READ_DATA)
    
    62
    -    Map<String, Set<String>> getPsObservationCatchesSpeciesFateBySpeciesId(String setId);
    
    63
    -
    
    64 57
         @Get
    
    65 58
         @MethodCredential(Permission.WRITE_DATA)
    
    66 59
         Form<fr.ird.observe.dto.data.ps.observation.FloatingObjectDto> preCreateObservationFloatingObject(String activityId, @Nullable FloatingObjectPreset floatingObjectPreset);
    

  • core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json
    ... ... @@ -13225,28 +13225,8 @@
    13225 13225
             "name": "comment",
    
    13226 13226
             "comments": [
    
    13227 13227
               "comment (if not null) is not a blank string",
    
    13228
    -          "comment is required if one of the selected referential requires it (speciesFate)",
    
    13229 13228
               "comment length <= 8192"
    
    13230 13229
             ]
    
    13231
    -      },
    
    13232
    -      {
    
    13233
    -        "name": "speciesFate",
    
    13234
    -        "comments": [
    
    13235
    -          "check if referential speciesFate is disabled (only if validation is strong)"
    
    13236
    -        ]
    
    13237
    -      }
    
    13238
    -    ]
    
    13239
    -  },
    
    13240
    -  {
    
    13241
    -    "type": "fr.ird.observe.dto.data.ps.observation.SampleDto",
    
    13242
    -    "scope": "WARNING",
    
    13243
    -    "context": "create",
    
    13244
    -    "fields": [
    
    13245
    -      {
    
    13246
    -        "name": "speciesFate",
    
    13247
    -        "comments": [
    
    13248
    -          "check if referential speciesFate is disabled (only if validation is not strong)"
    
    13249
    -        ]
    
    13250 13230
           }
    
    13251 13231
         ]
    
    13252 13232
       },
    
    ... ... @@ -13259,28 +13239,8 @@
    13259 13239
             "name": "comment",
    
    13260 13240
             "comments": [
    
    13261 13241
               "comment (if not null) is not a blank string",
    
    13262
    -          "comment is required if one of the selected referential requires it (speciesFate)",
    
    13263 13242
               "comment length <= 8192"
    
    13264 13243
             ]
    
    13265
    -      },
    
    13266
    -      {
    
    13267
    -        "name": "speciesFate",
    
    13268
    -        "comments": [
    
    13269
    -          "check if referential speciesFate is disabled (only if validation is strong)"
    
    13270
    -        ]
    
    13271
    -      }
    
    13272
    -    ]
    
    13273
    -  },
    
    13274
    -  {
    
    13275
    -    "type": "fr.ird.observe.dto.data.ps.observation.SampleDto",
    
    13276
    -    "scope": "WARNING",
    
    13277
    -    "context": "update",
    
    13278
    -    "fields": [
    
    13279
    -      {
    
    13280
    -        "name": "speciesFate",
    
    13281
    -        "comments": [
    
    13282
    -          "check if referential speciesFate is disabled (only if validation is not strong)"
    
    13283
    -        ]
    
    13284 13244
           }
    
    13285 13245
         ]
    
    13286 13246
       },
    

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-error-validation.xml
    ... ... @@ -35,19 +35,6 @@
    35 35
           <param name="maxLength">8192</param>
    
    36 36
           <message/>
    
    37 37
         </field-validator>
    
    38
    -
    
    39
    -    <!-- comment is required if one of the selected referential requires it (speciesFate) -->
    
    40
    -    <field-validator type="commentNeeded">
    
    41
    -      <param name="propertyNames">speciesFate</param>
    
    42
    -      <message/>
    
    43
    -    </field-validator>
    
    44
    -  </field>
    
    45
    -
    
    46
    -  <field name="speciesFate">
    
    47
    -    <!-- check if referential speciesFate is disabled (only if validation is strong) -->
    
    48
    -    <field-validator type="checkDisabledReferentialOnErrorScope">
    
    49
    -      <message/>
    
    50
    -    </field-validator>
    
    51 38
       </field>
    
    52 39
     
    
    53 40
     </validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-create-warning-validation.xml deleted
    1
    -<!--
    
    2
    -  #%L
    
    3
    -  ObServe Core :: API :: Validation
    
    4
    -  %%
    
    5
    -  Copyright (C) 2008 - 2022 IRD, Ultreia.io
    
    6
    -  %%
    
    7
    -  This program is free software: you can redistribute it and/or modify
    
    8
    -  it under the terms of the GNU General Public License as
    
    9
    -  published by the Free Software Foundation, either version 3 of the
    
    10
    -  License, or (at your option) any later version.
    
    11
    -
    
    12
    -  This program is distributed in the hope that it will be useful,
    
    13
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    14
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    15
    -  GNU General Public License for more details.
    
    16
    -
    
    17
    -  You should have received a copy of the GNU General Public
    
    18
    -  License along with this program.  If not, see
    
    19
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20
    -  #L%
    
    21
    -  -->
    
    22
    -<!DOCTYPE validators PUBLIC
    
    23
    -    "-//Apache Struts//XWork Validator 1.0.3//EN"
    
    24
    -    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    
    25
    -<validators>
    
    26
    -
    
    27
    -  <field name="speciesFate">
    
    28
    -    <!-- check if referential speciesFate is disabled (only if validation is not strong) -->
    
    29
    -    <field-validator type="checkDisabledReferentialOnWarningScope">
    
    30
    -      <message/>
    
    31
    -    </field-validator>
    
    32
    -  </field>
    
    33
    -
    
    34
    -</validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-error-validation.xml
    ... ... @@ -35,19 +35,6 @@
    35 35
           <param name="maxLength">8192</param>
    
    36 36
           <message/>
    
    37 37
         </field-validator>
    
    38
    -
    
    39
    -    <!-- comment is required if one of the selected referential requires it (speciesFate) -->
    
    40
    -    <field-validator type="commentNeeded">
    
    41
    -      <param name="propertyNames">speciesFate</param>
    
    42
    -      <message/>
    
    43
    -    </field-validator>
    
    44
    -  </field>
    
    45
    -
    
    46
    -  <field name="speciesFate">
    
    47
    -    <!-- check if referential speciesFate is disabled (only if validation is strong) -->
    
    48
    -    <field-validator type="checkDisabledReferentialOnErrorScope">
    
    49
    -      <message/>
    
    50
    -    </field-validator>
    
    51 38
       </field>
    
    52 39
     
    
    53 40
     </validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SampleDto-update-warning-validation.xml deleted
    1
    -<!--
    
    2
    -  #%L
    
    3
    -  ObServe Core :: API :: Validation
    
    4
    -  %%
    
    5
    -  Copyright (C) 2008 - 2022 IRD, Ultreia.io
    
    6
    -  %%
    
    7
    -  This program is free software: you can redistribute it and/or modify
    
    8
    -  it under the terms of the GNU General Public License as
    
    9
    -  published by the Free Software Foundation, either version 3 of the
    
    10
    -  License, or (at your option) any later version.
    
    11
    -
    
    12
    -  This program is distributed in the hope that it will be useful,
    
    13
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    14
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    15
    -  GNU General Public License for more details.
    
    16
    -
    
    17
    -  You should have received a copy of the GNU General Public
    
    18
    -  License along with this program.  If not, see
    
    19
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20
    -  #L%
    
    21
    -  -->
    
    22
    -<!DOCTYPE validators PUBLIC
    
    23
    -    "-//Apache Struts//XWork Validator 1.0.3//EN"
    
    24
    -    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    
    25
    -<validators>
    
    26
    -
    
    27
    -  <field name="speciesFate">
    
    28
    -    <!-- check if referential speciesFate is disabled (only if validation is not strong) -->
    
    29
    -    <field-validator type="checkDisabledReferentialOnWarningScope">
    
    30
    -      <message/>
    
    31
    -    </field-validator>
    
    32
    -  </field>
    
    33
    -
    
    34
    -</validators>

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java
    ... ... @@ -45,6 +45,7 @@ public class SampleSpi extends GeneratedSampleSpi {
    45 45
             SampleDto dto = form.getObject();
    
    46 46
             // always use the set id, //FIXME See why ?
    
    47 47
             dto.setId(id);
    
    48
    +        dto.setSpeciesFateBySpeciesMap(getCatchesSpeciesFateBySpeciesId(parent));
    
    48 49
             return form;
    
    49 50
         }
    
    50 51
     
    
    ... ... @@ -72,8 +73,16 @@ public class SampleSpi extends GeneratedSampleSpi {
    72 73
                     .build(entity);
    
    73 74
         }
    
    74 75
     
    
    75
    -    public Map<String, java.util.Set<String>> getCatchesSpeciesFateBySpeciesId(ServiceContext context, String id) {
    
    76
    -        Set parent = Set.loadEntity(context, id);
    
    76
    +
    
    77
    +
    
    78
    +    protected Sample loadSampleFormEntity(ServiceContext context, Set parent) {
    
    79
    +        if (parent.isSampleEmpty()) {
    
    80
    +            return Sample.newEntity(context.now());
    
    81
    +        }
    
    82
    +        return parent.getSample().iterator().next();
    
    83
    +    }
    
    84
    +
    
    85
    +    protected Map<String, java.util.Set<String>> getCatchesSpeciesFateBySpeciesId(Set parent) {
    
    77 86
             Map<String, java.util.Set<String>> result = new TreeMap<>();
    
    78 87
             parent.getCatches().stream().filter(c -> c.getSpeciesFate() != null).forEach(aCatch -> {
    
    79 88
                 String speciesId = aCatch.getSpecies().getId();
    
    ... ... @@ -82,11 +91,4 @@ public class SampleSpi extends GeneratedSampleSpi {
    82 91
             });
    
    83 92
             return result;
    
    84 93
         }
    
    85
    -
    
    86
    -    protected Sample loadSampleFormEntity(ServiceContext context, Set parent) {
    
    87
    -        if (parent.isSampleEmpty()) {
    
    88
    -            return Sample.newEntity(context.now());
    
    89
    -        }
    
    90
    -        return parent.getSample().iterator().next();
    
    91
    -    }
    
    92 94
     }

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Sample/validation-create.json
    ... ... @@ -2,16 +2,7 @@
    2 2
       "comment": {
    
    3 3
         "errors": [
    
    4 4
           "comment (if not null) is not a blank string",
    
    5
    -      "comment is required if one of the selected referential requires it (speciesFate)",
    
    6 5
           "comment length <= 8192"
    
    7 6
         ]
    
    8
    -  },
    
    9
    -  "speciesFate": {
    
    10
    -    "errors": [
    
    11
    -      "check if referential speciesFate is disabled (only if validation is strong)"
    
    12
    -    ],
    
    13
    -    "warnings": [
    
    14
    -      "check if referential speciesFate is disabled (only if validation is not strong)"
    
    15
    -    ]
    
    16 7
       }
    
    17 8
     }
    \ No newline at end of file

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Sample/validation-update.json
    ... ... @@ -2,16 +2,7 @@
    2 2
       "comment": {
    
    3 3
         "errors": [
    
    4 4
           "comment (if not null) is not a blank string",
    
    5
    -      "comment is required if one of the selected referential requires it (speciesFate)",
    
    6 5
           "comment length <= 8192"
    
    7 6
         ]
    
    8
    -  },
    
    9
    -  "speciesFate": {
    
    10
    -    "errors": [
    
    11
    -      "check if referential speciesFate is disabled (only if validation is strong)"
    
    12
    -    ],
    
    13
    -    "warnings": [
    
    14
    -      "check if referential speciesFate is disabled (only if validation is not strong)"
    
    15
    -    ]
    
    16 7
       }
    
    17 8
     }
    \ No newline at end of file

  • core/services/local/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocalSupport.java
    ... ... @@ -36,8 +36,6 @@ import fr.ird.observe.services.service.data.ps.common.TripService;
    36 36
     
    
    37 37
     import java.util.Date;
    
    38 38
     import java.util.LinkedHashSet;
    
    39
    -import java.util.Map;
    
    40
    -import java.util.Set;
    
    41 39
     
    
    42 40
     /**
    
    43 41
      * Created on 26/07/2021.
    
    ... ... @@ -82,11 +80,6 @@ public abstract class TripServiceLocalSupport extends ObserveServiceLocal implem
    82 80
             return Trip.SPI.isActivityEndOfSearchFound(this, routeId);
    
    83 81
         }
    
    84 82
     
    
    85
    -    @Override
    
    86
    -    public Map<String, Set<String>> getPsObservationCatchesSpeciesFateBySpeciesId(String setId) {
    
    87
    -        return fr.ird.observe.entities.data.ps.observation.Sample.SPI.getCatchesSpeciesFateBySpeciesId(this, setId);
    
    88
    -    }
    
    89
    -
    
    90 83
         @Override
    
    91 84
         public Form<fr.ird.observe.dto.data.ps.observation.FloatingObjectDto> preCreateObservationFloatingObject(String activityId, FloatingObjectPreset floatingObjectPreset) {
    
    92 85
             return fr.ird.observe.entities.data.ps.observation.FloatingObject.SPI.preCreate(this, floatingObjectPreset);
    

  • core/services/test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java
    ... ... @@ -39,9 +39,7 @@ import fr.ird.observe.services.service.data.EditableServiceFixtures;
    39 39
     import fr.ird.observe.services.service.data.RootOpenableServiceFixtures;
    
    40 40
     import org.junit.Assert;
    
    41 41
     
    
    42
    -import java.util.Map;
    
    43 42
     import java.util.Set;
    
    44
    -import java.util.stream.Collectors;
    
    45 43
     
    
    46 44
     public class TripServiceFixtures extends GeneratedTripServiceFixtures {
    
    47 45
     
    
    ... ... @@ -68,16 +66,6 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures {
    68 66
     //        Assert.assertNull(dto.getLastUpdateDate());
    
    69 67
     //    }
    
    70 68
     
    
    71
    -
    
    72
    -    @Override
    
    73
    -    public void getPsObservationCatchesSpeciesFateBySpeciesId(ObserveServicesProvider servicesProvider, TripService service) {
    
    74
    -        String setId = getProperty("getPsObservationCatchesSpeciesFateBySpeciesId.setId");
    
    75
    -        Map<String, Set<String>> actual = service.getPsObservationCatchesSpeciesFateBySpeciesId(setId);
    
    76
    -        Assert.assertNotNull(actual);
    
    77
    -        Assert.assertEquals(getIntegerProperty("getPsObservationCatchesSpeciesFateBySpeciesId.speciesCount"), actual.size());
    
    78
    -        Assert.assertEquals(getIntegerProperty("getPsObservationCatchesSpeciesFateBySpeciesId.speciesFateCount"), actual.values().stream().flatMap(Set::stream).collect(Collectors.toSet()).size());
    
    79
    -    }
    
    80
    -
    
    81 69
         @Override
    
    82 70
         public void getAllTripIds(ObserveServicesProvider servicesProvider, TripService service) {
    
    83 71
             Set<String> actual = service.getAllTripIds();
    

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ps/common/TripService.properties
    ... ... @@ -25,7 +25,6 @@ defaultNewParentId=${REFERENTIAL_PS_COMMON_PROGRAM_MOVE}
    25 25
     defaultParentId=${REFERENTIAL_PS_COMMON_PROGRAM}
    
    26 26
     defaultProgramId=${REFERENTIAL_PS_COMMON_PROGRAM}
    
    27 27
     defaultRouteId=FIXME
    
    28
    -defaultSetId=${PS_OBSERVATION_SET}
    
    29 28
     defaultSpeciesListId=fr.ird.referential.common.SpeciesList#1239832675370#0.1
    
    30 29
     defaultTripId=${PS_COMMON_TRIP}
    
    31 30
     defaultVesselId=fr.ird.referential.common.Vessel#1239832679425#0.9136908731720471
    
    ... ... @@ -43,9 +42,6 @@ getMatchingTripsVesselWithinDateRange.vesselId=${defaultVesselId}
    43 42
     getParentBrothers.count=16
    
    44 43
     getParentBrothers.parentId=${defaultParentId}
    
    45 44
     getParentBrothers.programId=${defaultProgramId}
    
    46
    -getPsObservationCatchesSpeciesFateBySpeciesId.setId=${defaultSetId}
    
    47
    -getPsObservationCatchesSpeciesFateBySpeciesId.speciesCount=6
    
    48
    -getPsObservationCatchesSpeciesFateBySpeciesId.speciesFateCount=4
    
    49 45
     getSpeciesByListAndTrip.count=14
    
    50 46
     getSpeciesByListAndTrip.speciesListId=${defaultSpeciesListId}
    
    51 47
     getSpeciesByListAndTrip.tripId=${defaultTripId}
    

  • model/src/main/models/Observe/dto/20-data-ps-observation.model
    ... ... @@ -157,7 +157,6 @@ informationSource {*:0..1} referential.ps.observation.InformationSourceReference
    157 157
     
    
    158 158
     data.ps.observation.Sample > data.Container
    
    159 159
     sampleMeasure + {*} data.ps.observation.SampleMeasure
    
    160
    -speciesFate {*:*} referential.ps.common.SpeciesFateReference
    
    161 160
     
    
    162 161
     data.ps.observation.SetCatch > data.Container
    
    163 162
     catches {*} data.ps.observation.Catch
    

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23
       <parent>
    
    24 24
         <groupId>io.ultreia.maven</groupId>
    
    25 25
         <artifactId>pom</artifactId>
    
    26
    -    <version>2022.95</version>
    
    26
    +    <version>2022.97</version>
    
    27 27
       </parent>
    
    28 28
       <groupId>fr.ird.observe</groupId>
    
    29 29
       <artifactId>ird-observe</artifactId>
    
    ... ... @@ -119,7 +119,7 @@
    119 119
         <lib.version.h2>1.4.196</lib.version.h2>
    
    120 120
         <!-- FIXME can't use 1.4.197 (date has changed + blob also)-->
    
    121 121
         <!-- FIXME   <lib.version.h2>2.1.210</lib.version.h2>-->
    
    122
    -    <lib.version.hibernate>5.6.12.Final</lib.version.hibernate>
    
    122
    +    <lib.version.hibernate>5.6.14.Final</lib.version.hibernate>
    
    123 123
         <!-- FIXME    <lib.version.hibernate>6.1.0.Final</lib.version.hibernate>-->
    
    124 124
         <lib.version.jaxb-api>2.4.0-b180830.0359</lib.version.jaxb-api>
    
    125 125
         <lib.version.jaxb-runtime>2.4.0-b180830.0438</lib.version.jaxb-runtime>
    

  • server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm
    ... ... @@ -16,151 +16,150 @@
    16 16
     # Do not remove the next line, it is used to generate the following actions.
    
    17 17
     # →→→ Generated dynamic mapping
    
    18 18
     
    
    19
    -GET    /AnonymousService/applySecurity                                           AnonymousServiceRestApi.applySecurity
    
    20
    -GET    /AnonymousService/checkCanConnect                                         AnonymousServiceRestApi.checkCanConnect
    
    21
    -GET    /AnonymousService/checkCanConnectOrBeEmpty                                AnonymousServiceRestApi.checkCanConnectOrBeEmpty
    
    22
    -POST   /AnonymousService/createEmpty                                             AnonymousServiceRestApi.createEmpty
    
    23
    -POST   /AnonymousService/createFromDump                                          AnonymousServiceRestApi.createFromDump
    
    24
    -POST   /AnonymousService/createFromImport                                        AnonymousServiceRestApi.createFromImport
    
    25
    -GET    /AnonymousService/generateHomeId                                          AnonymousServiceRestApi.generateHomeId
    
    26
    -GET    /AnonymousService/getAvailableDatabaseNames                               AnonymousServiceRestApi.getAvailableDatabaseNames
    
    27
    -GET    /AnonymousService/getModelVersion                                         AnonymousServiceRestApi.getModelVersion
    
    28
    -GET    /AnonymousService/getServerVersion                                        AnonymousServiceRestApi.getServerVersion
    
    29
    -GET    /AnonymousService/getUsers                                                AnonymousServiceRestApi.getUsers
    
    30
    -GET    /AnonymousService/migrateData                                             AnonymousServiceRestApi.migrateData
    
    31
    -GET    /AnonymousService/open                                                    AnonymousServiceRestApi.open
    
    32
    -GET    /DataSourceService/backup                                                 DataSourceServiceRestApi.backup
    
    33
    -GET    /DataSourceService/close                                                  DataSourceServiceRestApi.close
    
    34
    -POST   /DataSourceService/executeSqlScript                                       DataSourceServiceRestApi.executeSqlScript
    
    35
    -GET    /DataSourceService/getLastUpdateDate                                      DataSourceServiceRestApi.getLastUpdateDate
    
    36
    -GET    /DataSourceService/isIdValid                                              DataSourceServiceRestApi.isIdValid
    
    37
    -POST   /DataSourceService/produceAddSqlScript                                    DataSourceServiceRestApi.produceAddSqlScript
    
    38
    -POST   /DataSourceService/produceCreateSqlScript                                 DataSourceServiceRestApi.produceCreateSqlScript
    
    39
    -POST   /DataSourceService/produceDeleteSqlScript                                 DataSourceServiceRestApi.produceDeleteSqlScript
    
    40
    -POST   /DataSourceService/produceMoveSqlScript                                   DataSourceServiceRestApi.produceMoveSqlScript
    
    41
    -POST   /DataSourceService/retainExistingIds                                      DataSourceServiceRestApi.retainExistingIds
    
    42
    -GET    /NavigationService/getGroupByDtoSet                                       NavigationServiceRestApi.getGroupByDtoSet
    
    43
    -GET    /NavigationService/getNavigation                                          NavigationServiceRestApi.getNavigation
    
    44
    -GET    /NavigationService/loadNavigationPath                                     NavigationServiceRestApi.loadNavigationPath
    
    45
    -GET    /NavigationService/loadNavigationRoot                                     NavigationServiceRestApi.loadNavigationRoot
    
    46
    -GET    /NavigationService/loadSelectionRoot                                      NavigationServiceRestApi.loadSelectionRoot
    
    47
    -GET    /ReferenceService/createData                                              ReferenceServiceRestApi.createData
    
    48
    -GET    /ReferenceService/createReferential                                       ReferenceServiceRestApi.createReferential
    
    49
    -GET    /ReferenceService/loadData                                                ReferenceServiceRestApi.loadData
    
    50
    -GET    /ReferenceService/loadReferential                                         ReferenceServiceRestApi.loadReferential
    
    51
    -POST   /ReportService/executeReport                                              ReportServiceRestApi.executeReport
    
    52
    -POST   /ReportService/populateVariables                                          ReportServiceRestApi.populateVariables
    
    53
    -GET    /UsageService/countMandatoryData                                          UsageServiceRestApi.countMandatoryData
    
    54
    -GET    /UsageService/countOptionalData                                           UsageServiceRestApi.countOptionalData
    
    55
    -GET    /UsageService/countReferential                                            UsageServiceRestApi.countReferential
    
    56
    -POST   /UsageService/findMandatoryData                                           UsageServiceRestApi.findMandatoryData
    
    57
    -POST   /UsageService/findOptionalData                                            UsageServiceRestApi.findOptionalData
    
    58
    -POST   /UsageService/findReferential                                             UsageServiceRestApi.findReferential
    
    59
    -POST   /ValidateService/validateData                                             ValidateServiceRestApi.validateData
    
    60
    -POST   /ValidateService/validateReferential                                      ValidateServiceRestApi.validateReferential
    
    61
    -POST   /api/DataEntityService/create                                             api.DataEntityServiceRestApi.create
    
    62
    -DELETE /api/DataEntityService/delete                                             api.DataEntityServiceRestApi.delete
    
    63
    -GET    /api/DataEntityService/generateId                                         api.DataEntityServiceRestApi.generateId
    
    64
    -GET    /api/DataEntityService/getOne                                             api.DataEntityServiceRestApi.getOne
    
    65
    -GET    /api/DataEntityService/getSome                                            api.DataEntityServiceRestApi.getSome
    
    66
    -POST   /api/DataEntityService/update                                             api.DataEntityServiceRestApi.update
    
    67
    -POST   /api/ReferentialEntityService/create                                      api.ReferentialEntityServiceRestApi.create
    
    68
    -DELETE /api/ReferentialEntityService/delete                                      api.ReferentialEntityServiceRestApi.delete
    
    69
    -GET    /api/ReferentialEntityService/generateId                                  api.ReferentialEntityServiceRestApi.generateId
    
    70
    -GET    /api/ReferentialEntityService/getAll                                      api.ReferentialEntityServiceRestApi.getAll
    
    71
    -GET    /api/ReferentialEntityService/getByModule                                 api.ReferentialEntityServiceRestApi.getByModule
    
    72
    -GET    /api/ReferentialEntityService/getByPackage                                api.ReferentialEntityServiceRestApi.getByPackage
    
    73
    -GET    /api/ReferentialEntityService/getOne                                      api.ReferentialEntityServiceRestApi.getOne
    
    74
    -GET    /api/ReferentialEntityService/getSome                                     api.ReferentialEntityServiceRestApi.getSome
    
    75
    -PUT    /api/ReferentialEntityService/update                                      api.ReferentialEntityServiceRestApi.update
    
    76
    -GET    /api/SqlService/select                                                    api.SqlServiceRestApi.select
    
    77
    -GET    /data/ContainerService/loadForm                                           data.ContainerServiceRestApi.loadForm
    
    78
    -POST   /data/ContainerService/save                                               data.ContainerServiceRestApi.save
    
    79
    -GET    /data/DataFileService/getDataFile                                         data.DataFileServiceRestApi.getDataFile
    
    80
    -POST   /data/DataManagementService/deleteData                                    data.DataManagementServiceRestApi.deleteData
    
    81
    -POST   /data/DataManagementService/exportData                                    data.DataManagementServiceRestApi.exportData
    
    82
    -POST   /data/DataManagementService/importData                                    data.DataManagementServiceRestApi.importData
    
    83
    -DELETE /data/EditableService/delete                                              data.EditableServiceRestApi.delete
    
    84
    -GET    /data/EditableService/exists                                              data.EditableServiceRestApi.exists
    
    85
    -GET    /data/EditableService/loadDto                                             data.EditableServiceRestApi.loadDto
    
    86
    -GET    /data/EditableService/loadForm                                            data.EditableServiceRestApi.loadForm
    
    87
    -GET    /data/EditableService/preCreate                                           data.EditableServiceRestApi.preCreate
    
    88
    -POST   /data/EditableService/save                                                data.EditableServiceRestApi.save
    
    89
    -DELETE /data/OpenableService/delete                                              data.OpenableServiceRestApi.delete
    
    90
    -GET    /data/OpenableService/exists                                              data.OpenableServiceRestApi.exists
    
    91
    -GET    /data/OpenableService/getBrothers                                         data.OpenableServiceRestApi.getBrothers
    
    92
    -GET    /data/OpenableService/getBrothersFromParent                               data.OpenableServiceRestApi.getBrothersFromParent
    
    93
    -GET    /data/OpenableService/getChildren                                         data.OpenableServiceRestApi.getChildren
    
    94
    -GET    /data/OpenableService/getChildrenUpdate                                   data.OpenableServiceRestApi.getChildrenUpdate
    
    95
    -POST   /data/OpenableService/getMandatoryDependencies                            data.OpenableServiceRestApi.getMandatoryDependencies
    
    96
    -POST   /data/OpenableService/getMandatoryDependenciesCount                       data.OpenableServiceRestApi.getMandatoryDependenciesCount
    
    97
    -POST   /data/OpenableService/getOptionalDependencies                             data.OpenableServiceRestApi.getOptionalDependencies
    
    98
    -POST   /data/OpenableService/getOptionalDependenciesCount                        data.OpenableServiceRestApi.getOptionalDependenciesCount
    
    99
    -GET    /data/OpenableService/loadDto                                             data.OpenableServiceRestApi.loadDto
    
    100
    -GET    /data/OpenableService/loadForm                                            data.OpenableServiceRestApi.loadForm
    
    101
    -POST   /data/OpenableService/move                                                data.OpenableServiceRestApi.move
    
    102
    -GET    /data/OpenableService/preCreate                                           data.OpenableServiceRestApi.preCreate
    
    103
    -POST   /data/OpenableService/save                                                data.OpenableServiceRestApi.save
    
    104
    -POST   /data/RootOpenableService/computeMissingReferential                       data.RootOpenableServiceRestApi.computeMissingReferential
    
    105
    -DELETE /data/RootOpenableService/delete                                          data.RootOpenableServiceRestApi.delete
    
    106
    -DELETE /data/RootOpenableService/deleteLayout                                    data.RootOpenableServiceRestApi.deleteLayout
    
    107
    -GET    /data/RootOpenableService/exists                                          data.RootOpenableServiceRestApi.exists
    
    108
    -GET    /data/RootOpenableService/getBrothers                                     data.RootOpenableServiceRestApi.getBrothers
    
    109
    -GET    /data/RootOpenableService/getChildren                                     data.RootOpenableServiceRestApi.getChildren
    
    110
    -GET    /data/RootOpenableService/getChildrenUpdate                               data.RootOpenableServiceRestApi.getChildrenUpdate
    
    111
    -GET    /data/RootOpenableService/getGroupByDtoValue                              data.RootOpenableServiceRestApi.getGroupByDtoValue
    
    112
    -GET    /data/RootOpenableService/getGroupByValue                                 data.RootOpenableServiceRestApi.getGroupByValue
    
    113
    -GET    /data/RootOpenableService/loadDto                                         data.RootOpenableServiceRestApi.loadDto
    
    114
    -GET    /data/RootOpenableService/loadForm                                        data.RootOpenableServiceRestApi.loadForm
    
    115
    -POST   /data/RootOpenableService/moveLayout                                      data.RootOpenableServiceRestApi.moveLayout
    
    116
    -GET    /data/RootOpenableService/preCreate                                       data.RootOpenableServiceRestApi.preCreate
    
    117
    -POST   /data/RootOpenableService/save                                            data.RootOpenableServiceRestApi.save
    
    118
    -GET    /data/SimpleService/loadForm                                              data.SimpleServiceRestApi.loadForm
    
    119
    -POST   /data/SimpleService/save                                                  data.SimpleServiceRestApi.save
    
    120
    -POST   /data/ll/ActivityPairingService/applyPairing                              data.ll.ActivityPairingServiceRestApi.applyPairing
    
    121
    -POST   /data/ll/ActivityPairingService/computePairing                            data.ll.ActivityPairingServiceRestApi.computePairing
    
    122
    -GET    /data/ll/common/TripService/getAllTripIds                                 data.ll.common.TripServiceRestApi.getAllTripIds
    
    123
    -GET    /data/ll/common/TripService/getLogbookCatchSpeciesIds                     data.ll.common.TripServiceRestApi.getLogbookCatchSpeciesIds
    
    124
    -GET    /data/ll/common/TripService/getMatchingTripsVesselWithinDateRange         data.ll.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange
    
    125
    -GET    /data/ll/common/TripService/getSampleActivityParentCandidate              data.ll.common.TripServiceRestApi.getSampleActivityParentCandidate
    
    126
    -GET    /data/ll/common/TripService/getSpeciesByListAndTrip                       data.ll.common.TripServiceRestApi.getSpeciesByListAndTrip
    
    127
    -GET    /data/ll/common/TripService/getTripMap                                    data.ll.common.TripServiceRestApi.getTripMap
    
    128
    -GET    /data/ll/common/TripService/loadBranchlineForm                            data.ll.common.TripServiceRestApi.loadBranchlineForm
    
    129
    -POST   /data/ll/common/TripService/moveActivitySample                            data.ll.common.TripServiceRestApi.moveActivitySample
    
    130
    -POST   /data/ll/common/TripService/saveAndCopyProperties                         data.ll.common.TripServiceRestApi.saveAndCopyProperties
    
    131
    -POST   /data/ll/common/TripService/saveBranchline                                data.ll.common.TripServiceRestApi.saveBranchline
    
    132
    -POST   /data/ps/ActivityPairingService/applyPairing                              data.ps.ActivityPairingServiceRestApi.applyPairing
    
    133
    -POST   /data/ps/ActivityPairingService/computePairing                            data.ps.ActivityPairingServiceRestApi.computePairing
    
    134
    -GET    /data/ps/AvdthService/importData                                          data.ps.AvdthServiceRestApi.importData
    
    135
    -POST   /data/ps/ConsolidateDataService/consolidateLocalmarketBatch               data.ps.ConsolidateDataServiceRestApi.consolidateLocalmarketBatch
    
    136
    -POST   /data/ps/ConsolidateDataService/consolidateTrip                           data.ps.ConsolidateDataServiceRestApi.consolidateTrip
    
    137
    -GET    /data/ps/ConsolidateDataService/newSimplifiedObjectTypeManager            data.ps.ConsolidateDataServiceRestApi.newSimplifiedObjectTypeManager
    
    138
    -GET    /data/ps/common/TripService/getAllTripIds                                 data.ps.common.TripServiceRestApi.getAllTripIds
    
    139
    -GET    /data/ps/common/TripService/getMatchingTripsVesselWithinDateRange         data.ps.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange
    
    140
    -GET    /data/ps/common/TripService/getPsObservationCatchesSpeciesFateBySpeciesId data.ps.common.TripServiceRestApi.getPsObservationCatchesSpeciesFateBySpeciesId
    
    141
    -GET    /data/ps/common/TripService/getSpeciesByListAndTrip                       data.ps.common.TripServiceRestApi.getSpeciesByListAndTrip
    
    142
    -GET    /data/ps/common/TripService/getTripMap                                    data.ps.common.TripServiceRestApi.getTripMap
    
    143
    -GET    /data/ps/common/TripService/isActivityEndOfSearchFound                    data.ps.common.TripServiceRestApi.isActivityEndOfSearchFound
    
    144
    -GET    /data/ps/common/TripService/loadLocalmarketForm                           data.ps.common.TripServiceRestApi.loadLocalmarketForm
    
    145
    -GET    /data/ps/common/TripService/loadLogbookForm                               data.ps.common.TripServiceRestApi.loadLogbookForm
    
    146
    -GET    /data/ps/common/TripService/preCreateLogbookFloatingObject                data.ps.common.TripServiceRestApi.preCreateLogbookFloatingObject
    
    147
    -GET    /data/ps/common/TripService/preCreateObservationFloatingObject            data.ps.common.TripServiceRestApi.preCreateObservationFloatingObject
    
    148
    -POST   /referential/ReferentialService/changeId                                  referential.ReferentialServiceRestApi.changeId
    
    149
    -DELETE /referential/ReferentialService/delete                                    referential.ReferentialServiceRestApi.delete
    
    150
    -GET    /referential/ReferentialService/exists                                    referential.ReferentialServiceRestApi.exists
    
    151
    -GET    /referential/ReferentialService/getEnabledReferentialLabelSet             referential.ReferentialServiceRestApi.getEnabledReferentialLabelSet
    
    152
    -GET    /referential/ReferentialService/getReferenceSet                           referential.ReferentialServiceRestApi.getReferenceSet
    
    153
    -POST   /referential/ReferentialService/getReferentialIds                         referential.ReferentialServiceRestApi.getReferentialIds
    
    154
    -GET    /referential/ReferentialService/getReferentialReferenceSets               referential.ReferentialServiceRestApi.getReferentialReferenceSets
    
    155
    -POST   /referential/ReferentialService/insertMissingReferential                  referential.ReferentialServiceRestApi.insertMissingReferential
    
    156
    -GET    /referential/ReferentialService/loadDto                                   referential.ReferentialServiceRestApi.loadDto
    
    157
    -POST   /referential/ReferentialService/loadDtoList                               referential.ReferentialServiceRestApi.loadDtoList
    
    158
    -GET    /referential/ReferentialService/loadForm                                  referential.ReferentialServiceRestApi.loadForm
    
    159
    -GET    /referential/ReferentialService/loadIds                                   referential.ReferentialServiceRestApi.loadIds
    
    160
    -GET    /referential/ReferentialService/preCreate                                 referential.ReferentialServiceRestApi.preCreate
    
    161
    -POST   /referential/ReferentialService/replaceReference                          referential.ReferentialServiceRestApi.replaceReference
    
    162
    -POST   /referential/ReferentialService/save                                      referential.ReferentialServiceRestApi.save
    
    163
    -POST   /referential/SynchronizeService/applySql                                  referential.SynchronizeServiceRestApi.applySql
    
    164
    -POST   /referential/SynchronizeService/filterIdsUsed                             referential.SynchronizeServiceRestApi.filterIdsUsed
    
    165
    -POST   /referential/SynchronizeService/getReferentialToDelete                    referential.SynchronizeServiceRestApi.getReferentialToDelete
    
    166
    -POST   /referential/SynchronizeService/produceSqlResult                          referential.SynchronizeServiceRestApi.produceSqlResult
    19
    +GET    /AnonymousService/applySecurity                                   AnonymousServiceRestApi.applySecurity
    
    20
    +GET    /AnonymousService/checkCanConnect                                 AnonymousServiceRestApi.checkCanConnect
    
    21
    +GET    /AnonymousService/checkCanConnectOrBeEmpty                        AnonymousServiceRestApi.checkCanConnectOrBeEmpty
    
    22
    +POST   /AnonymousService/createEmpty                                     AnonymousServiceRestApi.createEmpty
    
    23
    +POST   /AnonymousService/createFromDump                                  AnonymousServiceRestApi.createFromDump
    
    24
    +POST   /AnonymousService/createFromImport                                AnonymousServiceRestApi.createFromImport
    
    25
    +GET    /AnonymousService/generateHomeId                                  AnonymousServiceRestApi.generateHomeId
    
    26
    +GET    /AnonymousService/getAvailableDatabaseNames                       AnonymousServiceRestApi.getAvailableDatabaseNames
    
    27
    +GET    /AnonymousService/getModelVersion                                 AnonymousServiceRestApi.getModelVersion
    
    28
    +GET    /AnonymousService/getServerVersion                                AnonymousServiceRestApi.getServerVersion
    
    29
    +GET    /AnonymousService/getUsers                                        AnonymousServiceRestApi.getUsers
    
    30
    +GET    /AnonymousService/migrateData                                     AnonymousServiceRestApi.migrateData
    
    31
    +GET    /AnonymousService/open                                            AnonymousServiceRestApi.open
    
    32
    +GET    /DataSourceService/backup                                         DataSourceServiceRestApi.backup
    
    33
    +GET    /DataSourceService/close                                          DataSourceServiceRestApi.close
    
    34
    +POST   /DataSourceService/executeSqlScript                               DataSourceServiceRestApi.executeSqlScript
    
    35
    +GET    /DataSourceService/getLastUpdateDate                              DataSourceServiceRestApi.getLastUpdateDate
    
    36
    +GET    /DataSourceService/isIdValid                                      DataSourceServiceRestApi.isIdValid
    
    37
    +POST   /DataSourceService/produceAddSqlScript                            DataSourceServiceRestApi.produceAddSqlScript
    
    38
    +POST   /DataSourceService/produceCreateSqlScript                         DataSourceServiceRestApi.produceCreateSqlScript
    
    39
    +POST   /DataSourceService/produceDeleteSqlScript                         DataSourceServiceRestApi.produceDeleteSqlScript
    
    40
    +POST   /DataSourceService/produceMoveSqlScript                           DataSourceServiceRestApi.produceMoveSqlScript
    
    41
    +POST   /DataSourceService/retainExistingIds                              DataSourceServiceRestApi.retainExistingIds
    
    42
    +GET    /NavigationService/getGroupByDtoSet                               NavigationServiceRestApi.getGroupByDtoSet
    
    43
    +GET    /NavigationService/getNavigation                                  NavigationServiceRestApi.getNavigation
    
    44
    +GET    /NavigationService/loadNavigationPath                             NavigationServiceRestApi.loadNavigationPath
    
    45
    +GET    /NavigationService/loadNavigationRoot                             NavigationServiceRestApi.loadNavigationRoot
    
    46
    +GET    /NavigationService/loadSelectionRoot                              NavigationServiceRestApi.loadSelectionRoot
    
    47
    +GET    /ReferenceService/createData                                      ReferenceServiceRestApi.createData
    
    48
    +GET    /ReferenceService/createReferential                               ReferenceServiceRestApi.createReferential
    
    49
    +GET    /ReferenceService/loadData                                        ReferenceServiceRestApi.loadData
    
    50
    +GET    /ReferenceService/loadReferential                                 ReferenceServiceRestApi.loadReferential
    
    51
    +POST   /ReportService/executeReport                                      ReportServiceRestApi.executeReport
    
    52
    +POST   /ReportService/populateVariables                                  ReportServiceRestApi.populateVariables
    
    53
    +GET    /UsageService/countMandatoryData                                  UsageServiceRestApi.countMandatoryData
    
    54
    +GET    /UsageService/countOptionalData                                   UsageServiceRestApi.countOptionalData
    
    55
    +GET    /UsageService/countReferential                                    UsageServiceRestApi.countReferential
    
    56
    +POST   /UsageService/findMandatoryData                                   UsageServiceRestApi.findMandatoryData
    
    57
    +POST   /UsageService/findOptionalData                                    UsageServiceRestApi.findOptionalData
    
    58
    +POST   /UsageService/findReferential                                     UsageServiceRestApi.findReferential
    
    59
    +POST   /ValidateService/validateData                                     ValidateServiceRestApi.validateData
    
    60
    +POST   /ValidateService/validateReferential                              ValidateServiceRestApi.validateReferential
    
    61
    +POST   /api/DataEntityService/create                                     api.DataEntityServiceRestApi.create
    
    62
    +DELETE /api/DataEntityService/delete                                     api.DataEntityServiceRestApi.delete
    
    63
    +GET    /api/DataEntityService/generateId                                 api.DataEntityServiceRestApi.generateId
    
    64
    +GET    /api/DataEntityService/getOne                                     api.DataEntityServiceRestApi.getOne
    
    65
    +GET    /api/DataEntityService/getSome                                    api.DataEntityServiceRestApi.getSome
    
    66
    +POST   /api/DataEntityService/update                                     api.DataEntityServiceRestApi.update
    
    67
    +POST   /api/ReferentialEntityService/create                              api.ReferentialEntityServiceRestApi.create
    
    68
    +DELETE /api/ReferentialEntityService/delete                              api.ReferentialEntityServiceRestApi.delete
    
    69
    +GET    /api/ReferentialEntityService/generateId                          api.ReferentialEntityServiceRestApi.generateId
    
    70
    +GET    /api/ReferentialEntityService/getAll                              api.ReferentialEntityServiceRestApi.getAll
    
    71
    +GET    /api/ReferentialEntityService/getByModule                         api.ReferentialEntityServiceRestApi.getByModule
    
    72
    +GET    /api/ReferentialEntityService/getByPackage                        api.ReferentialEntityServiceRestApi.getByPackage
    
    73
    +GET    /api/ReferentialEntityService/getOne                              api.ReferentialEntityServiceRestApi.getOne
    
    74
    +GET    /api/ReferentialEntityService/getSome                             api.ReferentialEntityServiceRestApi.getSome
    
    75
    +PUT    /api/ReferentialEntityService/update                              api.ReferentialEntityServiceRestApi.update
    
    76
    +GET    /api/SqlService/select                                            api.SqlServiceRestApi.select
    
    77
    +GET    /data/ContainerService/loadForm                                   data.ContainerServiceRestApi.loadForm
    
    78
    +POST   /data/ContainerService/save                                       data.ContainerServiceRestApi.save
    
    79
    +GET    /data/DataFileService/getDataFile                                 data.DataFileServiceRestApi.getDataFile
    
    80
    +POST   /data/DataManagementService/deleteData                            data.DataManagementServiceRestApi.deleteData
    
    81
    +POST   /data/DataManagementService/exportData                            data.DataManagementServiceRestApi.exportData
    
    82
    +POST   /data/DataManagementService/importData                            data.DataManagementServiceRestApi.importData
    
    83
    +DELETE /data/EditableService/delete                                      data.EditableServiceRestApi.delete
    
    84
    +GET    /data/EditableService/exists                                      data.EditableServiceRestApi.exists
    
    85
    +GET    /data/EditableService/loadDto                                     data.EditableServiceRestApi.loadDto
    
    86
    +GET    /data/EditableService/loadForm                                    data.EditableServiceRestApi.loadForm
    
    87
    +GET    /data/EditableService/preCreate                                   data.EditableServiceRestApi.preCreate
    
    88
    +POST   /data/EditableService/save                                        data.EditableServiceRestApi.save
    
    89
    +DELETE /data/OpenableService/delete                                      data.OpenableServiceRestApi.delete
    
    90
    +GET    /data/OpenableService/exists                                      data.OpenableServiceRestApi.exists
    
    91
    +GET    /data/OpenableService/getBrothers                                 data.OpenableServiceRestApi.getBrothers
    
    92
    +GET    /data/OpenableService/getBrothersFromParent                       data.OpenableServiceRestApi.getBrothersFromParent
    
    93
    +GET    /data/OpenableService/getChildren                                 data.OpenableServiceRestApi.getChildren
    
    94
    +GET    /data/OpenableService/getChildrenUpdate                           data.OpenableServiceRestApi.getChildrenUpdate
    
    95
    +POST   /data/OpenableService/getMandatoryDependencies                    data.OpenableServiceRestApi.getMandatoryDependencies
    
    96
    +POST   /data/OpenableService/getMandatoryDependenciesCount               data.OpenableServiceRestApi.getMandatoryDependenciesCount
    
    97
    +POST   /data/OpenableService/getOptionalDependencies                     data.OpenableServiceRestApi.getOptionalDependencies
    
    98
    +POST   /data/OpenableService/getOptionalDependenciesCount                data.OpenableServiceRestApi.getOptionalDependenciesCount
    
    99
    +GET    /data/OpenableService/loadDto                                     data.OpenableServiceRestApi.loadDto
    
    100
    +GET    /data/OpenableService/loadForm                                    data.OpenableServiceRestApi.loadForm
    
    101
    +POST   /data/OpenableService/move                                        data.OpenableServiceRestApi.move
    
    102
    +GET    /data/OpenableService/preCreate                                   data.OpenableServiceRestApi.preCreate
    
    103
    +POST   /data/OpenableService/save                                        data.OpenableServiceRestApi.save
    
    104
    +POST   /data/RootOpenableService/computeMissingReferential               data.RootOpenableServiceRestApi.computeMissingReferential
    
    105
    +DELETE /data/RootOpenableService/delete                                  data.RootOpenableServiceRestApi.delete
    
    106
    +DELETE /data/RootOpenableService/deleteLayout                            data.RootOpenableServiceRestApi.deleteLayout
    
    107
    +GET    /data/RootOpenableService/exists                                  data.RootOpenableServiceRestApi.exists
    
    108
    +GET    /data/RootOpenableService/getBrothers                             data.RootOpenableServiceRestApi.getBrothers
    
    109
    +GET    /data/RootOpenableService/getChildren                             data.RootOpenableServiceRestApi.getChildren
    
    110
    +GET    /data/RootOpenableService/getChildrenUpdate                       data.RootOpenableServiceRestApi.getChildrenUpdate
    
    111
    +GET    /data/RootOpenableService/getGroupByDtoValue                      data.RootOpenableServiceRestApi.getGroupByDtoValue
    
    112
    +GET    /data/RootOpenableService/getGroupByValue                         data.RootOpenableServiceRestApi.getGroupByValue
    
    113
    +GET    /data/RootOpenableService/loadDto                                 data.RootOpenableServiceRestApi.loadDto
    
    114
    +GET    /data/RootOpenableService/loadForm                                data.RootOpenableServiceRestApi.loadForm
    
    115
    +POST   /data/RootOpenableService/moveLayout                              data.RootOpenableServiceRestApi.moveLayout
    
    116
    +GET    /data/RootOpenableService/preCreate                               data.RootOpenableServiceRestApi.preCreate
    
    117
    +POST   /data/RootOpenableService/save                                    data.RootOpenableServiceRestApi.save
    
    118
    +GET    /data/SimpleService/loadForm                                      data.SimpleServiceRestApi.loadForm
    
    119
    +POST   /data/SimpleService/save                                          data.SimpleServiceRestApi.save
    
    120
    +POST   /data/ll/ActivityPairingService/applyPairing                      data.ll.ActivityPairingServiceRestApi.applyPairing
    
    121
    +POST   /data/ll/ActivityPairingService/computePairing                    data.ll.ActivityPairingServiceRestApi.computePairing
    
    122
    +GET    /data/ll/common/TripService/getAllTripIds                         data.ll.common.TripServiceRestApi.getAllTripIds
    
    123
    +GET    /data/ll/common/TripService/getLogbookCatchSpeciesIds             data.ll.common.TripServiceRestApi.getLogbookCatchSpeciesIds
    
    124
    +GET    /data/ll/common/TripService/getMatchingTripsVesselWithinDateRange data.ll.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange
    
    125
    +GET    /data/ll/common/TripService/getSampleActivityParentCandidate      data.ll.common.TripServiceRestApi.getSampleActivityParentCandidate
    
    126
    +GET    /data/ll/common/TripService/getSpeciesByListAndTrip               data.ll.common.TripServiceRestApi.getSpeciesByListAndTrip
    
    127
    +GET    /data/ll/common/TripService/getTripMap                            data.ll.common.TripServiceRestApi.getTripMap
    
    128
    +GET    /data/ll/common/TripService/loadBranchlineForm                    data.ll.common.TripServiceRestApi.loadBranchlineForm
    
    129
    +POST   /data/ll/common/TripService/moveActivitySample                    data.ll.common.TripServiceRestApi.moveActivitySample
    
    130
    +POST   /data/ll/common/TripService/saveAndCopyProperties                 data.ll.common.TripServiceRestApi.saveAndCopyProperties
    
    131
    +POST   /data/ll/common/TripService/saveBranchline                        data.ll.common.TripServiceRestApi.saveBranchline
    
    132
    +POST   /data/ps/ActivityPairingService/applyPairing                      data.ps.ActivityPairingServiceRestApi.applyPairing
    
    133
    +POST   /data/ps/ActivityPairingService/computePairing                    data.ps.ActivityPairingServiceRestApi.computePairing
    
    134
    +GET    /data/ps/AvdthService/importData                                  data.ps.AvdthServiceRestApi.importData
    
    135
    +POST   /data/ps/ConsolidateDataService/consolidateLocalmarketBatch       data.ps.ConsolidateDataServiceRestApi.consolidateLocalmarketBatch
    
    136
    +POST   /data/ps/ConsolidateDataService/consolidateTrip                   data.ps.ConsolidateDataServiceRestApi.consolidateTrip
    
    137
    +GET    /data/ps/ConsolidateDataService/newSimplifiedObjectTypeManager    data.ps.ConsolidateDataServiceRestApi.newSimplifiedObjectTypeManager
    
    138
    +GET    /data/ps/common/TripService/getAllTripIds                         data.ps.common.TripServiceRestApi.getAllTripIds
    
    139
    +GET    /data/ps/common/TripService/getMatchingTripsVesselWithinDateRange data.ps.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange
    
    140
    +GET    /data/ps/common/TripService/getSpeciesByListAndTrip               data.ps.common.TripServiceRestApi.getSpeciesByListAndTrip
    
    141
    +GET    /data/ps/common/TripService/getTripMap                            data.ps.common.TripServiceRestApi.getTripMap
    
    142
    +GET    /data/ps/common/TripService/isActivityEndOfSearchFound            data.ps.common.TripServiceRestApi.isActivityEndOfSearchFound
    
    143
    +GET    /data/ps/common/TripService/loadLocalmarketForm                   data.ps.common.TripServiceRestApi.loadLocalmarketForm
    
    144
    +GET    /data/ps/common/TripService/loadLogbookForm                       data.ps.common.TripServiceRestApi.loadLogbookForm
    
    145
    +GET    /data/ps/common/TripService/preCreateLogbookFloatingObject        data.ps.common.TripServiceRestApi.preCreateLogbookFloatingObject
    
    146
    +GET    /data/ps/common/TripService/preCreateObservationFloatingObject    data.ps.common.TripServiceRestApi.preCreateObservationFloatingObject
    
    147
    +POST   /referential/ReferentialService/changeId                          referential.ReferentialServiceRestApi.changeId
    
    148
    +DELETE /referential/ReferentialService/delete                            referential.ReferentialServiceRestApi.delete
    
    149
    +GET    /referential/ReferentialService/exists                            referential.ReferentialServiceRestApi.exists
    
    150
    +GET    /referential/ReferentialService/getEnabledReferentialLabelSet     referential.ReferentialServiceRestApi.getEnabledReferentialLabelSet
    
    151
    +GET    /referential/ReferentialService/getReferenceSet                   referential.ReferentialServiceRestApi.getReferenceSet
    
    152
    +POST   /referential/ReferentialService/getReferentialIds                 referential.ReferentialServiceRestApi.getReferentialIds
    
    153
    +GET    /referential/ReferentialService/getReferentialReferenceSets       referential.ReferentialServiceRestApi.getReferentialReferenceSets
    
    154
    +POST   /referential/ReferentialService/insertMissingReferential          referential.ReferentialServiceRestApi.insertMissingReferential
    
    155
    +GET    /referential/ReferentialService/loadDto                           referential.ReferentialServiceRestApi.loadDto
    
    156
    +POST   /referential/ReferentialService/loadDtoList                       referential.ReferentialServiceRestApi.loadDtoList
    
    157
    +GET    /referential/ReferentialService/loadForm                          referential.ReferentialServiceRestApi.loadForm
    
    158
    +GET    /referential/ReferentialService/loadIds                           referential.ReferentialServiceRestApi.loadIds
    
    159
    +GET    /referential/ReferentialService/preCreate                         referential.ReferentialServiceRestApi.preCreate
    
    160
    +POST   /referential/ReferentialService/replaceReference                  referential.ReferentialServiceRestApi.replaceReference
    
    161
    +POST   /referential/ReferentialService/save                              referential.ReferentialServiceRestApi.save
    
    162
    +POST   /referential/SynchronizeService/applySql                          referential.SynchronizeServiceRestApi.applySql
    
    163
    +POST   /referential/SynchronizeService/filterIdsUsed                     referential.SynchronizeServiceRestApi.filterIdsUsed
    
    164
    +POST   /referential/SynchronizeService/getReferentialToDelete            referential.SynchronizeServiceRestApi.getReferentialToDelete
    
    165
    +POST   /referential/SynchronizeService/produceSqlResult                  referential.SynchronizeServiceRestApi.produceSqlResult