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

Commits:

23 changed files:

Changes:

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java
    ... ... @@ -25,13 +25,11 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage;
    25 25 
     import fr.ird.observe.client.WithClientUIContext;
    26 26 
     import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUII18nHelper;
    27 27 
     import fr.ird.observe.dto.IdDto;
    28 
    -import fr.ird.observe.dto.data.DataDto;
    29 28 
     import fr.ird.observe.dto.decoration.DecoratorService;
    30 29 
     import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
    31 30 
     import fr.ird.observe.dto.reference.DataDtoReference;
    32 31 
     import fr.ird.observe.dto.reference.DtoReference;
    33 32 
     import fr.ird.observe.dto.reference.ReferentialDtoReference;
    34 
    -import fr.ird.observe.dto.referential.ReferentialDto;
    35 33 
     import fr.ird.observe.spi.map.ImmutableTypedMap;
    36 34 
     import fr.ird.observe.spi.module.BusinessProjectMapping;
    37 35 
     import fr.ird.observe.spi.module.ObserveBusinessProject;
    ... ... @@ -194,11 +192,11 @@ public abstract class UsageUIHandlerSupport<R extends ReferentialDtoReference, U
    194 192 
                 ButtonGroup buttonGroup = new ButtonGroup();
    195 193
    196 194 
                 ImmutableTypedMap<Long> usages = usagesGetter.getCount();
    197 
    -            @SuppressWarnings({"unchecked", "rawtypes"}) Collection<Class<? extends DtoReference>> types = (Collection) usages.types();
    198 
    -            for (Class<? extends ReferentialDtoReference> dtoType : ReferentialDto.filterReferentialReference(types)) {
    195 
    +            @SuppressWarnings({"unchecked", "rawtypes"}) Collection<Class<?>> types = (Collection) usages.types();
    196 
    +            for (Class<? extends ReferentialDtoReference> dtoType : ReferentialDtoReference.filterReferentialReference(types)) {
    199 197 
                     buildUsagePanel(buttonGroup, dtoType, usagesGetter);
    200 198 
                 }
    201 
    -            for (Class<? extends DataDtoReference> dtoType : DataDto.filterDataReference(types)) {
    199 
    +            for (Class<? extends DataDtoReference> dtoType : DataDtoReference.filterDataReference(types)) {
    202 200 
                     buildUsagePanel(buttonGroup, dtoType, usagesGetter);
    203 201 
                 }
    204 202 
                 JToggleButton component = (JToggleButton) getUsages().getUsagesCount().getComponent(0);

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIModelStates.java
    ... ... @@ -67,7 +67,7 @@ public class ActivityUIModelStates extends GeneratedActivityUIModelStates {
    67 67 
                 }
    68 68 
                 updateActivityObsCandidates();
    69 69 
             });
    70 
    -        pairingEngine = new ActivityPairingEngine(model.getClientUIContext().getClientConfig().getReferentialLocale(), getReferenceCache().getDataSource().getLlCommonTripService(), getReferenceCache().getDataSource().getLlLogbookActivityService());
    70 
    +        pairingEngine = new ActivityPairingEngine(model.getClientUIContext().getClientConfig().getReferentialLocale(), getReferenceCache().getDataSource().getReferenceService(), getReferenceCache().getDataSource().getLlLogbookActivityService());
    71 71 
         }
    72 72
    73 73 
         @Override

  • pom.xml
    ... ... @@ -149,7 +149,7 @@
    149 149 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    150 150 
         <buildDate>${maven.build.timestamp}</buildDate>
    151 151
    152 
    -    <toolkit.version>5.0.4</toolkit.version>
    152 
    +    <toolkit.version>5.0.5-SNAPSHOT</toolkit.version>
    153 153
    154 154 
         <lib.version.ognl>3.1.28</lib.version.ognl>
    155 155 
         <!--can't use 1.4.197 (date has changed + blob also)-->

  • server/core/src/main/filtered-resources/mapping
    ... ... @@ -110,7 +110,6 @@ GET /api/v1/data/ll/common/TripService/getSpeciesByListAndTrip
    110 110 
     GET    /api/v1/data/ll/common/TripService/getTripMap                                                                                 v1.data.ll.common.TripServiceRestApi.getTripMap
    111 111 
     GET    /api/v1/data/ll/common/TripService/loadDto                                                                                    v1.data.ll.common.TripServiceRestApi.loadDto
    112 112 
     GET    /api/v1/data/ll/common/TripService/loadForm                                                                                   v1.data.ll.common.TripServiceRestApi.loadForm
    113 
    -GET    /api/v1/data/ll/common/TripService/loadReferenceToRead                                                                        v1.data.ll.common.TripServiceRestApi.loadReferenceToRead
    114 113 
     POST   /api/v1/data/ll/common/TripService/move                                                                                       v1.data.ll.common.TripServiceRestApi.move
    115 114 
     GET    /api/v1/data/ll/common/TripService/preCreate                                                                                  v1.data.ll.common.TripServiceRestApi.preCreate
    116 115 
     POST   /api/v1/data/ll/common/TripService/save                                                                                       v1.data.ll.common.TripServiceRestApi.save
    ... ... @@ -121,7 +120,6 @@ GET /api/v1/data/ll/landing/LandingService/getChildren
    121 120 
     GET    /api/v1/data/ll/landing/LandingService/getChildrenUpdate                                                                      v1.data.ll.landing.LandingServiceRestApi.getChildrenUpdate
    122 121 
     GET    /api/v1/data/ll/landing/LandingService/loadDto                                                                                v1.data.ll.landing.LandingServiceRestApi.loadDto
    123 122 
     GET    /api/v1/data/ll/landing/LandingService/loadForm                                                                               v1.data.ll.landing.LandingServiceRestApi.loadForm
    124 
    -GET    /api/v1/data/ll/landing/LandingService/loadReferenceToRead                                                                    v1.data.ll.landing.LandingServiceRestApi.loadReferenceToRead
    125 123 
     POST   /api/v1/data/ll/landing/LandingService/move                                                                                   v1.data.ll.landing.LandingServiceRestApi.move
    126 124 
     GET    /api/v1/data/ll/landing/LandingService/preCreate                                                                              v1.data.ll.landing.LandingServiceRestApi.preCreate
    127 125 
     POST   /api/v1/data/ll/landing/LandingService/save                                                                                   v1.data.ll.landing.LandingServiceRestApi.save
    ... ... @@ -130,7 +128,6 @@ GET /api/v1/data/ll/logbook/ActivitySampleService/exists
    130 128 
     GET    /api/v1/data/ll/logbook/ActivitySampleService/getParents                                                                      v1.data.ll.logbook.ActivitySampleServiceRestApi.getParents
    131 129 
     GET    /api/v1/data/ll/logbook/ActivitySampleService/loadDto                                                                         v1.data.ll.logbook.ActivitySampleServiceRestApi.loadDto
    132 130 
     GET    /api/v1/data/ll/logbook/ActivitySampleService/loadForm                                                                        v1.data.ll.logbook.ActivitySampleServiceRestApi.loadForm
    133 
    -GET    /api/v1/data/ll/logbook/ActivitySampleService/loadReferenceToRead                                                             v1.data.ll.logbook.ActivitySampleServiceRestApi.loadReferenceToRead
    134 131 
     POST   /api/v1/data/ll/logbook/ActivitySampleService/move                                                                            v1.data.ll.logbook.ActivitySampleServiceRestApi.move
    135 132 
     GET    /api/v1/data/ll/logbook/ActivitySampleService/preCreate                                                                       v1.data.ll.logbook.ActivitySampleServiceRestApi.preCreate
    136 133 
     POST   /api/v1/data/ll/logbook/ActivitySampleService/save                                                                            v1.data.ll.logbook.ActivitySampleServiceRestApi.save
    ... ... @@ -141,7 +138,6 @@ GET /api/v1/data/ll/logbook/ActivityService/getChildren
    141 138 
     GET    /api/v1/data/ll/logbook/ActivityService/getChildrenUpdate                                                                     v1.data.ll.logbook.ActivityServiceRestApi.getChildrenUpdate
    142 139 
     GET    /api/v1/data/ll/logbook/ActivityService/loadDto                                                                               v1.data.ll.logbook.ActivityServiceRestApi.loadDto
    143 140 
     GET    /api/v1/data/ll/logbook/ActivityService/loadForm                                                                              v1.data.ll.logbook.ActivityServiceRestApi.loadForm
    144 
    -GET    /api/v1/data/ll/logbook/ActivityService/loadReferenceToRead                                                                   v1.data.ll.logbook.ActivityServiceRestApi.loadReferenceToRead
    145 141 
     POST   /api/v1/data/ll/logbook/ActivityService/move                                                                                  v1.data.ll.logbook.ActivityServiceRestApi.move
    146 142 
     GET    /api/v1/data/ll/logbook/ActivityService/preCreate                                                                             v1.data.ll.logbook.ActivityServiceRestApi.preCreate
    147 143 
     POST   /api/v1/data/ll/logbook/ActivityService/save                                                                                  v1.data.ll.logbook.ActivityServiceRestApi.save
    ... ... @@ -152,7 +148,6 @@ GET /api/v1/data/ll/logbook/SampleService/getChildren
    152 148 
     GET    /api/v1/data/ll/logbook/SampleService/getChildrenUpdate                                                                       v1.data.ll.logbook.SampleServiceRestApi.getChildrenUpdate
    153 149 
     GET    /api/v1/data/ll/logbook/SampleService/loadDto                                                                                 v1.data.ll.logbook.SampleServiceRestApi.loadDto
    154 150 
     GET    /api/v1/data/ll/logbook/SampleService/loadForm                                                                                v1.data.ll.logbook.SampleServiceRestApi.loadForm
    155 
    -GET    /api/v1/data/ll/logbook/SampleService/loadReferenceToRead                                                                     v1.data.ll.logbook.SampleServiceRestApi.loadReferenceToRead
    156 151 
     POST   /api/v1/data/ll/logbook/SampleService/move                                                                                    v1.data.ll.logbook.SampleServiceRestApi.move
    157 152 
     GET    /api/v1/data/ll/logbook/SampleService/preCreate                                                                               v1.data.ll.logbook.SampleServiceRestApi.preCreate
    158 153 
     POST   /api/v1/data/ll/logbook/SampleService/save                                                                                    v1.data.ll.logbook.SampleServiceRestApi.save
    ... ... @@ -164,7 +159,6 @@ DELETE /api/v1/data/ll/logbook/SetService/delete
    164 159 
     GET    /api/v1/data/ll/logbook/SetService/exists                                                                                     v1.data.ll.logbook.SetServiceRestApi.exists
    165 160 
     GET    /api/v1/data/ll/logbook/SetService/loadDto                                                                                    v1.data.ll.logbook.SetServiceRestApi.loadDto
    166 161 
     GET    /api/v1/data/ll/logbook/SetService/loadForm                                                                                   v1.data.ll.logbook.SetServiceRestApi.loadForm
    167 
    -GET    /api/v1/data/ll/logbook/SetService/loadReferenceToRead                                                                        v1.data.ll.logbook.SetServiceRestApi.loadReferenceToRead
    168 162 
     GET    /api/v1/data/ll/logbook/SetService/preCreate                                                                                  v1.data.ll.logbook.SetServiceRestApi.preCreate
    169 163 
     POST   /api/v1/data/ll/logbook/SetService/save                                                                                       v1.data.ll.logbook.SetServiceRestApi.save
    170 164 
     POST   /api/v1/data/ll/logbook/SetService/saveAndCopyProperties                                                                      v1.data.ll.logbook.SetServiceRestApi.saveAndCopyProperties
    ... ... @@ -179,7 +173,6 @@ GET /api/v1/data/ll/observation/ActivityService/getChildren
    179 173 
     GET    /api/v1/data/ll/observation/ActivityService/getChildrenUpdate                                                                 v1.data.ll.observation.ActivityServiceRestApi.getChildrenUpdate
    180 174 
     GET    /api/v1/data/ll/observation/ActivityService/loadDto                                                                           v1.data.ll.observation.ActivityServiceRestApi.loadDto
    181 175 
     GET    /api/v1/data/ll/observation/ActivityService/loadForm                                                                          v1.data.ll.observation.ActivityServiceRestApi.loadForm
    182 
    -GET    /api/v1/data/ll/observation/ActivityService/loadReferenceToRead                                                               v1.data.ll.observation.ActivityServiceRestApi.loadReferenceToRead
    183 176 
     POST   /api/v1/data/ll/observation/ActivityService/move                                                                              v1.data.ll.observation.ActivityServiceRestApi.move
    184 177 
     GET    /api/v1/data/ll/observation/ActivityService/preCreate                                                                         v1.data.ll.observation.ActivityServiceRestApi.preCreate
    185 178 
     POST   /api/v1/data/ll/observation/ActivityService/save                                                                              v1.data.ll.observation.ActivityServiceRestApi.save
    ... ... @@ -195,7 +188,6 @@ DELETE /api/v1/data/ll/observation/SetService/delete
    195 188 
     GET    /api/v1/data/ll/observation/SetService/exists                                                                                 v1.data.ll.observation.SetServiceRestApi.exists
    196 189 
     GET    /api/v1/data/ll/observation/SetService/loadDto                                                                                v1.data.ll.observation.SetServiceRestApi.loadDto
    197 190 
     GET    /api/v1/data/ll/observation/SetService/loadForm                                                                               v1.data.ll.observation.SetServiceRestApi.loadForm
    198 
    -GET    /api/v1/data/ll/observation/SetService/loadReferenceToRead                                                                    v1.data.ll.observation.SetServiceRestApi.loadReferenceToRead
    199 191 
     GET    /api/v1/data/ll/observation/SetService/preCreate                                                                              v1.data.ll.observation.SetServiceRestApi.preCreate
    200 192 
     POST   /api/v1/data/ll/observation/SetService/save                                                                                   v1.data.ll.observation.SetServiceRestApi.save
    201 193 
     GET    /api/v1/data/ll/observation/SetTdrService/loadForm                                                                            v1.data.ll.observation.SetTdrServiceRestApi.loadForm
    ... ... @@ -217,7 +209,6 @@ GET /api/v1/data/ps/common/TripService/getSpeciesByListAndTrip
    217 209 
     GET    /api/v1/data/ps/common/TripService/getTripMap                                                                                 v1.data.ps.common.TripServiceRestApi.getTripMap
    218 210 
     GET    /api/v1/data/ps/common/TripService/loadDto                                                                                    v1.data.ps.common.TripServiceRestApi.loadDto
    219 211 
     GET    /api/v1/data/ps/common/TripService/loadForm                                                                                   v1.data.ps.common.TripServiceRestApi.loadForm
    220 
    -GET    /api/v1/data/ps/common/TripService/loadReferenceToRead                                                                        v1.data.ps.common.TripServiceRestApi.loadReferenceToRead
    221 212 
     POST   /api/v1/data/ps/common/TripService/move                                                                                       v1.data.ps.common.TripServiceRestApi.move
    222 213 
     GET    /api/v1/data/ps/common/TripService/preCreate                                                                                  v1.data.ps.common.TripServiceRestApi.preCreate
    223 214 
     POST   /api/v1/data/ps/common/TripService/save                                                                                       v1.data.ps.common.TripServiceRestApi.save
    ... ... @@ -228,7 +219,6 @@ GET /api/v1/data/ps/observation/ActivityService/getChildren
    228 219 
     GET    /api/v1/data/ps/observation/ActivityService/getChildrenUpdate                                                                 v1.data.ps.observation.ActivityServiceRestApi.getChildrenUpdate
    229 220 
     GET    /api/v1/data/ps/observation/ActivityService/loadDto                                                                           v1.data.ps.observation.ActivityServiceRestApi.loadDto
    230 221 
     GET    /api/v1/data/ps/observation/ActivityService/loadForm                                                                          v1.data.ps.observation.ActivityServiceRestApi.loadForm
    231 
    -GET    /api/v1/data/ps/observation/ActivityService/loadReferenceToRead                                                               v1.data.ps.observation.ActivityServiceRestApi.loadReferenceToRead
    232 222 
     POST   /api/v1/data/ps/observation/ActivityService/move                                                                              v1.data.ps.observation.ActivityServiceRestApi.move
    233 223 
     GET    /api/v1/data/ps/observation/ActivityService/preCreate                                                                         v1.data.ps.observation.ActivityServiceRestApi.preCreate
    234 224 
     POST   /api/v1/data/ps/observation/ActivityService/save                                                                              v1.data.ps.observation.ActivityServiceRestApi.save
    ... ... @@ -244,7 +234,6 @@ GET /api/v1/data/ps/observation/FloatingObjectService/getChildren
    244 234 
     GET    /api/v1/data/ps/observation/FloatingObjectService/getObjectMaterialHierarchy                                                  v1.data.ps.observation.FloatingObjectServiceRestApi.getObjectMaterialHierarchy
    245 235 
     GET    /api/v1/data/ps/observation/FloatingObjectService/loadDto                                                                     v1.data.ps.observation.FloatingObjectServiceRestApi.loadDto
    246 236 
     GET    /api/v1/data/ps/observation/FloatingObjectService/loadForm                                                                    v1.data.ps.observation.FloatingObjectServiceRestApi.loadForm
    247 
    -GET    /api/v1/data/ps/observation/FloatingObjectService/loadReferenceToRead                                                         v1.data.ps.observation.FloatingObjectServiceRestApi.loadReferenceToRead
    248 237 
     GET    /api/v1/data/ps/observation/FloatingObjectService/preCreate                                                                   v1.data.ps.observation.FloatingObjectServiceRestApi.preCreate
    249 238 
     GET    /api/v1/data/ps/observation/FloatingObjectService/preCreate2                                                                  v1.data.ps.observation.FloatingObjectServiceRestApi.preCreate2
    250 239 
     POST   /api/v1/data/ps/observation/FloatingObjectService/save                                                                        v1.data.ps.observation.FloatingObjectServiceRestApi.save
    ... ... @@ -260,7 +249,6 @@ GET /api/v1/data/ps/observation/RouteService/getChildrenUpdate
    260 249 
     GET    /api/v1/data/ps/observation/RouteService/isActivityEndOfSearchFound                                                           v1.data.ps.observation.RouteServiceRestApi.isActivityEndOfSearchFound
    261 250 
     GET    /api/v1/data/ps/observation/RouteService/loadDto                                                                              v1.data.ps.observation.RouteServiceRestApi.loadDto
    262 251 
     GET    /api/v1/data/ps/observation/RouteService/loadForm                                                                             v1.data.ps.observation.RouteServiceRestApi.loadForm
    263 
    -GET    /api/v1/data/ps/observation/RouteService/loadReferenceToRead                                                                  v1.data.ps.observation.RouteServiceRestApi.loadReferenceToRead
    264 252 
     POST   /api/v1/data/ps/observation/RouteService/move                                                                                 v1.data.ps.observation.RouteServiceRestApi.move
    265 253 
     GET    /api/v1/data/ps/observation/RouteService/preCreate                                                                            v1.data.ps.observation.RouteServiceRestApi.preCreate
    266 254 
     POST   /api/v1/data/ps/observation/RouteService/save                                                                                 v1.data.ps.observation.RouteServiceRestApi.save
    ... ... @@ -278,7 +266,6 @@ DELETE /api/v1/data/ps/observation/SetService/delete
    278 266 
     GET    /api/v1/data/ps/observation/SetService/exists                                                                                 v1.data.ps.observation.SetServiceRestApi.exists
    279 267 
     GET    /api/v1/data/ps/observation/SetService/loadDto                                                                                v1.data.ps.observation.SetServiceRestApi.loadDto
    280 268 
     GET    /api/v1/data/ps/observation/SetService/loadForm                                                                               v1.data.ps.observation.SetServiceRestApi.loadForm
    281 
    -GET    /api/v1/data/ps/observation/SetService/loadReferenceToRead                                                                    v1.data.ps.observation.SetServiceRestApi.loadReferenceToRead
    282 269 
     GET    /api/v1/data/ps/observation/SetService/preCreate                                                                              v1.data.ps.observation.SetServiceRestApi.preCreate
    283 270 
     POST   /api/v1/data/ps/observation/SetService/save                                                                                   v1.data.ps.observation.SetServiceRestApi.save
    284 271 
     POST   /api/v1/referential/ReferentialService/changeId                                                                               v1.referential.ReferentialServiceRestApi.changeId

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/EditableDataServiceFixtures.java
    ... ... @@ -112,14 +112,6 @@ public class EditableDataServiceFixtures {
    112 112 
             return dto;
    113 113 
         }
    114 114
    115 
    -    public static <D extends EditableDto, R extends DataDtoReference, S extends EditableDataService<D, R>> R loadReferenceToRead(ObserveServiceFixtures<S> fixtures, S service) {
    116 
    -        String id = fixtures.getProperty("loadReferenceToRead.id");
    117 
    -        R reference = service.loadReferenceToRead(id);
    118 
    -        Assert.assertNotNull(reference);
    119 
    -        Assert.assertEquals(id, reference.getId());
    120 
    -        return reference;
    121 
    -    }
    122 
    -
    123 115 
         public static <D extends EditableDto, R extends DataDtoReference, S extends EditableDataService<D, R>> void exists(ObserveServiceFixtures<S> fixtures, S service) {
    124 116 
             String id = fixtures.getProperty("exists.id");
    125 117 
             Assert.assertTrue(service.exists(id));

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/OpenableDataServiceFixtures.java
    ... ... @@ -138,14 +138,6 @@ public class OpenableDataServiceFixtures {
    138 138 
             return dto;
    139 139 
         }
    140 140
    141 
    -    public static <D extends OpenableDto, R extends DataDtoReference, S extends OpenableDataService<D, R>> R loadReferenceToRead(ObserveServiceFixtures<S> fixtures, S service) {
    142 
    -        String id = fixtures.getProperty("loadReferenceToRead.id");
    143 
    -        R reference = service.loadReferenceToRead(id);
    144 
    -        Assert.assertNotNull(reference);
    145 
    -        Assert.assertEquals(id, reference.getId());
    146 
    -        return reference;
    147 
    -    }
    148 
    -
    149 141 
         public static <D extends OpenableDto, R extends DataDtoReference, S extends OpenableDataService<D, R>> void exists(ObserveServiceFixtures<S> fixtures, S service) {
    150 142 
             String id = fixtures.getProperty("exists.id");
    151 143 
             Assert.assertTrue(service.exists(id));

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/common/TripServiceFixtures.java
    ... ... @@ -29,6 +29,7 @@ import fr.ird.observe.dto.data.TripMapDto;
    29 29 
     import fr.ird.observe.dto.data.ll.common.TripReference;
    30 30 
     import fr.ird.observe.dto.reference.DataDtoReferenceSet;
    31 31 
     import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
    32 
    +import fr.ird.observe.dto.referential.ReferentialLocale;
    32 33 
     import fr.ird.observe.dto.referential.common.ProgramReference;
    33 34 
     import fr.ird.observe.dto.referential.common.SpeciesReference;
    34 35 
     import fr.ird.observe.services.service.data.OpenableDataServiceFixtures;
    ... ... @@ -72,11 +73,6 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures {
    72 73 
             OpenableDataServiceFixtures.loadForm(this, service);
    73 74 
         }
    74 75
    75 
    -    @Override
    76 
    -    public void loadReferenceToRead(TripService service) {
    77 
    -        OpenableDataServiceFixtures.loadReferenceToRead(this, service);
    78 
    -    }
    79 
    -
    80 76 
         @Override
    81 77 
         public void move(TripService service) {
    82 78 
             OpenableDataServiceFixtures.move(this, service);
    ... ... @@ -109,7 +105,7 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures {
    109 105
    110 106 
         @Override
    111 107 
         public void getMatchingTripsVesselWithinDateRange(TripService service) {
    112 
    -        TripReference reference = OpenableDataServiceFixtures.loadReferenceToRead(this, service);
    108 
    +        TripReference reference = OpenableDataServiceFixtures.loadDto(this, service).toReference(ReferentialLocale.FR);
    113 109 
             String tripId = getProperty("getMatchingTripsVesselWithinDateRange.tripId");
    114 110 
             String vesselId = getProperty("getMatchingTripsVesselWithinDateRange.vesselId");
    115 111 
             ImmutableSet<TripReference> actual = service.getMatchingTripsVesselWithinDateRange(tripId, vesselId, reference.getStartDate(), reference.getEndDate());

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/landing/LandingServiceFixtures.java
    ... ... @@ -62,11 +62,6 @@ public class LandingServiceFixtures extends GeneratedLandingServiceFixtures {
    62 62 
             OpenableDataServiceFixtures.loadForm(this, service);
    63 63 
         }
    64 64
    65 
    -    @Override
    66 
    -    public void loadReferenceToRead(LandingService service) {
    67 
    -        OpenableDataServiceFixtures.loadReferenceToRead(this, service);
    68 
    -    }
    69 
    -
    70 65 
         @Override
    71 66 
         public void move(LandingService service) {
    72 67 
             OpenableDataServiceFixtures.move(this, service);

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivitySampleServiceFixtures.java
    ... ... @@ -51,11 +51,6 @@ public class ActivitySampleServiceFixtures extends GeneratedActivitySampleServic
    51 51 
             EditableDataServiceFixtures.loadForm(this, service);
    52 52 
         }
    53 53
    54 
    -    @Override
    55 
    -    public void loadReferenceToRead(ActivitySampleService service) {
    56 
    -        EditableDataServiceFixtures.loadReferenceToRead(this, service);
    57 
    -    }
    58 
    -
    59 54 
         @Override
    60 55 
         public void preCreate(ActivitySampleService service) {
    61 56 
             EditableDataServiceFixtures.preCreate(this, service);

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivityServiceFixtures.java
    ... ... @@ -62,11 +62,6 @@ public class ActivityServiceFixtures extends GeneratedActivityServiceFixtures {
    62 62 
             OpenableDataServiceFixtures.loadForm(this, service);
    63 63 
         }
    64 64
    65 
    -    @Override
    66 
    -    public void loadReferenceToRead(ActivityService service) {
    67 
    -        OpenableDataServiceFixtures.loadReferenceToRead(this, service);
    68 
    -    }
    69 
    -
    70 65 
         @Override
    71 66 
         public void move(ActivityService service) {
    72 67 
             OpenableDataServiceFixtures.move(this, service);

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SampleServiceFixtures.java
    ... ... @@ -62,11 +62,6 @@ public class SampleServiceFixtures extends GeneratedSampleServiceFixtures {
    62 62 
             OpenableDataServiceFixtures.loadForm(this, service);
    63 63 
         }
    64 64
    65 
    -    @Override
    66 
    -    public void loadReferenceToRead(SampleService service) {
    67 
    -        OpenableDataServiceFixtures.loadReferenceToRead(this, service);
    68 
    -    }
    69 
    -
    70 65 
         @Override
    71 66 
         public void move(SampleService service) {
    72 67 
             OpenableDataServiceFixtures.move(this, service);

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SetServiceFixtures.java
    ... ... @@ -51,11 +51,6 @@ public class SetServiceFixtures extends GeneratedSetServiceFixtures {
    51 51 
             EditableDataServiceFixtures.loadForm(this, service);
    52 52 
         }
    53 53
    54 
    -    @Override
    55 
    -    public void loadReferenceToRead(SetService service) {
    56 
    -        EditableDataServiceFixtures.loadReferenceToRead(this, service);
    57 
    -    }
    58 
    -
    59 54 
         @Override
    60 55 
         public void preCreate(SetService service) {
    61 56 
             EditableDataServiceFixtures.preCreate(this, service);

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/ActivityServiceFixtures.java
    ... ... @@ -62,11 +62,6 @@ public class ActivityServiceFixtures extends GeneratedActivityServiceFixtures {
    62 62 
             OpenableDataServiceFixtures.loadForm(this, service);
    63 63 
         }
    64 64
    65 
    -    @Override
    66 
    -    public void loadReferenceToRead(ActivityService service) {
    67 
    -        OpenableDataServiceFixtures.loadReferenceToRead(this, service);
    68 
    -    }
    69 
    -
    70 65 
         @Override
    71 66 
         public void move(ActivityService service) {
    72 67 
             OpenableDataServiceFixtures.move(this, service);

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetServiceFixtures.java
    ... ... @@ -47,11 +47,6 @@ public class SetServiceFixtures extends GeneratedSetServiceFixtures {
    47 47 
             EditableDataServiceFixtures.loadForm(this, service);
    48 48 
         }
    49 49
    50 
    -    @Override
    51 
    -    public void loadReferenceToRead(SetService service) {
    52 
    -        EditableDataServiceFixtures.loadReferenceToRead(this, service);
    53 
    -    }
    54 
    -
    55 50 
         @Override
    56 51 
         public void preCreate(SetService service) {
    57 52 
             EditableDataServiceFixtures.preCreate(this, service);

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java
    ... ... @@ -31,6 +31,7 @@ import fr.ird.observe.dto.data.ps.common.TripReference;
    31 31 
     import fr.ird.observe.dto.form.Form;
    32 32 
     import fr.ird.observe.dto.reference.DataDtoReferenceSet;
    33 33 
     import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
    34 
    +import fr.ird.observe.dto.referential.ReferentialLocale;
    34 35 
     import fr.ird.observe.dto.referential.common.ProgramReference;
    35 36 
     import fr.ird.observe.dto.referential.common.SpeciesReference;
    36 37 
     import fr.ird.observe.services.service.ObserveServiceFixtures;
    ... ... @@ -75,11 +76,6 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures {
    75 76 
             OpenableDataServiceFixtures.loadForm(this, service);
    76 77 
         }
    77 78
    78 
    -    @Override
    79 
    -    public void loadReferenceToRead(TripService service) {
    80 
    -        OpenableDataServiceFixtures.loadReferenceToRead(this, service);
    81 
    -    }
    82 
    -
    83 79 
         @Override
    84 80 
         public void move(TripService service) {
    85 81 
             OpenableDataServiceFixtures.move(this, service);
    ... ... @@ -129,7 +125,7 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures {
    129 125
    130 126 
         @Override
    131 127 
         public void getMatchingTripsVesselWithinDateRange(TripService service) {
    132 
    -        TripReference reference = OpenableDataServiceFixtures.loadReferenceToRead(this, service);
    128 
    +        TripReference reference = OpenableDataServiceFixtures.loadDto(this, service).toReference(ReferentialLocale.FR);
    133 129 
             String tripId = getProperty("getMatchingTripsVesselWithinDateRange.tripId");
    134 130 
             String vesselId = getProperty("getMatchingTripsVesselWithinDateRange.vesselId");
    135 131 
             ImmutableSet<TripReference> actual = service.getMatchingTripsVesselWithinDateRange(tripId, vesselId, reference.getStartDate(), reference.getEndDate());

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/ActivityServiceFixtures.java
    ... ... @@ -62,11 +62,6 @@ public class ActivityServiceFixtures extends GeneratedActivityServiceFixtures {
    62 62 
             OpenableDataServiceFixtures.loadForm(this, service);
    63 63 
         }
    64 64
    65 
    -    @Override
    66 
    -    public void loadReferenceToRead(ActivityService service) {
    67 
    -        OpenableDataServiceFixtures.loadReferenceToRead(this, service);
    68 
    -    }
    69 
    -
    70 65 
         @Override
    71 66 
         public void move(ActivityService service) {
    72 67 
             OpenableDataServiceFixtures.move(this, service);

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/FloatingObjectServiceFixtures.java
    ... ... @@ -97,9 +97,4 @@ public class FloatingObjectServiceFixtures extends GeneratedFloatingObjectServic
    97 97 
         public void loadForm(FloatingObjectService service) {
    98 98 
             EditableDataServiceFixtures.loadForm(this, service);
    99 99 
         }
    100 
    -
    101 
    -    @Override
    102 
    -    public void loadReferenceToRead(FloatingObjectService service) {
    103 
    -        EditableDataServiceFixtures.loadReferenceToRead(this, service);
    104 
    -    }
    105 
    -}
    100 
    +}
    \ No newline at end of file

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/RouteServiceFixtures.java
    ... ... @@ -72,11 +72,6 @@ public class RouteServiceFixtures extends GeneratedRouteServiceFixtures {
    72 72 
             Assert.assertEquals(14, dto.getActivitySize());
    73 73 
         }
    74 74
    75 
    -    @Override
    76 
    -    public void loadReferenceToRead(RouteService service) {
    77 
    -        OpenableDataServiceFixtures.loadReferenceToRead(this, service);
    78 
    -    }
    79 
    -
    80 75 
         @Override
    81 76 
         public void move(RouteService service) {
    82 77 
             OpenableDataServiceFixtures.move(this, service);

  • services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/SetServiceFixtures.java
    ... ... @@ -24,7 +24,6 @@ package fr.ird.observe.services.service.data.ps.observation;
    24 24
    25 25
    26 26 
     import fr.ird.observe.dto.data.ps.observation.SetDto;
    27 
    -import fr.ird.observe.dto.data.ps.observation.SetReference;
    28 27 
     import fr.ird.observe.dto.form.Form;
    29 28 
     import fr.ird.observe.services.service.data.EditableDataServiceFixtures;
    30 29 
     import org.junit.Assert;
    ... ... @@ -73,15 +72,4 @@ public class SetServiceFixtures extends GeneratedSetServiceFixtures {
    73 72 
                         //FIXME:Test
    74 73 
                     });
    75 74 
         }
    76 
    -
    77 
    -    @Override
    78 
    -    public void loadReferenceToRead(SetService service) {
    79 
    -        SetReference reference = EditableDataServiceFixtures.loadReferenceToRead(this, service);
    80 
    -        Assert.assertNotNull(reference);
    81 
    -        Assert.assertTrue(reference.isKeptTargetSampleEnabled());
    82 
    -        Assert.assertTrue(reference.isDiscardedTargetSampleEnabled());
    83 
    -        Assert.assertTrue(reference.isNonTargetSampleEnabled());
    84 
    -        Assert.assertTrue(reference.isSetNonTargetCatchReleaseEnabled());
    85 
    -    }
    86 
    -
    87 75 
     }

  • services/api/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityPairingEngine.java
    ... ... @@ -32,7 +32,7 @@ import fr.ird.observe.dto.data.ll.pairing.ActivityPairingResultItem;
    32 32 
     import fr.ird.observe.dto.data.ll.pairing.TripPairingContext;
    33 33 
     import fr.ird.observe.dto.data.ll.pairing.TripPairingResult;
    34 34 
     import fr.ird.observe.dto.referential.ReferentialLocale;
    35 
    -import fr.ird.observe.services.service.data.ll.common.TripService;
    35 
    +import fr.ird.observe.services.service.ReferenceService;
    36 36 
     import fr.ird.observe.services.service.data.ll.logbook.ActivityService;
    37 37
    38 38 
     import java.util.ArrayList;
    ... ... @@ -48,12 +48,12 @@ import java.util.Set;
    48 48 
     public class ActivityPairingEngine {
    49 49
    50 50 
         private final ReferentialLocale referentialLocale;
    51 
    -    private final TripService tripService;
    51 
    +    private final ReferenceService referenceService;
    52 52 
         private final ActivityService activitService;
    53 53
    54 
    -    public ActivityPairingEngine(ReferentialLocale referentialLocale, TripService tripService, ActivityService activitService) {
    54 
    +    public ActivityPairingEngine(ReferentialLocale referentialLocale, ReferenceService referenceService, ActivityService activitService) {
    55 55 
             this.referentialLocale = referentialLocale;
    56 
    -        this.tripService = tripService;
    56 
    +        this.referenceService = referenceService;
    57 57 
             this.activitService = activitService;
    58 58 
         }
    59 59
    ... ... @@ -68,7 +68,7 @@ public class ActivityPairingEngine {
    68 68 
                 ActivityPairingResult activityPairingResult = computeForActivityLogbook(context, activityLogbook);
    69 69 
                 resultBuilder.add(activityPairingResult);
    70 70 
             }
    71 
    -        TripReference reference = tripService.loadReferenceToRead(context.getTripId());
    71 
    +        TripReference reference = referenceService.loadData(TripReference.class, context.getTripId());
    72 72 
             return new TripPairingResult(reference, resultBuilder.build());
    73 73 
         }
    74 74

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/EditableDataServiceLocalSupport.java
    ... ... @@ -70,12 +70,6 @@ public abstract class EditableDataServiceLocalSupport<PE extends Entity, D exten
    70 70 
             return loadEntityToDto(id);
    71 71 
         }
    72 72
    73 
    -    @Override
    74 
    -    public R loadReferenceToRead(String id) {
    75 
    -        D dto = loadDto(id);
    76 
    -        return spi.toReference(getReferentialLocale(), dto);
    77 
    -    }
    78 
    -
    79 73 
         @Override
    80 74 
         public boolean exists(String id) {
    81 75 
             return spi.existsEntity(getTopiaPersistenceContext(), id);

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/OpenableDataServiceLocalSupport.java
    ... ... @@ -97,11 +97,6 @@ public abstract class OpenableDataServiceLocalSupport<PE extends Entity, D exten
    97 97 
             return loadEntityToDto(id);
    98 98 
         }
    99 99
    100 
    -    @Override
    101 
    -    public R loadReferenceToRead(String id) {
    102 
    -        return spi.loadEntityToReferenceDto(getReferentialLocale(), getTopiaPersistenceContext(), id);
    103 
    -    }
    104 
    -
    105 100 
         @Override
    106 101 
         public boolean exists(String id) {
    107 102 
             return spi.existsEntity(getTopiaPersistenceContext(), id);
    ... ... @@ -119,9 +114,10 @@ public abstract class OpenableDataServiceLocalSupport<PE extends Entity, D exten
    119 114
    120 115 
         @Override
    121 116 
         public void move(String newParentId, ImmutableSet<String> ids) {
    122 
    -        if (ids.isEmpty()){
    117 
    +        if (ids.isEmpty()) {
    123 118 
                 return;
    124 119 
             }
    120 
    +        Date now = now();
    125 121 
             PE newParent = loadParentEntity(newParentId);
    126 122 
             Collection<E> collection = getChildren0(newParent, null);
    127 123 
             List<E> moved = new LinkedList<>();

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/ActivityPairingServiceLocalSupport.java
    ... ... @@ -30,8 +30,8 @@ import fr.ird.observe.dto.reference.DataDtoReferenceSet;
    30 30 
     import fr.ird.observe.entities.data.ll.logbook.Activity;
    31 31 
     import fr.ird.observe.services.local.ObserveServiceContextLocal;
    32 32 
     import fr.ird.observe.services.local.service.ObserveServiceLocal;
    33 
    +import fr.ird.observe.services.service.ReferenceService;
    33 34 
     import fr.ird.observe.services.service.data.ll.ActivityPairingService;
    34 
    -import fr.ird.observe.services.service.data.ll.common.TripService;
    35 35 
     import fr.ird.observe.services.service.data.ll.pairing.ActivityPairingEngine;
    36 36 
     import org.nuiton.topia.persistence.script.SqlScriptReader;
    37 37
    ... ... @@ -49,20 +49,20 @@ import java.util.Map;
    49 49 
     class ActivityPairingServiceLocalSupport extends ObserveServiceLocal implements ActivityPairingService {
    50 50
    51 51 
         private fr.ird.observe.services.service.data.ll.observation.ActivityService activityObsService;
    52 
    -    private TripService tripService;
    53 52 
         private fr.ird.observe.services.service.data.ll.logbook.ActivityService activityLogbookService;
    53 
    +    private ReferenceService referenceService;
    54 54
    55 55 
         @Override
    56 56 
         public void setServiceContext(ObserveServiceContextLocal serviceContext) {
    57 57 
             super.setServiceContext(serviceContext);
    58 58 
             activityObsService = serviceContext.newService(fr.ird.observe.services.service.data.ll.observation.ActivityService.class);
    59 59 
             activityLogbookService = serviceContext.newService(fr.ird.observe.services.service.data.ll.logbook.ActivityService.class);
    60 
    -        tripService = serviceContext.newService(TripService.class);
    60 
    +        referenceService = serviceContext.newService(ReferenceService.class);
    61 61 
         }
    62 62
    63 63 
         @Override
    64 64 
         public TripPairingResult computePairing(String tripId) {
    65 
    -        ActivityPairingEngine engine = new ActivityPairingEngine(getReferentialLocale(), tripService, activityLogbookService);
    65 
    +        ActivityPairingEngine engine = new ActivityPairingEngine(getReferentialLocale(), referenceService, activityLogbookService);
    66 66 
             DataDtoReferenceSet<ActivityReference> activityObsSet = activityObsService.getChildren(tripId);
    67 67 
             TripPairingContext pairingContext = engine.newTripContext(tripId, activityObsSet.toSet());
    68 68 
             return engine.computeForTrip(pairingContext);

    • —
    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.