Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
63980e5f
by Tony Chemit at 2024-12-30T13:37:27+01:00
-
4d9e8ddf
by Tony Chemit at 2024-12-30T13:37:27+01:00
-
ce50cd1d
by Tony Chemit at 2024-12-30T13:37:27+01:00
-
eb3a81a4
by Tony Chemit at 2024-12-30T13:37:27+01:00
-
3c365ba9
by Tony Chemit at 2024-12-30T13:38:29+01:00
7 changed files:
- core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json
- core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json
- core/api/tree/src/test/java/fr/ird/observe/navigation/tree/navigation/RootNavigationTreeNodeTest.java
- core/api/tree/src/test/java/fr/ird/observe/spi/navigation/tree/selection/ToolkitTreeNodeBuilderTest.java
- core/api/tree/src/test/resources/navigationTree.json
- core/services/test/src/main/java/fr/ird/observe/services/service/NavigationServiceFixtures.java
- pom.xml
Changes:
| 1 | 1 | {
|
| 2 | 2 | "fr.ird.observe.dto.data.ll.common.TripDto": [
|
| 3 | - "/dataLlCommonTrip:${Trip}",
|
|
| 4 | - "/dataLlCommonTripGroupByStartDate:${TripGroupByStartDate}/${Trip}",
|
|
| 5 | - "/dataLlCommonTripGroupByEndDate:${TripGroupByEndDate}/${Trip}",
|
|
| 6 | - "/dataLlCommonTripGroupByObservationsProgram:${TripGroupByObservationsProgram}/${Trip}",
|
|
| 7 | - "/dataLlCommonTripGroupByLogbookProgram:${TripGroupByLogbookProgram}/${Trip}",
|
|
| 8 | - "/dataLlCommonTripGroupByOcean:${TripGroupByOcean}/${Trip}",
|
|
| 9 | - "/dataLlCommonTripGroupByObserver:${TripGroupByObserver}/${Trip}",
|
|
| 10 | - "/dataLlCommonTripGroupByCaptain:${TripGroupByCaptain}/${Trip}",
|
|
| 11 | - "/dataLlCommonTripGroupByObservationsDataEntryOperator:${TripGroupByObservationsDataEntryOperator}/${Trip}",
|
|
| 12 | - "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}",
|
|
| 13 | - "/dataLlCommonTripGroupBySampleDataEntryOperator:${TripGroupBySampleDataEntryOperator}/${Trip}",
|
|
| 14 | - "/dataLlCommonTripGroupByLandingDataEntryOperator:${TripGroupByLandingDataEntryOperator}/${Trip}",
|
|
| 15 | - "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}",
|
|
| 16 | - "/dataLlCommonTripGroupByVesselVesselType:${TripGroupByVesselVesselType}/${Trip}",
|
|
| 17 | - "/dataLlCommonTripGroupByVesselVesselSizeCategory:${TripGroupByVesselVesselSizeCategory}/${Trip}",
|
|
| 18 | - "/dataLlCommonTripGroupByVesselFlagCountry:${TripGroupByVesselFlagCountry}/${Trip}",
|
|
| 19 | - "/dataLlCommonTripGroupByVesselFleetCountry:${TripGroupByVesselFleetCountry}/${Trip}",
|
|
| 20 | - "/dataLlCommonTripGroupByVesselShipOwner:${TripGroupByVesselShipOwner}/${Trip}",
|
|
| 21 | - "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}",
|
|
| 22 | - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}",
|
|
| 23 | - "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}",
|
|
| 24 | - "/dataLlCommonTripGroupByObservationMethod:${TripGroupByObservationMethod}/${Trip}",
|
|
| 25 | - "/dataLlCommonTripGroupByObservationsDataQuality:${TripGroupByObservationsDataQuality}/${Trip}",
|
|
| 26 | - "/dataLlCommonTripGroupByLogbookDataQuality:${TripGroupByLogbookDataQuality}/${Trip}"
|
|
| 3 | + "/dataLlCommonTrip~${Trip}",
|
|
| 4 | + "/dataLlCommonTripGroupByStartDate~${TripGroupByStartDate}/${Trip}",
|
|
| 5 | + "/dataLlCommonTripGroupByEndDate~${TripGroupByEndDate}/${Trip}",
|
|
| 6 | + "/dataLlCommonTripGroupByObservationsProgram~${TripGroupByObservationsProgram}/${Trip}",
|
|
| 7 | + "/dataLlCommonTripGroupByLogbookProgram~${TripGroupByLogbookProgram}/${Trip}",
|
|
| 8 | + "/dataLlCommonTripGroupByOcean~${TripGroupByOcean}/${Trip}",
|
|
| 9 | + "/dataLlCommonTripGroupByObserver~${TripGroupByObserver}/${Trip}",
|
|
| 10 | + "/dataLlCommonTripGroupByCaptain~${TripGroupByCaptain}/${Trip}",
|
|
| 11 | + "/dataLlCommonTripGroupByObservationsDataEntryOperator~${TripGroupByObservationsDataEntryOperator}/${Trip}",
|
|
| 12 | + "/dataLlCommonTripGroupByLogbookDataEntryOperator~${TripGroupByLogbookDataEntryOperator}/${Trip}",
|
|
| 13 | + "/dataLlCommonTripGroupBySampleDataEntryOperator~${TripGroupBySampleDataEntryOperator}/${Trip}",
|
|
| 14 | + "/dataLlCommonTripGroupByLandingDataEntryOperator~${TripGroupByLandingDataEntryOperator}/${Trip}",
|
|
| 15 | + "/dataLlCommonTripGroupByVessel~${TripGroupByVessel}/${Trip}",
|
|
| 16 | + "/dataLlCommonTripGroupByVesselVesselType~${TripGroupByVesselVesselType}/${Trip}",
|
|
| 17 | + "/dataLlCommonTripGroupByVesselVesselSizeCategory~${TripGroupByVesselVesselSizeCategory}/${Trip}",
|
|
| 18 | + "/dataLlCommonTripGroupByVesselFlagCountry~${TripGroupByVesselFlagCountry}/${Trip}",
|
|
| 19 | + "/dataLlCommonTripGroupByVesselFleetCountry~${TripGroupByVesselFleetCountry}/${Trip}",
|
|
| 20 | + "/dataLlCommonTripGroupByVesselShipOwner~${TripGroupByVesselShipOwner}/${Trip}",
|
|
| 21 | + "/dataLlCommonTripGroupByDepartureHarbour~${TripGroupByDepartureHarbour}/${Trip}",
|
|
| 22 | + "/dataLlCommonTripGroupByLandingHarbour~${TripGroupByLandingHarbour}/${Trip}",
|
|
| 23 | + "/dataLlCommonTripGroupByTripType~${TripGroupByTripType}/${Trip}",
|
|
| 24 | + "/dataLlCommonTripGroupByObservationMethod~${TripGroupByObservationMethod}/${Trip}",
|
|
| 25 | + "/dataLlCommonTripGroupByObservationsDataQuality~${TripGroupByObservationsDataQuality}/${Trip}",
|
|
| 26 | + "/dataLlCommonTripGroupByLogbookDataQuality~${TripGroupByLogbookDataQuality}/${Trip}"
|
|
| 27 | 27 | ],
|
| 28 | 28 | "fr.ird.observe.dto.data.ll.common.TripGroupByCaptainDto": [
|
| 29 | - "/dataLlCommonTripGroupByCaptain:${TripGroupByCaptain}"
|
|
| 29 | + "/dataLlCommonTripGroupByCaptain~${TripGroupByCaptain}"
|
|
| 30 | 30 | ],
|
| 31 | 31 | "fr.ird.observe.dto.data.ll.common.TripGroupByDepartureHarbourDto": [
|
| 32 | - "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}"
|
|
| 32 | + "/dataLlCommonTripGroupByDepartureHarbour~${TripGroupByDepartureHarbour}"
|
|
| 33 | 33 | ],
|
| 34 | 34 | "fr.ird.observe.dto.data.ll.common.TripGroupByEndDateDto": [
|
| 35 | - "/dataLlCommonTripGroupByEndDate:${TripGroupByEndDate}"
|
|
| 35 | + "/dataLlCommonTripGroupByEndDate~${TripGroupByEndDate}"
|
|
| 36 | 36 | ],
|
| 37 | 37 | "fr.ird.observe.dto.data.ll.common.TripGroupByLandingDataEntryOperatorDto": [
|
| 38 | - "/dataLlCommonTripGroupByLandingDataEntryOperator:${TripGroupByLandingDataEntryOperator}"
|
|
| 38 | + "/dataLlCommonTripGroupByLandingDataEntryOperator~${TripGroupByLandingDataEntryOperator}"
|
|
| 39 | 39 | ],
|
| 40 | 40 | "fr.ird.observe.dto.data.ll.common.TripGroupByLandingHarbourDto": [
|
| 41 | - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}"
|
|
| 41 | + "/dataLlCommonTripGroupByLandingHarbour~${TripGroupByLandingHarbour}"
|
|
| 42 | 42 | ],
|
| 43 | 43 | "fr.ird.observe.dto.data.ll.common.TripGroupByLogbookDataEntryOperatorDto": [
|
| 44 | - "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}"
|
|
| 44 | + "/dataLlCommonTripGroupByLogbookDataEntryOperator~${TripGroupByLogbookDataEntryOperator}"
|
|
| 45 | 45 | ],
|
| 46 | 46 | "fr.ird.observe.dto.data.ll.common.TripGroupByLogbookDataQualityDto": [
|
| 47 | - "/dataLlCommonTripGroupByLogbookDataQuality:${TripGroupByLogbookDataQuality}"
|
|
| 47 | + "/dataLlCommonTripGroupByLogbookDataQuality~${TripGroupByLogbookDataQuality}"
|
|
| 48 | 48 | ],
|
| 49 | 49 | "fr.ird.observe.dto.data.ll.common.TripGroupByLogbookProgramDto": [
|
| 50 | - "/dataLlCommonTripGroupByLogbookProgram:${TripGroupByLogbookProgram}"
|
|
| 50 | + "/dataLlCommonTripGroupByLogbookProgram~${TripGroupByLogbookProgram}"
|
|
| 51 | 51 | ],
|
| 52 | 52 | "fr.ird.observe.dto.data.ll.common.TripGroupByObservationMethodDto": [
|
| 53 | - "/dataLlCommonTripGroupByObservationMethod:${TripGroupByObservationMethod}"
|
|
| 53 | + "/dataLlCommonTripGroupByObservationMethod~${TripGroupByObservationMethod}"
|
|
| 54 | 54 | ],
|
| 55 | 55 | "fr.ird.observe.dto.data.ll.common.TripGroupByObservationsDataEntryOperatorDto": [
|
| 56 | - "/dataLlCommonTripGroupByObservationsDataEntryOperator:${TripGroupByObservationsDataEntryOperator}"
|
|
| 56 | + "/dataLlCommonTripGroupByObservationsDataEntryOperator~${TripGroupByObservationsDataEntryOperator}"
|
|
| 57 | 57 | ],
|
| 58 | 58 | "fr.ird.observe.dto.data.ll.common.TripGroupByObservationsDataQualityDto": [
|
| 59 | - "/dataLlCommonTripGroupByObservationsDataQuality:${TripGroupByObservationsDataQuality}"
|
|
| 59 | + "/dataLlCommonTripGroupByObservationsDataQuality~${TripGroupByObservationsDataQuality}"
|
|
| 60 | 60 | ],
|
| 61 | 61 | "fr.ird.observe.dto.data.ll.common.TripGroupByObservationsProgramDto": [
|
| 62 | - "/dataLlCommonTripGroupByObservationsProgram:${TripGroupByObservationsProgram}"
|
|
| 62 | + "/dataLlCommonTripGroupByObservationsProgram~${TripGroupByObservationsProgram}"
|
|
| 63 | 63 | ],
|
| 64 | 64 | "fr.ird.observe.dto.data.ll.common.TripGroupByObserverDto": [
|
| 65 | - "/dataLlCommonTripGroupByObserver:${TripGroupByObserver}"
|
|
| 65 | + "/dataLlCommonTripGroupByObserver~${TripGroupByObserver}"
|
|
| 66 | 66 | ],
|
| 67 | 67 | "fr.ird.observe.dto.data.ll.common.TripGroupByOceanDto": [
|
| 68 | - "/dataLlCommonTripGroupByOcean:${TripGroupByOcean}"
|
|
| 68 | + "/dataLlCommonTripGroupByOcean~${TripGroupByOcean}"
|
|
| 69 | 69 | ],
|
| 70 | 70 | "fr.ird.observe.dto.data.ll.common.TripGroupBySampleDataEntryOperatorDto": [
|
| 71 | - "/dataLlCommonTripGroupBySampleDataEntryOperator:${TripGroupBySampleDataEntryOperator}"
|
|
| 71 | + "/dataLlCommonTripGroupBySampleDataEntryOperator~${TripGroupBySampleDataEntryOperator}"
|
|
| 72 | 72 | ],
|
| 73 | 73 | "fr.ird.observe.dto.data.ll.common.TripGroupByStartDateDto": [
|
| 74 | - "/dataLlCommonTripGroupByStartDate:${TripGroupByStartDate}"
|
|
| 74 | + "/dataLlCommonTripGroupByStartDate~${TripGroupByStartDate}"
|
|
| 75 | 75 | ],
|
| 76 | 76 | "fr.ird.observe.dto.data.ll.common.TripGroupByTripTypeDto": [
|
| 77 | - "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}"
|
|
| 77 | + "/dataLlCommonTripGroupByTripType~${TripGroupByTripType}"
|
|
| 78 | 78 | ],
|
| 79 | 79 | "fr.ird.observe.dto.data.ll.common.TripGroupByVesselDto": [
|
| 80 | - "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}"
|
|
| 80 | + "/dataLlCommonTripGroupByVessel~${TripGroupByVessel}"
|
|
| 81 | 81 | ],
|
| 82 | 82 | "fr.ird.observe.dto.data.ll.common.TripGroupByVesselFlagCountryDto": [
|
| 83 | - "/dataLlCommonTripGroupByVesselFlagCountry:${TripGroupByVesselFlagCountry}"
|
|
| 83 | + "/dataLlCommonTripGroupByVesselFlagCountry~${TripGroupByVesselFlagCountry}"
|
|
| 84 | 84 | ],
|
| 85 | 85 | "fr.ird.observe.dto.data.ll.common.TripGroupByVesselFleetCountryDto": [
|
| 86 | - "/dataLlCommonTripGroupByVesselFleetCountry:${TripGroupByVesselFleetCountry}"
|
|
| 86 | + "/dataLlCommonTripGroupByVesselFleetCountry~${TripGroupByVesselFleetCountry}"
|
|
| 87 | 87 | ],
|
| 88 | 88 | "fr.ird.observe.dto.data.ll.common.TripGroupByVesselShipOwnerDto": [
|
| 89 | - "/dataLlCommonTripGroupByVesselShipOwner:${TripGroupByVesselShipOwner}"
|
|
| 89 | + "/dataLlCommonTripGroupByVesselShipOwner~${TripGroupByVesselShipOwner}"
|
|
| 90 | 90 | ],
|
| 91 | 91 | "fr.ird.observe.dto.data.ll.common.TripGroupByVesselVesselSizeCategoryDto": [
|
| 92 | - "/dataLlCommonTripGroupByVesselVesselSizeCategory:${TripGroupByVesselVesselSizeCategory}"
|
|
| 92 | + "/dataLlCommonTripGroupByVesselVesselSizeCategory~${TripGroupByVesselVesselSizeCategory}"
|
|
| 93 | 93 | ],
|
| 94 | 94 | "fr.ird.observe.dto.data.ll.common.TripGroupByVesselVesselTypeDto": [
|
| 95 | - "/dataLlCommonTripGroupByVesselVesselType:${TripGroupByVesselVesselType}"
|
|
| 95 | + "/dataLlCommonTripGroupByVesselVesselType~${TripGroupByVesselVesselType}"
|
|
| 96 | 96 | ],
|
| 97 | 97 | "fr.ird.observe.dto.data.ps.common.TripDto": [
|
| 98 | - "/dataPsCommonTrip:${Trip}",
|
|
| 99 | - "/dataPsCommonTripGroupByStartDate:${TripGroupByStartDate}/${Trip}",
|
|
| 100 | - "/dataPsCommonTripGroupByEndDate:${TripGroupByEndDate}/${Trip}",
|
|
| 101 | - "/dataPsCommonTripGroupByObservationsProgram:${TripGroupByObservationsProgram}/${Trip}",
|
|
| 102 | - "/dataPsCommonTripGroupByLogbookProgram:${TripGroupByLogbookProgram}/${Trip}",
|
|
| 103 | - "/dataPsCommonTripGroupByOcean:${TripGroupByOcean}/${Trip}",
|
|
| 104 | - "/dataPsCommonTripGroupByObserver:${TripGroupByObserver}/${Trip}",
|
|
| 105 | - "/dataPsCommonTripGroupByCaptain:${TripGroupByCaptain}/${Trip}",
|
|
| 106 | - "/dataPsCommonTripGroupByObservationsDataEntryOperator:${TripGroupByObservationsDataEntryOperator}/${Trip}",
|
|
| 107 | - "/dataPsCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}",
|
|
| 108 | - "/dataPsCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}",
|
|
| 109 | - "/dataPsCommonTripGroupByVesselVesselType:${TripGroupByVesselVesselType}/${Trip}",
|
|
| 110 | - "/dataPsCommonTripGroupByVesselVesselSizeCategory:${TripGroupByVesselVesselSizeCategory}/${Trip}",
|
|
| 111 | - "/dataPsCommonTripGroupByVesselFlagCountry:${TripGroupByVesselFlagCountry}/${Trip}",
|
|
| 112 | - "/dataPsCommonTripGroupByVesselFleetCountry:${TripGroupByVesselFleetCountry}/${Trip}",
|
|
| 113 | - "/dataPsCommonTripGroupByVesselShipOwner:${TripGroupByVesselShipOwner}/${Trip}",
|
|
| 114 | - "/dataPsCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}",
|
|
| 115 | - "/dataPsCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}",
|
|
| 116 | - "/dataPsCommonTripGroupByObservationsDataQuality:${TripGroupByObservationsDataQuality}/${Trip}",
|
|
| 117 | - "/dataPsCommonTripGroupByLogbookDataQuality:${TripGroupByLogbookDataQuality}/${Trip}",
|
|
| 118 | - "/dataPsCommonTripGroupByObservationsAcquisitionStatus:${TripGroupByObservationsAcquisitionStatus}/${Trip}",
|
|
| 119 | - "/dataPsCommonTripGroupByLogbookAcquisitionStatus:${TripGroupByLogbookAcquisitionStatus}/${Trip}",
|
|
| 120 | - "/dataPsCommonTripGroupByTargetWellsSamplingAcquisitionStatus:${TripGroupByTargetWellsSamplingAcquisitionStatus}/${Trip}",
|
|
| 121 | - "/dataPsCommonTripGroupByLandingAcquisitionStatus:${TripGroupByLandingAcquisitionStatus}/${Trip}",
|
|
| 122 | - "/dataPsCommonTripGroupByLocalMarketAcquisitionStatus:${TripGroupByLocalMarketAcquisitionStatus}/${Trip}",
|
|
| 123 | - "/dataPsCommonTripGroupByLocalMarketWellsSamplingAcquisitionStatus:${TripGroupByLocalMarketWellsSamplingAcquisitionStatus}/${Trip}",
|
|
| 124 | - "/dataPsCommonTripGroupByLocalMarketSurveySamplingAcquisitionStatus:${TripGroupByLocalMarketSurveySamplingAcquisitionStatus}/${Trip}",
|
|
| 125 | - "/dataPsCommonTripGroupByAdvancedSamplingAcquisitionStatus:${TripGroupByAdvancedSamplingAcquisitionStatus}/${Trip}",
|
|
| 126 | - "/dataPsCommonTripGroupByDepartureWellContentStatus:${TripGroupByDepartureWellContentStatus}/${Trip}",
|
|
| 127 | - "/dataPsCommonTripGroupByLandingWellContentStatus:${TripGroupByLandingWellContentStatus}/${Trip}"
|
|
| 98 | + "/dataPsCommonTrip~${Trip}",
|
|
| 99 | + "/dataPsCommonTripGroupByStartDate~${TripGroupByStartDate}/${Trip}",
|
|
| 100 | + "/dataPsCommonTripGroupByEndDate~${TripGroupByEndDate}/${Trip}",
|
|
| 101 | + "/dataPsCommonTripGroupByObservationsProgram~${TripGroupByObservationsProgram}/${Trip}",
|
|
| 102 | + "/dataPsCommonTripGroupByLogbookProgram~${TripGroupByLogbookProgram}/${Trip}",
|
|
| 103 | + "/dataPsCommonTripGroupByOcean~${TripGroupByOcean}/${Trip}",
|
|
| 104 | + "/dataPsCommonTripGroupByObserver~${TripGroupByObserver}/${Trip}",
|
|
| 105 | + "/dataPsCommonTripGroupByCaptain~${TripGroupByCaptain}/${Trip}",
|
|
| 106 | + "/dataPsCommonTripGroupByObservationsDataEntryOperator~${TripGroupByObservationsDataEntryOperator}/${Trip}",
|
|
| 107 | + "/dataPsCommonTripGroupByLogbookDataEntryOperator~${TripGroupByLogbookDataEntryOperator}/${Trip}",
|
|
| 108 | + "/dataPsCommonTripGroupByVessel~${TripGroupByVessel}/${Trip}",
|
|
| 109 | + "/dataPsCommonTripGroupByVesselVesselType~${TripGroupByVesselVesselType}/${Trip}",
|
|
| 110 | + "/dataPsCommonTripGroupByVesselVesselSizeCategory~${TripGroupByVesselVesselSizeCategory}/${Trip}",
|
|
| 111 | + "/dataPsCommonTripGroupByVesselFlagCountry~${TripGroupByVesselFlagCountry}/${Trip}",
|
|
| 112 | + "/dataPsCommonTripGroupByVesselFleetCountry~${TripGroupByVesselFleetCountry}/${Trip}",
|
|
| 113 | + "/dataPsCommonTripGroupByVesselShipOwner~${TripGroupByVesselShipOwner}/${Trip}",
|
|
| 114 | + "/dataPsCommonTripGroupByDepartureHarbour~${TripGroupByDepartureHarbour}/${Trip}",
|
|
| 115 | + "/dataPsCommonTripGroupByLandingHarbour~${TripGroupByLandingHarbour}/${Trip}",
|
|
| 116 | + "/dataPsCommonTripGroupByObservationsDataQuality~${TripGroupByObservationsDataQuality}/${Trip}",
|
|
| 117 | + "/dataPsCommonTripGroupByLogbookDataQuality~${TripGroupByLogbookDataQuality}/${Trip}",
|
|
| 118 | + "/dataPsCommonTripGroupByObservationsAcquisitionStatus~${TripGroupByObservationsAcquisitionStatus}/${Trip}",
|
|
| 119 | + "/dataPsCommonTripGroupByLogbookAcquisitionStatus~${TripGroupByLogbookAcquisitionStatus}/${Trip}",
|
|
| 120 | + "/dataPsCommonTripGroupByTargetWellsSamplingAcquisitionStatus~${TripGroupByTargetWellsSamplingAcquisitionStatus}/${Trip}",
|
|
| 121 | + "/dataPsCommonTripGroupByLandingAcquisitionStatus~${TripGroupByLandingAcquisitionStatus}/${Trip}",
|
|
| 122 | + "/dataPsCommonTripGroupByLocalMarketAcquisitionStatus~${TripGroupByLocalMarketAcquisitionStatus}/${Trip}",
|
|
| 123 | + "/dataPsCommonTripGroupByLocalMarketWellsSamplingAcquisitionStatus~${TripGroupByLocalMarketWellsSamplingAcquisitionStatus}/${Trip}",
|
|
| 124 | + "/dataPsCommonTripGroupByLocalMarketSurveySamplingAcquisitionStatus~${TripGroupByLocalMarketSurveySamplingAcquisitionStatus}/${Trip}",
|
|
| 125 | + "/dataPsCommonTripGroupByAdvancedSamplingAcquisitionStatus~${TripGroupByAdvancedSamplingAcquisitionStatus}/${Trip}",
|
|
| 126 | + "/dataPsCommonTripGroupByDepartureWellContentStatus~${TripGroupByDepartureWellContentStatus}/${Trip}",
|
|
| 127 | + "/dataPsCommonTripGroupByLandingWellContentStatus~${TripGroupByLandingWellContentStatus}/${Trip}"
|
|
| 128 | 128 | ],
|
| 129 | 129 | "fr.ird.observe.dto.data.ps.common.TripGroupByAdvancedSamplingAcquisitionStatusDto": [
|
| 130 | - "/dataPsCommonTripGroupByAdvancedSamplingAcquisitionStatus:${TripGroupByAdvancedSamplingAcquisitionStatus}"
|
|
| 130 | + "/dataPsCommonTripGroupByAdvancedSamplingAcquisitionStatus~${TripGroupByAdvancedSamplingAcquisitionStatus}"
|
|
| 131 | 131 | ],
|
| 132 | 132 | "fr.ird.observe.dto.data.ps.common.TripGroupByCaptainDto": [
|
| 133 | - "/dataPsCommonTripGroupByCaptain:${TripGroupByCaptain}"
|
|
| 133 | + "/dataPsCommonTripGroupByCaptain~${TripGroupByCaptain}"
|
|
| 134 | 134 | ],
|
| 135 | 135 | "fr.ird.observe.dto.data.ps.common.TripGroupByDepartureHarbourDto": [
|
| 136 | - "/dataPsCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}"
|
|
| 136 | + "/dataPsCommonTripGroupByDepartureHarbour~${TripGroupByDepartureHarbour}"
|
|
| 137 | 137 | ],
|
| 138 | 138 | "fr.ird.observe.dto.data.ps.common.TripGroupByDepartureWellContentStatusDto": [
|
| 139 | - "/dataPsCommonTripGroupByDepartureWellContentStatus:${TripGroupByDepartureWellContentStatus}"
|
|
| 139 | + "/dataPsCommonTripGroupByDepartureWellContentStatus~${TripGroupByDepartureWellContentStatus}"
|
|
| 140 | 140 | ],
|
| 141 | 141 | "fr.ird.observe.dto.data.ps.common.TripGroupByEndDateDto": [
|
| 142 | - "/dataPsCommonTripGroupByEndDate:${TripGroupByEndDate}"
|
|
| 142 | + "/dataPsCommonTripGroupByEndDate~${TripGroupByEndDate}"
|
|
| 143 | 143 | ],
|
| 144 | 144 | "fr.ird.observe.dto.data.ps.common.TripGroupByLandingAcquisitionStatusDto": [
|
| 145 | - "/dataPsCommonTripGroupByLandingAcquisitionStatus:${TripGroupByLandingAcquisitionStatus}"
|
|
| 145 | + "/dataPsCommonTripGroupByLandingAcquisitionStatus~${TripGroupByLandingAcquisitionStatus}"
|
|
| 146 | 146 | ],
|
| 147 | 147 | "fr.ird.observe.dto.data.ps.common.TripGroupByLandingHarbourDto": [
|
| 148 | - "/dataPsCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}"
|
|
| 148 | + "/dataPsCommonTripGroupByLandingHarbour~${TripGroupByLandingHarbour}"
|
|
| 149 | 149 | ],
|
| 150 | 150 | "fr.ird.observe.dto.data.ps.common.TripGroupByLandingWellContentStatusDto": [
|
| 151 | - "/dataPsCommonTripGroupByLandingWellContentStatus:${TripGroupByLandingWellContentStatus}"
|
|
| 151 | + "/dataPsCommonTripGroupByLandingWellContentStatus~${TripGroupByLandingWellContentStatus}"
|
|
| 152 | 152 | ],
|
| 153 | 153 | "fr.ird.observe.dto.data.ps.common.TripGroupByLocalMarketAcquisitionStatusDto": [
|
| 154 | - "/dataPsCommonTripGroupByLocalMarketAcquisitionStatus:${TripGroupByLocalMarketAcquisitionStatus}"
|
|
| 154 | + "/dataPsCommonTripGroupByLocalMarketAcquisitionStatus~${TripGroupByLocalMarketAcquisitionStatus}"
|
|
| 155 | 155 | ],
|
| 156 | 156 | "fr.ird.observe.dto.data.ps.common.TripGroupByLocalMarketSurveySamplingAcquisitionStatusDto": [
|
| 157 | - "/dataPsCommonTripGroupByLocalMarketSurveySamplingAcquisitionStatus:${TripGroupByLocalMarketSurveySamplingAcquisitionStatus}"
|
|
| 157 | + "/dataPsCommonTripGroupByLocalMarketSurveySamplingAcquisitionStatus~${TripGroupByLocalMarketSurveySamplingAcquisitionStatus}"
|
|
| 158 | 158 | ],
|
| 159 | 159 | "fr.ird.observe.dto.data.ps.common.TripGroupByLocalMarketWellsSamplingAcquisitionStatusDto": [
|
| 160 | - "/dataPsCommonTripGroupByLocalMarketWellsSamplingAcquisitionStatus:${TripGroupByLocalMarketWellsSamplingAcquisitionStatus}"
|
|
| 160 | + "/dataPsCommonTripGroupByLocalMarketWellsSamplingAcquisitionStatus~${TripGroupByLocalMarketWellsSamplingAcquisitionStatus}"
|
|
| 161 | 161 | ],
|
| 162 | 162 | "fr.ird.observe.dto.data.ps.common.TripGroupByLogbookAcquisitionStatusDto": [
|
| 163 | - "/dataPsCommonTripGroupByLogbookAcquisitionStatus:${TripGroupByLogbookAcquisitionStatus}"
|
|
| 163 | + "/dataPsCommonTripGroupByLogbookAcquisitionStatus~${TripGroupByLogbookAcquisitionStatus}"
|
|
| 164 | 164 | ],
|
| 165 | 165 | "fr.ird.observe.dto.data.ps.common.TripGroupByLogbookDataEntryOperatorDto": [
|
| 166 | - "/dataPsCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}"
|
|
| 166 | + "/dataPsCommonTripGroupByLogbookDataEntryOperator~${TripGroupByLogbookDataEntryOperator}"
|
|
| 167 | 167 | ],
|
| 168 | 168 | "fr.ird.observe.dto.data.ps.common.TripGroupByLogbookDataQualityDto": [
|
| 169 | - "/dataPsCommonTripGroupByLogbookDataQuality:${TripGroupByLogbookDataQuality}"
|
|
| 169 | + "/dataPsCommonTripGroupByLogbookDataQuality~${TripGroupByLogbookDataQuality}"
|
|
| 170 | 170 | ],
|
| 171 | 171 | "fr.ird.observe.dto.data.ps.common.TripGroupByLogbookProgramDto": [
|
| 172 | - "/dataPsCommonTripGroupByLogbookProgram:${TripGroupByLogbookProgram}"
|
|
| 172 | + "/dataPsCommonTripGroupByLogbookProgram~${TripGroupByLogbookProgram}"
|
|
| 173 | 173 | ],
|
| 174 | 174 | "fr.ird.observe.dto.data.ps.common.TripGroupByObservationsAcquisitionStatusDto": [
|
| 175 | - "/dataPsCommonTripGroupByObservationsAcquisitionStatus:${TripGroupByObservationsAcquisitionStatus}"
|
|
| 175 | + "/dataPsCommonTripGroupByObservationsAcquisitionStatus~${TripGroupByObservationsAcquisitionStatus}"
|
|
| 176 | 176 | ],
|
| 177 | 177 | "fr.ird.observe.dto.data.ps.common.TripGroupByObservationsDataEntryOperatorDto": [
|
| 178 | - "/dataPsCommonTripGroupByObservationsDataEntryOperator:${TripGroupByObservationsDataEntryOperator}"
|
|
| 178 | + "/dataPsCommonTripGroupByObservationsDataEntryOperator~${TripGroupByObservationsDataEntryOperator}"
|
|
| 179 | 179 | ],
|
| 180 | 180 | "fr.ird.observe.dto.data.ps.common.TripGroupByObservationsDataQualityDto": [
|
| 181 | - "/dataPsCommonTripGroupByObservationsDataQuality:${TripGroupByObservationsDataQuality}"
|
|
| 181 | + "/dataPsCommonTripGroupByObservationsDataQuality~${TripGroupByObservationsDataQuality}"
|
|
| 182 | 182 | ],
|
| 183 | 183 | "fr.ird.observe.dto.data.ps.common.TripGroupByObservationsProgramDto": [
|
| 184 | - "/dataPsCommonTripGroupByObservationsProgram:${TripGroupByObservationsProgram}"
|
|
| 184 | + "/dataPsCommonTripGroupByObservationsProgram~${TripGroupByObservationsProgram}"
|
|
| 185 | 185 | ],
|
| 186 | 186 | "fr.ird.observe.dto.data.ps.common.TripGroupByObserverDto": [
|
| 187 | - "/dataPsCommonTripGroupByObserver:${TripGroupByObserver}"
|
|
| 187 | + "/dataPsCommonTripGroupByObserver~${TripGroupByObserver}"
|
|
| 188 | 188 | ],
|
| 189 | 189 | "fr.ird.observe.dto.data.ps.common.TripGroupByOceanDto": [
|
| 190 | - "/dataPsCommonTripGroupByOcean:${TripGroupByOcean}"
|
|
| 190 | + "/dataPsCommonTripGroupByOcean~${TripGroupByOcean}"
|
|
| 191 | 191 | ],
|
| 192 | 192 | "fr.ird.observe.dto.data.ps.common.TripGroupByStartDateDto": [
|
| 193 | - "/dataPsCommonTripGroupByStartDate:${TripGroupByStartDate}"
|
|
| 193 | + "/dataPsCommonTripGroupByStartDate~${TripGroupByStartDate}"
|
|
| 194 | 194 | ],
|
| 195 | 195 | "fr.ird.observe.dto.data.ps.common.TripGroupByTargetWellsSamplingAcquisitionStatusDto": [
|
| 196 | - "/dataPsCommonTripGroupByTargetWellsSamplingAcquisitionStatus:${TripGroupByTargetWellsSamplingAcquisitionStatus}"
|
|
| 196 | + "/dataPsCommonTripGroupByTargetWellsSamplingAcquisitionStatus~${TripGroupByTargetWellsSamplingAcquisitionStatus}"
|
|
| 197 | 197 | ],
|
| 198 | 198 | "fr.ird.observe.dto.data.ps.common.TripGroupByVesselDto": [
|
| 199 | - "/dataPsCommonTripGroupByVessel:${TripGroupByVessel}"
|
|
| 199 | + "/dataPsCommonTripGroupByVessel~${TripGroupByVessel}"
|
|
| 200 | 200 | ],
|
| 201 | 201 | "fr.ird.observe.dto.data.ps.common.TripGroupByVesselFlagCountryDto": [
|
| 202 | - "/dataPsCommonTripGroupByVesselFlagCountry:${TripGroupByVesselFlagCountry}"
|
|
| 202 | + "/dataPsCommonTripGroupByVesselFlagCountry~${TripGroupByVesselFlagCountry}"
|
|
| 203 | 203 | ],
|
| 204 | 204 | "fr.ird.observe.dto.data.ps.common.TripGroupByVesselFleetCountryDto": [
|
| 205 | - "/dataPsCommonTripGroupByVesselFleetCountry:${TripGroupByVesselFleetCountry}"
|
|
| 205 | + "/dataPsCommonTripGroupByVesselFleetCountry~${TripGroupByVesselFleetCountry}"
|
|
| 206 | 206 | ],
|
| 207 | 207 | "fr.ird.observe.dto.data.ps.common.TripGroupByVesselShipOwnerDto": [
|
| 208 | - "/dataPsCommonTripGroupByVesselShipOwner:${TripGroupByVesselShipOwner}"
|
|
| 208 | + "/dataPsCommonTripGroupByVesselShipOwner~${TripGroupByVesselShipOwner}"
|
|
| 209 | 209 | ],
|
| 210 | 210 | "fr.ird.observe.dto.data.ps.common.TripGroupByVesselVesselSizeCategoryDto": [
|
| 211 | - "/dataPsCommonTripGroupByVesselVesselSizeCategory:${TripGroupByVesselVesselSizeCategory}"
|
|
| 211 | + "/dataPsCommonTripGroupByVesselVesselSizeCategory~${TripGroupByVesselVesselSizeCategory}"
|
|
| 212 | 212 | ],
|
| 213 | 213 | "fr.ird.observe.dto.data.ps.common.TripGroupByVesselVesselTypeDto": [
|
| 214 | - "/dataPsCommonTripGroupByVesselVesselType:${TripGroupByVesselVesselType}"
|
|
| 214 | + "/dataPsCommonTripGroupByVesselVesselType~${TripGroupByVesselVesselType}"
|
|
| 215 | 215 | ],
|
| 216 | 216 | "fr.ird.observe.dto.referential.common.CountryDto": [
|
| 217 | 217 | "/referentialCommon/country"
|
| ... | ... | @@ -84,54 +84,54 @@ public class RootNavigationTreeNodeTest { |
| 84 | 84 | ToolkitIdDtoBean programId = ToolkitIdDtoBean.of(ProgramDto.class, "program");
|
| 85 | 85 | ToolkitIdDtoBean tripId = ToolkitIdDtoBean.of(TripDto.class, "trip");
|
| 86 | 86 | |
| 87 | - assertNodeNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram:program");
|
|
| 87 | + assertNodeNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram~program");
|
|
| 88 | 88 | |
| 89 | 89 | TripGroupByObservationsProgramNavigationTreeNode newProgram = new TripGroupByObservationsProgramNavigationTreeNode();
|
| 90 | 90 | root.add(newProgram);
|
| 91 | 91 | // still null since newChild has no id
|
| 92 | - assertNodeNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram:program");
|
|
| 92 | + assertNodeNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram~program");
|
|
| 93 | 93 | |
| 94 | 94 | TripGroupByObservationsProgramDto programReference = new TripGroupByObservationsProgramDto();
|
| 95 | 95 | programReference.setFilterValue(programId.getId());
|
| 96 | 96 | |
| 97 | 97 | setData(newProgram.getUserObject(), programReference);
|
| 98 | - TripGroupByObservationsProgramNavigationTreeNode programLl = assertNodeNotNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram:program");
|
|
| 98 | + TripGroupByObservationsProgramNavigationTreeNode programLl = assertNodeNotNull(root, root, p -> p.getDataLlCommonTripGroupByObservationsProgram(programId), "dataLlCommonTripGroupByObservationsProgram~program");
|
|
| 99 | 99 | |
| 100 | - assertNodeNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram:program/trip");
|
|
| 100 | + assertNodeNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram~program/trip");
|
|
| 101 | 101 | Assert.assertNull(programLl.findPath("trip"));
|
| 102 | 102 | |
| 103 | 103 | TripNavigationTreeNode newTrip = new TripNavigationTreeNode();
|
| 104 | 104 | programLl.add(newTrip);
|
| 105 | 105 | |
| 106 | - assertNodeNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram:program/trip");
|
|
| 106 | + assertNodeNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram~program/trip");
|
|
| 107 | 107 | Assert.assertNull(programLl.findPath("trip"));
|
| 108 | 108 | |
| 109 | 109 | root.add(newTrip);
|
| 110 | - assertNodeNull(root, root, p -> p.findChildById(tripId.getId()), "dataLlCommonTrip:trip");
|
|
| 111 | - Assert.assertNull(root.findPath("dataLlCommonTrip:trip"));
|
|
| 110 | + assertNodeNull(root, root, p -> p.findChildById(tripId.getId()), "dataLlCommonTrip~trip");
|
|
| 111 | + Assert.assertNull(root.findPath("dataLlCommonTrip~trip"));
|
|
| 112 | 112 | |
| 113 | 113 | TripReference tripReference = new TripReference();
|
| 114 | 114 | tripReference.setId(tripId.getId());
|
| 115 | 115 | setData(newTrip.getUserObject(), tripReference);
|
| 116 | 116 | |
| 117 | - assertNodeNotNull(root, root, p -> p.findChildByType(TripNavigationTreeNode.class, tripId.getId()), "dataLlCommonTrip:trip");
|
|
| 118 | - Assert.assertNotNull(root.findPath("dataLlCommonTrip:trip"));
|
|
| 117 | + assertNodeNotNull(root, root, p -> p.findChildByType(TripNavigationTreeNode.class, tripId.getId()), "dataLlCommonTrip~trip");
|
|
| 118 | + Assert.assertNotNull(root.findPath("dataLlCommonTrip~trip"));
|
|
| 119 | 119 | |
| 120 | 120 | programLl.add(newTrip);
|
| 121 | - TripNavigationTreeNode tripNode = assertNodeNotNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram:program/trip");
|
|
| 121 | + TripNavigationTreeNode tripNode = assertNodeNotNull(root, programLl, p -> p.getChildren(tripId), "dataLlCommonTripGroupByObservationsProgram~program/trip");
|
|
| 122 | 122 | Assert.assertNotNull(programLl.findPath("trip"));
|
| 123 | 123 | |
| 124 | - assertNodeNull(root, tripNode, TripNavigationTreeNode::getGearUseFeatures, "dataLlCommonTripGroupByObservationsProgram:program/trip/gearUseFeatures");
|
|
| 124 | + assertNodeNull(root, tripNode, TripNavigationTreeNode::getGearUseFeatures, "dataLlCommonTripGroupByObservationsProgram~program/trip/gearUseFeatures");
|
|
| 125 | 125 | Assert.assertNull(tripNode.findPath("gearUseFeatures"));
|
| 126 | 126 | |
| 127 | 127 | tripNode.add(new GearUseFeaturesNavigationTreeNode());
|
| 128 | - assertNodeNotNull(root, tripNode, TripNavigationTreeNode::getGearUseFeatures, "dataLlCommonTripGroupByObservationsProgram:program/trip/gearUseFeatures");
|
|
| 128 | + assertNodeNotNull(root, tripNode, TripNavigationTreeNode::getGearUseFeatures, "dataLlCommonTripGroupByObservationsProgram~program/trip/gearUseFeatures");
|
|
| 129 | 129 | Assert.assertNotNull(tripNode.findPath("gearUseFeatures"));
|
| 130 | 130 | Assert.assertNotNull(programLl.findPath("trip/gearUseFeatures"));
|
| 131 | 131 | |
| 132 | - Assert.assertNull(root.findPath("dataLlCommonTrip:trip/gearUseFeatures"));
|
|
| 132 | + Assert.assertNull(root.findPath("dataLlCommonTrip~trip/gearUseFeatures"));
|
|
| 133 | 133 | root.add(newTrip);
|
| 134 | - Assert.assertNotNull(root.findPath("dataLlCommonTrip:trip/gearUseFeatures"));
|
|
| 134 | + Assert.assertNotNull(root.findPath("dataLlCommonTrip~trip/gearUseFeatures"));
|
|
| 135 | 135 | }
|
| 136 | 136 | |
| 137 | 137 | protected <N extends NavigationTreeNode> void assertNodeNull(NavigationTreeNode root, N parent, Function<N, NavigationTreeNode> toChildNode, String rootPath) {
|
| ... | ... | @@ -49,15 +49,15 @@ public class ToolkitTreeNodeBuilderTest { |
| 49 | 49 | |
| 50 | 50 | public static final String content = "{\n" +
|
| 51 | 51 | " \"mapping\": {\n" +
|
| 52 | - " \"dataPsCommonTripGroupByObservationsProgram:program1\": {\n" +
|
|
| 52 | + " \"dataPsCommonTripGroupByObservationsProgram~program1\": {\n" +
|
|
| 53 | 53 | " \"count\": 1\n" +
|
| 54 | 54 | " },\n" +
|
| 55 | - " \"dataPsCommonTripGroupByObservationsProgram:program1/trip1\": {\n" +
|
|
| 55 | + " \"dataPsCommonTripGroupByObservationsProgram~program1/trip1\": {\n" +
|
|
| 56 | 56 | " },\n" +
|
| 57 | - " \"dataPsCommonTripGroupByObservationsProgram:program2\": {\n" +
|
|
| 57 | + " \"dataPsCommonTripGroupByObservationsProgram~program2\": {\n" +
|
|
| 58 | 58 | " \"count\": 2\n" +
|
| 59 | 59 | " },\n" +
|
| 60 | - " \"dataPsCommonTripGroupByObservationsProgram:program2/trip2\": {\n" +
|
|
| 60 | + " \"dataPsCommonTripGroupByObservationsProgram~program2/trip2\": {\n" +
|
|
| 61 | 61 | " },\n" +
|
| 62 | 62 | " \"referentialCommon\": {},\n" +
|
| 63 | 63 | " \"referentialCommon/country\": {\n" +
|
| ... | ... | @@ -78,10 +78,10 @@ public class ToolkitTreeNodeBuilderTest { |
| 78 | 78 | Gson gson = new DtoGsonSupplier(true).get();
|
| 79 | 79 | |
| 80 | 80 | Map<String, ToolkitTreeNodeStates> mapping = new LinkedHashMap<>();
|
| 81 | - mapping.put("dataPsCommonTripGroupByObservationsProgram:program1", ToolkitTreeNodeStates.of("count", 1));
|
|
| 82 | - mapping.put("dataPsCommonTripGroupByObservationsProgram:program1/trip1", ToolkitTreeNodeStates.of());
|
|
| 83 | - mapping.put("dataPsCommonTripGroupByObservationsProgram:program2", ToolkitTreeNodeStates.of("count", 2));
|
|
| 84 | - mapping.put("dataPsCommonTripGroupByObservationsProgram:program2/trip2", ToolkitTreeNodeStates.of());
|
|
| 81 | + mapping.put("dataPsCommonTripGroupByObservationsProgram~program1", ToolkitTreeNodeStates.of("count", 1));
|
|
| 82 | + mapping.put("dataPsCommonTripGroupByObservationsProgram~program1/trip1", ToolkitTreeNodeStates.of());
|
|
| 83 | + mapping.put("dataPsCommonTripGroupByObservationsProgram~program2", ToolkitTreeNodeStates.of("count", 2));
|
|
| 84 | + mapping.put("dataPsCommonTripGroupByObservationsProgram~program2/trip2", ToolkitTreeNodeStates.of());
|
|
| 85 | 85 | mapping.put("referentialCommon", ToolkitTreeNodeStates.of());
|
| 86 | 86 | mapping.put("referentialCommon/country", ToolkitTreeNodeStates.of("count", 1));
|
| 87 | 87 | mapping.put("referentialPsCommon", ToolkitTreeNodeStates.of());
|
| ... | ... | @@ -101,8 +101,8 @@ public class ToolkitTreeNodeBuilderTest { |
| 101 | 101 | @Test
|
| 102 | 102 | public void fromPath() {
|
| 103 | 103 | ObserveTreeResourcesFixtures.assertLoadPath(RootSelectionTreeNode::new, null, 0);
|
| 104 | - ObserveTreeResourcesFixtures.assertLoadPath(RootSelectionTreeNode::new, "dataPsCommonTripGroupByObservationsProgram:program1", 1);
|
|
| 105 | - ObserveTreeResourcesFixtures.assertLoadPath(RootSelectionTreeNode::new, "dataPsCommonTripGroupByObservationsProgram:program1/trip2", 2);
|
|
| 104 | + ObserveTreeResourcesFixtures.assertLoadPath(RootSelectionTreeNode::new, "dataPsCommonTripGroupByObservationsProgram~program1", 1);
|
|
| 105 | + ObserveTreeResourcesFixtures.assertLoadPath(RootSelectionTreeNode::new, "dataPsCommonTripGroupByObservationsProgram~program1/trip2", 2);
|
|
| 106 | 106 | }
|
| 107 | 107 | |
| 108 | 108 | private void assertModel(Gson gson, Map<String, ToolkitTreeNodeStates> mapping) {
|
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | "path": "",
|
| 24 | 24 | "lastUpdateDate": "2016-08-21T17:15:36.000Z",
|
| 25 | 25 | "mapping": {
|
| 26 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444": {
|
|
| 26 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444": {
|
|
| 27 | 27 | "count": 2,
|
| 28 | 28 | "editable": true,
|
| 29 | 29 | "enable": true,
|
| ... | ... | @@ -31,19 +31,19 @@ |
| 31 | 31 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 32 | 32 | "text": "[PS] observe.data.Data.program Indéterminé (IRD)"
|
| 33 | 33 | },
|
| 34 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837": {
|
|
| 34 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837": {
|
|
| 35 | 35 | "editable": true,
|
| 36 | 36 | "id": "fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837",
|
| 37 | 37 | "lastUpdateDate": "2021-02-01T00:00:00.000Z",
|
| 38 | 38 | "text": "31/03/2012 - 09/05/2012 - observe.Common.none - Patrice Dewals"
|
| 39 | 39 | },
|
| 40 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1345294938189#0.4179663054751733": {
|
|
| 40 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1345294938189#0.4179663054751733": {
|
|
| 41 | 41 | "editable": true,
|
| 42 | 42 | "id": "fr.ird.data.ps.common.Trip#1345294938189#0.4179663054751733",
|
| 43 | 43 | "lastUpdateDate": "2021-02-01T00:00:00.000Z",
|
| 44 | 44 | "text": "18/08/2012 - 24/09/2012 - observe.Common.none - Carlo Pecoraro"
|
| 45 | 45 | },
|
| 46 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686262#0.3362184368606246": {
|
|
| 46 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686262#0.3362184368606246": {
|
|
| 47 | 47 | "count": 0,
|
| 48 | 48 | "editable": true,
|
| 49 | 49 | "enable": false,
|
| ... | ... | @@ -51,7 +51,7 @@ |
| 51 | 51 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 52 | 52 | "text": "[PS] observe.data.Data.program Patudo (IRD)"
|
| 53 | 53 | },
|
| 54 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686262#0.714540816186228": {
|
|
| 54 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686262#0.714540816186228": {
|
|
| 55 | 55 | "count": 0,
|
| 56 | 56 | "editable": true,
|
| 57 | 57 | "enable": true,
|
| ... | ... | @@ -59,7 +59,7 @@ |
| 59 | 59 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 60 | 60 | "text": "[PS] observe.data.Data.program SFA"
|
| 61 | 61 | },
|
| 62 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1264610568269#0.26135820135328836": {
|
|
| 62 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1264610568269#0.26135820135328836": {
|
|
| 63 | 63 | "count": 0,
|
| 64 | 64 | "editable": true,
|
| 65 | 65 | "enable": false,
|
| ... | ... | @@ -67,7 +67,7 @@ |
| 67 | 67 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 68 | 68 | "text": "[PS] observe.data.Data.program Faune associée (IRD)"
|
| 69 | 69 | },
|
| 70 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686262#0.8610783468649943": {
|
|
| 70 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686262#0.8610783468649943": {
|
|
| 71 | 71 | "count": 0,
|
| 72 | 72 | "editable": true,
|
| 73 | 73 | "enable": false,
|
| ... | ... | @@ -75,7 +75,7 @@ |
| 75 | 75 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 76 | 76 | "text": "[PS] observe.data.Data.program Moratoire ICCAT 1997-2005 (IRD)"
|
| 77 | 77 | },
|
| 78 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1264610568269#0.20791810830326396": {
|
|
| 78 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1264610568269#0.20791810830326396": {
|
|
| 79 | 79 | "count": 0,
|
| 80 | 80 | "editable": true,
|
| 81 | 81 | "enable": false,
|
| ... | ... | @@ -83,7 +83,7 @@ |
| 83 | 83 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 84 | 84 | "text": "[PS] observe.data.Data.program CRO"
|
| 85 | 85 | },
|
| 86 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1302877007400#0.8159545375917711": {
|
|
| 86 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1302877007400#0.8159545375917711": {
|
|
| 87 | 87 | "count": 0,
|
| 88 | 88 | "editable": true,
|
| 89 | 89 | "enable": false,
|
| ... | ... | @@ -91,7 +91,7 @@ |
| 91 | 91 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 92 | 92 | "text": "[PS] observe.data.Data.program TAAF (Iles Eparses)"
|
| 93 | 93 | },
|
| 94 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1326997807154#0.6381090187977135": {
|
|
| 94 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1326997807154#0.6381090187977135": {
|
|
| 95 | 95 | "count": 0,
|
| 96 | 96 | "editable": true,
|
| 97 | 97 | "enable": false,
|
| ... | ... | @@ -99,7 +99,7 @@ |
| 99 | 99 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 100 | 100 | "text": "[PS] observe.data.Data.program Faune associée (IEO)"
|
| 101 | 101 | },
|
| 102 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1326997947903#0.15492621989367272": {
|
|
| 102 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1326997947903#0.15492621989367272": {
|
|
| 103 | 103 | "count": 0,
|
| 104 | 104 | "editable": true,
|
| 105 | 105 | "enable": false,
|
| ... | ... | @@ -107,7 +107,7 @@ |
| 107 | 107 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 108 | 108 | "text": "[PS] observe.data.Data.program Patudo (IEO)"
|
| 109 | 109 | },
|
| 110 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1373642516190#0.998459307142491": {
|
|
| 110 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1373642516190#0.998459307142491": {
|
|
| 111 | 111 | "count": 0,
|
| 112 | 112 | "editable": true,
|
| 113 | 113 | "enable": true,
|
| ... | ... | @@ -115,7 +115,7 @@ |
| 115 | 115 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 116 | 116 | "text": "[PS] observe.data.Data.program OCUP"
|
| 117 | 117 | },
|
| 118 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.31033946454061234": {
|
|
| 118 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.31033946454061234": {
|
|
| 119 | 119 | "count": 1,
|
| 120 | 120 | "editable": true,
|
| 121 | 121 | "enable": true,
|
| ... | ... | @@ -123,13 +123,13 @@ |
| 123 | 123 | "lastUpdateDate": "2017-10-26T13:58:44.829Z",
|
| 124 | 124 | "text": "[PS] observe.data.Data.program DCF Senne (IRD)"
|
| 125 | 125 | },
|
| 126 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.31033946454061234/fr.ird.data.ps.common.Trip#1573473170279#0.39901519164877486": {
|
|
| 126 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.31033946454061234/fr.ird.data.ps.common.Trip#1573473170279#0.39901519164877486": {
|
|
| 127 | 127 | "editable": true,
|
| 128 | 128 | "id": "fr.ird.data.ps.common.Trip#1573473170279#0.39901519164877486",
|
| 129 | 129 | "lastUpdateDate": "2021-02-01T00:00:00.000Z",
|
| 130 | 130 | "text": "10/11/2019 - 06/12/2019 - observe.Common.none - Joanna Vega"
|
| 131 | 131 | },
|
| 132 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1363095174385#0.011966550987014823": {
|
|
| 132 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1363095174385#0.011966550987014823": {
|
|
| 133 | 133 | "count": 1,
|
| 134 | 134 | "editable": true,
|
| 135 | 135 | "enable": true,
|
| ... | ... | @@ -137,13 +137,13 @@ |
| 137 | 137 | "lastUpdateDate": "2017-05-05T10:17:53.852Z",
|
| 138 | 138 | "text": "[PS] observe.data.Data.program Moratoire ICCAT 2013-? (IRD)"
|
| 139 | 139 | },
|
| 140 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1363095174385#0.011966550987014823/fr.ird.data.ps.common.Trip#1553970328158#0.44863535394269627": {
|
|
| 140 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1363095174385#0.011966550987014823/fr.ird.data.ps.common.Trip#1553970328158#0.44863535394269627": {
|
|
| 141 | 141 | "editable": true,
|
| 142 | 142 | "id": "fr.ird.data.ps.common.Trip#1553970328158#0.44863535394269627",
|
| 143 | 143 | "lastUpdateDate": "2021-02-01T00:00:00.000Z",
|
| 144 | 144 | "text": "30/03/2019 - 08/04/2019 - observe.Common.none - Jean Joël Cédric Ble"
|
| 145 | 145 | },
|
| 146 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1308048349668#0.7314513252652438": {
|
|
| 146 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1308048349668#0.7314513252652438": {
|
|
| 147 | 147 | "count": 0,
|
| 148 | 148 | "editable": true,
|
| 149 | 149 | "enable": true,
|
| ... | ... | @@ -151,7 +151,7 @@ |
| 151 | 151 | "lastUpdateDate": "2017-08-02T16:38:43.155Z",
|
| 152 | 152 | "text": "[PS] observe.data.Data.program DCF Senne (TAAF)"
|
| 153 | 153 | },
|
| 154 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1264610568269#0.3041024869394401": {
|
|
| 154 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1264610568269#0.3041024869394401": {
|
|
| 155 | 155 | "count": 0,
|
| 156 | 156 | "editable": true,
|
| 157 | 157 | "enable": true,
|
| ... | ... | @@ -159,7 +159,7 @@ |
| 159 | 159 | "lastUpdateDate": "2017-08-02T16:39:00.565Z",
|
| 160 | 160 | "text": "[PS] observe.data.Data.program DCF Senne (IEO)"
|
| 161 | 161 | },
|
| 162 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1264610568269#0.04557703863701967": {
|
|
| 162 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1264610568269#0.04557703863701967": {
|
|
| 163 | 163 | "count": 0,
|
| 164 | 164 | "editable": true,
|
| 165 | 165 | "enable": true,
|
| ... | ... | @@ -167,7 +167,7 @@ |
| 167 | 167 | "lastUpdateDate": "2017-08-02T16:39:10.381Z",
|
| 168 | 168 | "text": "[PS] observe.data.Data.program DCF Senne (AZTI)"
|
| 169 | 169 | },
|
| 170 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1539251726380#0.8022101576807099": {
|
|
| 170 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1539251726380#0.8022101576807099": {
|
|
| 171 | 171 | "count": 0,
|
| 172 | 172 | "editable": true,
|
| 173 | 173 | "enable": true,
|
| ... | ... | @@ -175,7 +175,7 @@ |
| 175 | 175 | "lastUpdateDate": "2018-10-11T11:55:26.380Z",
|
| 176 | 176 | "text": "[PS] observe.data.Data.program DCF Senne (OD)"
|
| 177 | 177 | },
|
| 178 | - "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1539949992432#0.4308822110391043": {
|
|
| 178 | + "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1539949992432#0.4308822110391043": {
|
|
| 179 | 179 | "count": 0,
|
| 180 | 180 | "editable": true,
|
| 181 | 181 | "enable": true,
|
| ... | ... | @@ -183,7 +183,7 @@ |
| 183 | 183 | "lastUpdateDate": "2018-10-23T14:20:11.044Z",
|
| 184 | 184 | "text": "[PS] observe.data.Data.program OOE (OD)"
|
| 185 | 185 | },
|
| 186 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1574078003724#0.7327731619625379": {
|
|
| 186 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1574078003724#0.7327731619625379": {
|
|
| 187 | 187 | "count": 0,
|
| 188 | 188 | "editable": true,
|
| 189 | 189 | "enable": true,
|
| ... | ... | @@ -191,7 +191,7 @@ |
| 191 | 191 | "lastUpdateDate": "2019-11-18T12:53:23.724Z",
|
| 192 | 192 | "text": "[LL] observe.data.Data.program PSP Côte d\u0027Ivoire"
|
| 193 | 193 | },
|
| 194 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.ll.common.Program#1239832686139#0.1": {
|
|
| 194 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.ll.common.Program#1239832686139#0.1": {
|
|
| 195 | 195 | "count": 1,
|
| 196 | 196 | "editable": true,
|
| 197 | 197 | "enable": true,
|
| ... | ... | @@ -199,13 +199,13 @@ |
| 199 | 199 | "lastUpdateDate": "2018-10-23T14:13:42.902Z",
|
| 200 | 200 | "text": "[LL] observe.data.Data.program DCF Palangre (IRD)"
|
| 201 | 201 | },
|
| 202 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.ll.common.Program#1239832686139#0.1/fr.ird.data.ll.common.Trip#1573218053521#0.35390398604784334": {
|
|
| 202 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.ll.common.Program#1239832686139#0.1/fr.ird.data.ll.common.Trip#1573218053521#0.35390398604784334": {
|
|
| 203 | 203 | "editable": true,
|
| 204 | 204 | "id": "fr.ird.data.ll.common.Trip#1573218053521#0.35390398604784334",
|
| 205 | 205 | "lastUpdateDate": "2021-02-15T14:38:48.198Z",
|
| 206 | 206 | "text": "24/08/2018 - 04/11/2019 - observe.Common.none - Alain Lefranc"
|
| 207 | 207 | },
|
| 208 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1433499209304#0.771258150460199": {
|
|
| 208 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1433499209304#0.771258150460199": {
|
|
| 209 | 209 | "count": 0,
|
| 210 | 210 | "editable": true,
|
| 211 | 211 | "enable": true,
|
| ... | ... | @@ -213,7 +213,7 @@ |
| 213 | 213 | "lastUpdateDate": "2018-10-23T14:13:57.598Z",
|
| 214 | 214 | "text": "[LL] observe.data.Data.program TRAINING"
|
| 215 | 215 | },
|
| 216 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.2": {
|
|
| 216 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.2": {
|
|
| 217 | 217 | "count": 0,
|
| 218 | 218 | "editable": true,
|
| 219 | 219 | "enable": true,
|
| ... | ... | @@ -221,7 +221,7 @@ |
| 221 | 221 | "lastUpdateDate": "2018-10-23T14:14:14.666Z",
|
| 222 | 222 | "text": "[LL] observe.data.Data.program CAPPES"
|
| 223 | 223 | },
|
| 224 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.3": {
|
|
| 224 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.3": {
|
|
| 225 | 225 | "count": 0,
|
| 226 | 226 | "editable": true,
|
| 227 | 227 | "enable": false,
|
| ... | ... | @@ -229,7 +229,7 @@ |
| 229 | 229 | "lastUpdateDate": "2018-10-23T14:14:34.343Z",
|
| 230 | 230 | "text": "[LL] observe.data.Data.program CAPPER"
|
| 231 | 231 | },
|
| 232 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1476709649993#0.9593100746141565": {
|
|
| 232 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1476709649993#0.9593100746141565": {
|
|
| 233 | 233 | "count": 0,
|
| 234 | 234 | "editable": true,
|
| 235 | 235 | "enable": true,
|
| ... | ... | @@ -237,7 +237,7 @@ |
| 237 | 237 | "lastUpdateDate": "2016-12-06T15:54:27.727Z",
|
| 238 | 238 | "text": "[LL] observe.data.Data.program IFR"
|
| 239 | 239 | },
|
| 240 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1539251571663#0.10915739659024792": {
|
|
| 240 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1539251571663#0.10915739659024792": {
|
|
| 241 | 241 | "count": 0,
|
| 242 | 242 | "editable": true,
|
| 243 | 243 | "enable": true,
|
| ... | ... | @@ -245,7 +245,7 @@ |
| 245 | 245 | "lastUpdateDate": "2018-10-11T11:54:27.713Z",
|
| 246 | 246 | "text": "[LL] observe.data.Data.program DCF Palangre (CAPRUN)"
|
| 247 | 247 | },
|
| 248 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1540296800663#0.28879602188546094": {
|
|
| 248 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1540296800663#0.28879602188546094": {
|
|
| 249 | 249 | "count": 0,
|
| 250 | 250 | "editable": true,
|
| 251 | 251 | "enable": true,
|
| ... | ... | @@ -253,7 +253,7 @@ |
| 253 | 253 | "lastUpdateDate": "2018-10-23T14:13:20.660Z",
|
| 254 | 254 | "text": "[LL] observe.data.Data.program DCF Palangre (TAAF)"
|
| 255 | 255 | },
|
| 256 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.8": {
|
|
| 256 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.8": {
|
|
| 257 | 257 | "count": 0,
|
| 258 | 258 | "editable": true,
|
| 259 | 259 | "enable": false,
|
| ... | ... | @@ -261,7 +261,7 @@ |
| 261 | 261 | "lastUpdateDate": "2018-10-23T14:14:54.242Z",
|
| 262 | 262 | "text": "[LL] observe.data.Data.program EBAB"
|
| 263 | 263 | },
|
| 264 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1433499208418#0.603629674296826": {
|
|
| 264 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1433499208418#0.603629674296826": {
|
|
| 265 | 265 | "count": 0,
|
| 266 | 266 | "editable": true,
|
| 267 | 267 | "enable": false,
|
| ... | ... | @@ -269,7 +269,7 @@ |
| 269 | 269 | "lastUpdateDate": "2018-10-23T14:15:06.938Z",
|
| 270 | 270 | "text": "[LL] observe.data.Data.program ECOTEM"
|
| 271 | 271 | },
|
| 272 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.6": {
|
|
| 272 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.6": {
|
|
| 273 | 273 | "count": 0,
|
| 274 | 274 | "editable": true,
|
| 275 | 275 | "enable": false,
|
| ... | ... | @@ -277,7 +277,7 @@ |
| 277 | 277 | "lastUpdateDate": "2018-10-23T14:15:19.948Z",
|
| 278 | 278 | "text": "[LL] observe.data.Data.program IOSSS"
|
| 279 | 279 | },
|
| 280 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.5": {
|
|
| 280 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.5": {
|
|
| 281 | 281 | "count": 0,
|
| 282 | 282 | "editable": true,
|
| 283 | 283 | "enable": false,
|
| ... | ... | @@ -285,7 +285,7 @@ |
| 285 | 285 | "lastUpdateDate": "2018-10-23T14:15:40.781Z",
|
| 286 | 286 | "text": "[LL] observe.data.Data.program MADE"
|
| 287 | 287 | },
|
| 288 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.4": {
|
|
| 288 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.4": {
|
|
| 289 | 289 | "count": 0,
|
| 290 | 290 | "editable": true,
|
| 291 | 291 | "enable": true,
|
| ... | ... | @@ -293,7 +293,7 @@ |
| 293 | 293 | "lastUpdateDate": "2018-10-23T14:16:25.671Z",
|
| 294 | 294 | "text": "[LL] observe.data.Data.program PROSPER"
|
| 295 | 295 | },
|
| 296 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1433499208879#0.233676712261513": {
|
|
| 296 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1433499208879#0.233676712261513": {
|
|
| 297 | 297 | "count": 0,
|
| 298 | 298 | "editable": true,
|
| 299 | 299 | "enable": false,
|
| ... | ... | @@ -301,7 +301,7 @@ |
| 301 | 301 | "lastUpdateDate": "2018-10-23T14:16:38.434Z",
|
| 302 | 302 | "text": "[LL] observe.data.Data.program RAF"
|
| 303 | 303 | },
|
| 304 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1239832686139#0.7": {
|
|
| 304 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1239832686139#0.7": {
|
|
| 305 | 305 | "count": 0,
|
| 306 | 306 | "editable": true,
|
| 307 | 307 | "enable": false,
|
| ... | ... | @@ -309,7 +309,7 @@ |
| 309 | 309 | "lastUpdateDate": "2018-10-23T14:18:00.078Z",
|
| 310 | 310 | "text": "[LL] observe.data.Data.program SWIOFP"
|
| 311 | 311 | },
|
| 312 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.common.Program#1441272173250#0.22224648148214798": {
|
|
| 312 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.common.Program#1441272173250#0.22224648148214798": {
|
|
| 313 | 313 | "count": 0,
|
| 314 | 314 | "editable": true,
|
| 315 | 315 | "enable": true,
|
| ... | ... | @@ -317,7 +317,7 @@ |
| 317 | 317 | "lastUpdateDate": "2018-10-23T14:18:52.119Z",
|
| 318 | 318 | "text": "[LL] observe.data.Data.program SONDPAL (Parc Naturel Marin de Mayotte)"
|
| 319 | 319 | },
|
| 320 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.ll.common.Program#1508406051783#0.3774859341347857": {
|
|
| 320 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.ll.common.Program#1508406051783#0.3774859341347857": {
|
|
| 321 | 321 | "count": 1,
|
| 322 | 322 | "editable": true,
|
| 323 | 323 | "enable": true,
|
| ... | ... | @@ -325,7 +325,7 @@ |
| 325 | 325 | "lastUpdateDate": "2018-10-23T14:19:14.871Z",
|
| 326 | 326 | "text": "[LL] observe.data.Data.program DCF Palangre (Parc Naturel Marin de Mayotte)"
|
| 327 | 327 | },
|
| 328 | - "dataLlCommonTripGroupByObservationsProgram:fr.ird.referential.ll.common.Program#1508406051783#0.3774859341347857/fr.ird.data.ll.common.Trip#1547805002869#0.37785124313873586": {
|
|
| 328 | + "dataLlCommonTripGroupByObservationsProgram~fr.ird.referential.ll.common.Program#1508406051783#0.3774859341347857/fr.ird.data.ll.common.Trip#1547805002869#0.37785124313873586": {
|
|
| 329 | 329 | "editable": true,
|
| 330 | 330 | "id": "fr.ird.data.ll.common.Trip#1547805002869#0.37785124313873586",
|
| 331 | 331 | "lastUpdateDate": "2019-01-19T16:56:18.043Z",
|
| ... | ... | @@ -100,21 +100,21 @@ public class NavigationServiceFixtures extends GeneratedNavigationServiceFixture |
| 100 | 100 | @Override
|
| 101 | 101 | public void loadNavigationPath(ObserveServicesProvider servicesProvider, NavigationService service) {
|
| 102 | 102 | |
| 103 | - loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444", "loadPath.count0", "loadPath.count0.recursive");
|
|
| 104 | - loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837", "loadPath.count1", "loadPath.count1.recursive");
|
|
| 105 | - loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs", "loadPath.count2", "loadPath.count2.recursive");
|
|
| 106 | - loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs/fr.ird.data.ps.observation.Route#1343641087190#0.7801355724943301", "loadPath.count3", "loadPath.count3.recursive");
|
|
| 107 | - loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeLogbook", "loadPath.count4", "loadPath.count4.recursive");
|
|
| 103 | + loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444", "loadPath.count0", "loadPath.count0.recursive");
|
|
| 104 | + loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837", "loadPath.count1", "loadPath.count1.recursive");
|
|
| 105 | + loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs", "loadPath.count2", "loadPath.count2.recursive");
|
|
| 106 | + loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs/fr.ird.data.ps.observation.Route#1343641087190#0.7801355724943301", "loadPath.count3", "loadPath.count3.recursive");
|
|
| 107 | + loadNavigationPath(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeLogbook", "loadPath.count4", "loadPath.count4.recursive");
|
|
| 108 | 108 | }
|
| 109 | 109 | |
| 110 | 110 | // @Override
|
| 111 | 111 | // public void loadContent(ObserveServicesProvider servicesProvider, NavigationService service) {
|
| 112 | 112 | //
|
| 113 | -// loadContent(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444", "loadContent.count0");
|
|
| 114 | -// loadContent(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837", "loadContent.count1");
|
|
| 115 | -// loadContent(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs", "loadContent.count2");
|
|
| 116 | -// loadContent(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs/fr.ird.data.ps.observation.Route#1343641087190#0.7801355724943301", "loadContent.count3");
|
|
| 117 | -// loadContent(service, "dataPsCommonTripGroupByObservationsProgram:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeLogbook", "loadContent.count4");
|
|
| 113 | +// loadContent(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444", "loadContent.count0");
|
|
| 114 | +// loadContent(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837", "loadContent.count1");
|
|
| 115 | +// loadContent(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs", "loadContent.count2");
|
|
| 116 | +// loadContent(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeObs/fr.ird.data.ps.observation.Route#1343641087190#0.7801355724943301", "loadContent.count3");
|
|
| 117 | +// loadContent(service, "dataPsCommonTripGroupByObservationsProgram~fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444/fr.ird.data.ps.common.Trip#1343641056380#0.32424601977176837/routeLogbook", "loadContent.count4");
|
|
| 118 | 118 | //
|
| 119 | 119 | // loadContent(service, "referentialPsCommon/program", "loadContent.count0");
|
| 120 | 120 | // loadContent(service, "referentialPsCommon/program:fr.ird.referential.ps.common.Program#1239832686262#0.42751447061198444", "loadContent.count0");
|
| ... | ... | @@ -266,7 +266,7 @@ |
| 266 | 266 | <libversion.plexus-i18n>1.0-beta-10</libversion.plexus-i18n>
|
| 267 | 267 | <lib.version.dom4j>1.6.1</lib.version.dom4j>
|
| 268 | 268 | <lib.version.jts>1.20.0</lib.version.jts>
|
| 269 | - <lib.version.toolkit>10.0.1</lib.version.toolkit>
|
|
| 269 | + <lib.version.toolkit>10.0.2</lib.version.toolkit>
|
|
| 270 | 270 | <!-- >>> Sealed version -->
|
| 271 | 271 | <lib.version.log4j2>2.23.1</lib.version.log4j2>
|
| 272 | 272 | <plugin.version.site>4.0.0-M13</plugin.version.site>
|