[Git][ultreiaio/ird-observe][develop] 3 commits: fix missing dependency

24 Nov 2021


      Tony CHEMIT pushed to branch develop at

Commits: 4c9a0f43 by Tony Chemit at 2021-11-24T01:14:26+0 fix missing dependency

- - - - - 951ff586 by Tony Chemit at 2021-11-24T01:50:23+0 Correction de quelques incohérences sur

- - - - - ecf8995d by Tony Chemit at 2021-11-24T02:59:53+0 Affichage de l'arbre, souci sur le

- - - - -

6 changed files:

- pom.xml - server/core/src/main/filtered-resources/META-I - services/api/pom.xml - services/api/src/main/java/fr/ird/observe/serv - services/local-impl/pom.xml - services/local-impl/src/main/java/fr/ird/obser

Changes:

===================================== pom.xml ===================================== @@ -284,6 +284,11 @@ <artifactId>flexmark-util</artifa <version>${lib.version.flexmark}< </dependency> +      <dependency> +        <groupId>com.vladsch.flexmark</gr +        <artifactId>flexmark-util-misc</a +        <version>${lib.version.flexmark}< +      </dependency> <dependency> <groupId>com.vladsch.flexmark</gr <artifactId>flexmark-util-ast</ar @@ -336,7 +341,6 @@ <artifactId>toolkit-dto</artifact <version>${lib.version.toolkit}</ </dependency> -      <!-- Toolkit --> <dependency> <groupId>fr.ird.observe</groupId> <artifactId>toolkit-i18n</artifac @@ -1022,12 +1026,6 @@ <artifactId>swingx-painters</arti <version>${lib.version.swingx}</v </dependency> -      <dependency> -        <groupId>com.vladsch.flexmark</gr -        <artifactId>flexmark-util-misc</a -        <version>${lib.version.flexmark}< -        <scope>provided</scope> -      </dependency> <dependency> <groupId>io.ultreia.java4all.decorat <artifactId>decorator-spi</artifa

===================================== server/core/src/main/filtered-resources/META-INF ===================================== @@ -36,7 +36,7 @@ GET    /data/ps/common/GearUse GET    /data/ps/common/Trip POST   /data/ps/common/Trip PUT    /data/ps/common/Trip?id={} -DELETE /data/ps/common/Trip +DELETE /data/ps/common/Trip?id={}

# Data : fr.ird.observe.entities.data.ps.observ GET    /data/ps/observation/Activity @@ -141,7 +141,7 @@ GET    /data/ll/common/GearU GET    /data/ll/common/Trip POST   /data/ll/common/Trip PUT    /data/ll/common/Trip?id={} -DELETE /data/ll/common/Trip +DELETE /data/ll/common/Trip?id={}

# Data : fr.ird.observe.entities.data.ll.observ GET    /data/ll/observation/Activity @@ -235,138 +235,165 @@ GET    /referential/common/common

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Country -PUT    /referential/common/Country?id={} -POST   /referential/common/Country +POST   /referential/common/Country +PUT    /referential/common/Country?id={} +DELETE /referential/common/Country?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/DataQuality -PUT    /referential/common/DataQuality?id={} -POST   /referential/common/DataQuality +POST   /referential/common/DataQuality +PUT    /referential/common/DataQuality?id={} +DELETE /referential/common/DataQuality?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/FpaZone -PUT    /referential/common/FpaZone?id={} -POST   /referential/common/FpaZone +POST   /referential/common/FpaZone +PUT    /referential/common/FpaZone?id={} +DELETE /referential/common/FpaZone?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Gear -PUT    /referential/common/Gear?id={} -POST   /referential/common/Gear +POST   /referential/common/Gear +PUT    /referential/common/Gear?id={} +DELETE /referential/common/Gear?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/GearCharacteristic -PUT    /referential/common/GearCharacteristic?id={} -POST   /referential/common/GearCharacteristic +POST   /referential/common/GearCharacteristic +PUT    /referential/common/GearCharacteristic?id={} +DELETE /referential/common/GearCharacteristic?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/GearCharacteristicType -PUT    /referential/common/GearCharacteristicType?id={} -POST   /referential/common/GearCharacteristicType +POST   /referential/common/GearCharacteristicType +PUT    /referential/common/GearCharacteristicType?id={} +DELETE /referential/common/GearCharacteristicType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Harbour -PUT    /referential/common/Harbour?id={} -POST   /referential/common/Harbour +POST   /referential/common/Harbour +PUT    /referential/common/Harbour?id={} +DELETE /referential/common/Harbour?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/LengthLengthParameter -PUT    /referential/common/LengthLengthParameter?id={} -POST   /referential/common/LengthLengthParameter +POST   /referential/common/LengthLengthParameter +PUT    /referential/common/LengthLengthParameter?id={} +DELETE /referential/common/LengthLengthParameter?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/LengthMeasureMethod -PUT    /referential/common/LengthMeasureMethod?id={} -POST   /referential/common/LengthMeasureMethod +POST   /referential/common/LengthMeasureMethod +PUT    /referential/common/LengthMeasureMethod?id={} +DELETE /referential/common/LengthMeasureMethod?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/LengthWeightParameter -PUT    /referential/common/LengthWeightParameter?id={} -POST   /referential/common/LengthWeightParameter +POST   /referential/common/LengthWeightParameter +PUT    /referential/common/LengthWeightParameter?id={} +DELETE /referential/common/LengthWeightParameter?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Ocean -PUT    /referential/common/Ocean?id={} -POST   /referential/common/Ocean +POST   /referential/common/Ocean +PUT    /referential/common/Ocean?id={} +DELETE /referential/common/Ocean?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Organism -PUT    /referential/common/Organism?id={} -POST   /referential/common/Organism +POST   /referential/common/Organism +PUT    /referential/common/Organism?id={} +DELETE /referential/common/Organism?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Person -PUT    /referential/common/Person?id={} -POST   /referential/common/Person +POST   /referential/common/Person +PUT    /referential/common/Person?id={} +DELETE /referential/common/Person?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Program -PUT    /referential/common/Program?id={} -POST   /referential/common/Program +POST   /referential/common/Program +PUT    /referential/common/Program?id={} +DELETE /referential/common/Program?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Sex -PUT    /referential/common/Sex?id={} -POST   /referential/common/Sex +POST   /referential/common/Sex +PUT    /referential/common/Sex?id={} +DELETE /referential/common/Sex?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/ShipOwner -PUT    /referential/common/ShipOwner?id={} -POST   /referential/common/ShipOwner +POST   /referential/common/ShipOwner +PUT    /referential/common/ShipOwner?id={} +DELETE /referential/common/ShipOwner?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/SizeMeasureType -PUT    /referential/common/SizeMeasureType?id={} -POST   /referential/common/SizeMeasureType +POST   /referential/common/SizeMeasureType +PUT    /referential/common/SizeMeasureType?id={} +DELETE /referential/common/SizeMeasureType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Species -PUT    /referential/common/Species?id={} -POST   /referential/common/Species +POST   /referential/common/Species +PUT    /referential/common/Species?id={} +DELETE /referential/common/Species?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/SpeciesGroup -PUT    /referential/common/SpeciesGroup?id={} -POST   /referential/common/SpeciesGroup +POST   /referential/common/SpeciesGroup +PUT    /referential/common/SpeciesGroup?id={} +DELETE /referential/common/SpeciesGroup?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/SpeciesGroupReleaseMode -PUT    /referential/common/SpeciesGroupReleaseMode?id={} -POST   /referential/common/SpeciesGroupReleaseMode +POST   /referential/common/SpeciesGroupReleaseMode +PUT    /referential/common/SpeciesGroupReleaseMode?id={} +DELETE /referential/common/SpeciesGroupReleaseMode?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/SpeciesList -PUT    /referential/common/SpeciesList?id={} -POST   /referential/common/SpeciesList +POST   /referential/common/SpeciesList +PUT    /referential/common/SpeciesList?id={} +DELETE /referential/common/SpeciesList?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Vessel -PUT    /referential/common/Vessel?id={} -POST   /referential/common/Vessel +POST   /referential/common/Vessel +PUT    /referential/common/Vessel?id={} +DELETE /referential/common/Vessel?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/VesselSizeCategory -PUT    /referential/common/VesselSizeCategory?id={} -POST   /referential/common/VesselSizeCategory +POST   /referential/common/VesselSizeCategory +PUT    /referential/common/VesselSizeCategory?id={} +DELETE /referential/common/VesselSizeCategory?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/VesselType -PUT    /referential/common/VesselType?id={} -POST   /referential/common/VesselType +POST   /referential/common/VesselType +PUT    /referential/common/VesselType?id={} +DELETE /referential/common/VesselType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/WeightMeasureMethod -PUT    /referential/common/WeightMeasureMethod?id={} -POST   /referential/common/WeightMeasureMethod +POST   /referential/common/WeightMeasureMethod +PUT    /referential/common/WeightMeasureMethod?id={} +DELETE /referential/common/WeightMeasureMethod?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/WeightMeasureType -PUT    /referential/common/WeightMeasureType?id={} -POST   /referential/common/WeightMeasureType +POST   /referential/common/WeightMeasureType +PUT    /referential/common/WeightMeasureType?id={} +DELETE /referential/common/WeightMeasureType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/common/Wind -PUT    /referential/common/Wind?id={} -POST   /referential/common/Wind +POST   /referential/common/Wind +PUT    /referential/common/Wind?id={} +DELETE /referential/common/Wind?id={}

# Referential : referential/ps GET    /referential/ps @@ -376,185 +403,219 @@ GET    /referential/ps/common

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/AcquisitionStatus -PUT    /referential/ps/common/AcquisitionStatus?id={} -POST   /referential/ps/common/AcquisitionStatus +POST   /referential/ps/common/AcquisitionStatus +PUT    /referential/ps/common/AcquisitionStatus?id={} +DELETE /referential/ps/common/AcquisitionStatus?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/ObjectMaterial -PUT    /referential/ps/common/ObjectMaterial?id={} -POST   /referential/ps/common/ObjectMaterial +POST   /referential/ps/common/ObjectMaterial +PUT    /referential/ps/common/ObjectMaterial?id={} +DELETE /referential/ps/common/ObjectMaterial?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/ObjectMaterialType -PUT    /referential/ps/common/ObjectMaterialType?id={} -POST   /referential/ps/common/ObjectMaterialType +POST   /referential/ps/common/ObjectMaterialType +PUT    /referential/ps/common/ObjectMaterialType?id={} +DELETE /referential/ps/common/ObjectMaterialType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/ObjectOperation -PUT    /referential/ps/common/ObjectOperation?id={} -POST   /referential/ps/common/ObjectOperation +POST   /referential/ps/common/ObjectOperation +PUT    /referential/ps/common/ObjectOperation?id={} +DELETE /referential/ps/common/ObjectOperation?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/ObservedSystem -PUT    /referential/ps/common/ObservedSystem?id={} -POST   /referential/ps/common/ObservedSystem +POST   /referential/ps/common/ObservedSystem +PUT    /referential/ps/common/ObservedSystem?id={} +DELETE /referential/ps/common/ObservedSystem?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/ReasonForNoFishing -PUT    /referential/ps/common/ReasonForNoFishing?id={} -POST   /referential/ps/common/ReasonForNoFishing +POST   /referential/ps/common/ReasonForNoFishing +PUT    /referential/ps/common/ReasonForNoFishing?id={} +DELETE /referential/ps/common/ReasonForNoFishing?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/ReasonForNullSet -PUT    /referential/ps/common/ReasonForNullSet?id={} -POST   /referential/ps/common/ReasonForNullSet +POST   /referential/ps/common/ReasonForNullSet +PUT    /referential/ps/common/ReasonForNullSet?id={} +DELETE /referential/ps/common/ReasonForNullSet?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/SampleType -PUT    /referential/ps/common/SampleType?id={} -POST   /referential/ps/common/SampleType +POST   /referential/ps/common/SampleType +PUT    /referential/ps/common/SampleType?id={} +DELETE /referential/ps/common/SampleType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/SchoolType -PUT    /referential/ps/common/SchoolType?id={} -POST   /referential/ps/common/SchoolType +POST   /referential/ps/common/SchoolType +PUT    /referential/ps/common/SchoolType?id={} +DELETE /referential/ps/common/SchoolType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/SpeciesFate -PUT    /referential/ps/common/SpeciesFate?id={} -POST   /referential/ps/common/SpeciesFate +POST   /referential/ps/common/SpeciesFate +PUT    /referential/ps/common/SpeciesFate?id={} +DELETE /referential/ps/common/SpeciesFate?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/TransmittingBuoyOperation -PUT    /referential/ps/common/TransmittingBuoyO -POST   /referential/ps/common/TransmittingBuoyOperation +POST   /referential/ps/common/TransmittingBuoyOperation +PUT    /referential/ps/common/TransmittingBuoyO +DELETE /referential/ps/common/TransmittingBuoyO

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/TransmittingBuoyOwnership -PUT    /referential/ps/common/TransmittingBuoyO -POST   /referential/ps/common/TransmittingBuoyOwnership +POST   /referential/ps/common/TransmittingBuoyOwnership +PUT    /referential/ps/common/TransmittingBuoyO +DELETE /referential/ps/common/TransmittingBuoyO

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/TransmittingBuoyType -PUT    /referential/ps/common/TransmittingBuoyType?id={} -POST   /referential/ps/common/TransmittingBuoyType +POST   /referential/ps/common/TransmittingBuoyType +PUT    /referential/ps/common/TransmittingBuoyType?id={} +DELETE /referential/ps/common/TransmittingBuoyType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/VesselActivity -PUT    /referential/ps/common/VesselActivity?id={} -POST   /referential/ps/common/VesselActivity +POST   /referential/ps/common/VesselActivity +PUT    /referential/ps/common/VesselActivity?id={} +DELETE /referential/ps/common/VesselActivity?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/common/WeightCategory -PUT    /referential/ps/common/WeightCategory?id={} -POST   /referential/ps/common/WeightCategory +POST   /referential/ps/common/WeightCategory +PUT    /referential/ps/common/WeightCategory?id={} +DELETE /referential/ps/common/WeightCategory?id={}

# Referential : referential/ps/observation GET    /referential/ps/observation

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/observation/DetectionMode -PUT    /referential/ps/observation/DetectionMode?id={} -POST   /referential/ps/observation/DetectionMode +POST   /referential/ps/observation/DetectionMode +PUT    /referential/ps/observation/DetectionMode?id={} +DELETE /referential/ps/observation/DetectionMode?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/observation/InformationSource -PUT    /referential/ps/observation/InformationSource?id={} -POST   /referential/ps/observation/InformationSource +POST   /referential/ps/observation/InformationSource +PUT    /referential/ps/observation/InformationSource?id={} +DELETE /referential/ps/observation/InformationSource?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/observation/NonTargetCat -PUT    /referential/ps/observation/NonTargetCat -POST   /referential/ps/observation/NonTargetCat +POST   /referential/ps/observation/NonTargetCat +PUT    /referential/ps/observation/NonTargetCat +DELETE /referential/ps/observation/NonTargetCat

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/observation/NonTargetCat -PUT    /referential/ps/observation/NonTargetCat -POST   /referential/ps/observation/NonTargetCat +POST   /referential/ps/observation/NonTargetCat +PUT    /referential/ps/observation/NonTargetCat +DELETE /referential/ps/observation/NonTargetCat

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/observation/NonTargetCat -PUT    /referential/ps/observation/NonTargetCat -POST   /referential/ps/observation/NonTargetCat +POST   /referential/ps/observation/NonTargetCat +PUT    /referential/ps/observation/NonTargetCat +DELETE /referential/ps/observation/NonTargetCat

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/observation/ReasonForDiscard -PUT    /referential/ps/observation/ReasonForDiscard?id={} -POST   /referential/ps/observation/ReasonForDiscard +POST   /referential/ps/observation/ReasonForDiscard +PUT    /referential/ps/observation/ReasonForDiscard?id={} +DELETE /referential/ps/observation/ReasonForDiscard?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/observation/SpeciesStatus -PUT    /referential/ps/observation/SpeciesStatus?id={} -POST   /referential/ps/observation/SpeciesStatus +POST   /referential/ps/observation/SpeciesStatus +PUT    /referential/ps/observation/SpeciesStatus?id={} +DELETE /referential/ps/observation/SpeciesStatus?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/observation/SurroundingActivity -PUT    /referential/ps/observation/SurroundingActivity?id={} -POST   /referential/ps/observation/SurroundingActivity +POST   /referential/ps/observation/SurroundingActivity +PUT    /referential/ps/observation/SurroundingActivity?id={} +DELETE /referential/ps/observation/SurroundingActivity?id={}

# Referential : referential/ps/logbook GET    /referential/ps/logbook

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/logbook/InformationSource -PUT    /referential/ps/logbook/InformationSource?id={} -POST   /referential/ps/logbook/InformationSource +POST   /referential/ps/logbook/InformationSource +PUT    /referential/ps/logbook/InformationSource?id={} +DELETE /referential/ps/logbook/InformationSource?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/logbook/SampleQuality -PUT    /referential/ps/logbook/SampleQuality?id={} -POST   /referential/ps/logbook/SampleQuality +POST   /referential/ps/logbook/SampleQuality +PUT    /referential/ps/logbook/SampleQuality?id={} +DELETE /referential/ps/logbook/SampleQuality?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/logbook/SetSuccessStatus -PUT    /referential/ps/logbook/SetSuccessStatus?id={} -POST   /referential/ps/logbook/SetSuccessStatus +POST   /referential/ps/logbook/SetSuccessStatus +PUT    /referential/ps/logbook/SetSuccessStatus?id={} +DELETE /referential/ps/logbook/SetSuccessStatus?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/logbook/WellContentStatus -PUT    /referential/ps/logbook/WellContentStatus?id={} -POST   /referential/ps/logbook/WellContentStatus +POST   /referential/ps/logbook/WellContentStatus +PUT    /referential/ps/logbook/WellContentStatus?id={} +DELETE /referential/ps/logbook/WellContentStatus?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/logbook/WellSamplingConformity -PUT    /referential/ps/logbook/WellSamplingConformity?id={} -POST   /referential/ps/logbook/WellSamplingConformity +POST   /referential/ps/logbook/WellSamplingConformity +PUT    /referential/ps/logbook/WellSamplingConformity?id={} +DELETE /referential/ps/logbook/WellSamplingConformity?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/logbook/WellSamplingStatus -PUT    /referential/ps/logbook/WellSamplingStatus?id={} -POST   /referential/ps/logbook/WellSamplingStatus +POST   /referential/ps/logbook/WellSamplingStatus +PUT    /referential/ps/logbook/WellSamplingStatus?id={} +DELETE /referential/ps/logbook/WellSamplingStatus?id={}

# Referential : referential/ps/landing GET    /referential/ps/landing

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/landing/Destination -PUT    /referential/ps/landing/Destination?id={} -POST   /referential/ps/landing/Destination +POST   /referential/ps/landing/Destination +PUT    /referential/ps/landing/Destination?id={} +DELETE /referential/ps/landing/Destination?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/landing/Fate -PUT    /referential/ps/landing/Fate?id={} -POST   /referential/ps/landing/Fate +POST   /referential/ps/landing/Fate +PUT    /referential/ps/landing/Fate?id={} +DELETE /referential/ps/landing/Fate?id={}

# Referential : referential/ps/localmarket GET    /referential/ps/localmarket

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/localmarket/BatchComposition -PUT    /referential/ps/localmarket/BatchComposition?id={} -POST   /referential/ps/localmarket/BatchComposition +POST   /referential/ps/localmarket/BatchComposition +PUT    /referential/ps/localmarket/BatchComposition?id={} +DELETE /referential/ps/localmarket/BatchComposition?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/localmarket/BatchWeightType -PUT    /referential/ps/localmarket/BatchWeightType?id={} -POST   /referential/ps/localmarket/BatchWeightType +POST   /referential/ps/localmarket/BatchWeightType +PUT    /referential/ps/localmarket/BatchWeightType?id={} +DELETE /referential/ps/localmarket/BatchWeightType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ps/localmarket/Packaging -PUT    /referential/ps/localmarket/Packaging?id={} -POST   /referential/ps/localmarket/Packaging +POST   /referential/ps/localmarket/Packaging +PUT    /referential/ps/localmarket/Packaging?id={} +DELETE /referential/ps/localmarket/Packaging?id={}

# Referential : referential/ll GET    /referential/ll @@ -564,151 +625,180 @@ GET    /referential/ll/common

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/BaitSettingStatus -PUT    /referential/ll/common/BaitSettingStatus?id={} -POST   /referential/ll/common/BaitSettingStatus +POST   /referential/ll/common/BaitSettingStatus +PUT    /referential/ll/common/BaitSettingStatus?id={} +DELETE /referential/ll/common/BaitSettingStatus?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/BaitType -PUT    /referential/ll/common/BaitType?id={} -POST   /referential/ll/common/BaitType +POST   /referential/ll/common/BaitType +PUT    /referential/ll/common/BaitType?id={} +DELETE /referential/ll/common/BaitType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/CatchFate -PUT    /referential/ll/common/CatchFate?id={} -POST   /referential/ll/common/CatchFate +POST   /referential/ll/common/CatchFate +PUT    /referential/ll/common/CatchFate?id={} +DELETE /referential/ll/common/CatchFate?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/HealthStatus -PUT    /referential/ll/common/HealthStatus?id={} -POST   /referential/ll/common/HealthStatus +POST   /referential/ll/common/HealthStatus +PUT    /referential/ll/common/HealthStatus?id={} +DELETE /referential/ll/common/HealthStatus?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/HookSize -PUT    /referential/ll/common/HookSize?id={} -POST   /referential/ll/common/HookSize +POST   /referential/ll/common/HookSize +PUT    /referential/ll/common/HookSize?id={} +DELETE /referential/ll/common/HookSize?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/HookType -PUT    /referential/ll/common/HookType?id={} -POST   /referential/ll/common/HookType +POST   /referential/ll/common/HookType +PUT    /referential/ll/common/HookType?id={} +DELETE /referential/ll/common/HookType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/LightsticksColor -PUT    /referential/ll/common/LightsticksColor?id={} -POST   /referential/ll/common/LightsticksColor +POST   /referential/ll/common/LightsticksColor +PUT    /referential/ll/common/LightsticksColor?id={} +DELETE /referential/ll/common/LightsticksColor?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/LightsticksType -PUT    /referential/ll/common/LightsticksType?id={} -POST   /referential/ll/common/LightsticksType +POST   /referential/ll/common/LightsticksType +PUT    /referential/ll/common/LightsticksType?id={} +DELETE /referential/ll/common/LightsticksType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/LineType -PUT    /referential/ll/common/LineType?id={} -POST   /referential/ll/common/LineType +POST   /referential/ll/common/LineType +PUT    /referential/ll/common/LineType?id={} +DELETE /referential/ll/common/LineType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/MitigationType -PUT    /referential/ll/common/MitigationType?id={} -POST   /referential/ll/common/MitigationType +POST   /referential/ll/common/MitigationType +PUT    /referential/ll/common/MitigationType?id={} +DELETE /referential/ll/common/MitigationType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/ObservationMethod -PUT    /referential/ll/common/ObservationMethod?id={} -POST   /referential/ll/common/ObservationMethod +POST   /referential/ll/common/ObservationMethod +PUT    /referential/ll/common/ObservationMethod?id={} +DELETE /referential/ll/common/ObservationMethod?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/OnBoardProcessing -PUT    /referential/ll/common/OnBoardProcessing?id={} -POST   /referential/ll/common/OnBoardProcessing +POST   /referential/ll/common/OnBoardProcessing +PUT    /referential/ll/common/OnBoardProcessing?id={} +DELETE /referential/ll/common/OnBoardProcessing?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/SettingShape -PUT    /referential/ll/common/SettingShape?id={} -POST   /referential/ll/common/SettingShape +POST   /referential/ll/common/SettingShape +PUT    /referential/ll/common/SettingShape?id={} +DELETE /referential/ll/common/SettingShape?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/TripType -PUT    /referential/ll/common/TripType?id={} -POST   /referential/ll/common/TripType +POST   /referential/ll/common/TripType +PUT    /referential/ll/common/TripType?id={} +DELETE /referential/ll/common/TripType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/VesselActivity -PUT    /referential/ll/common/VesselActivity?id={} -POST   /referential/ll/common/VesselActivity +POST   /referential/ll/common/VesselActivity +PUT    /referential/ll/common/VesselActivity?id={} +DELETE /referential/ll/common/VesselActivity?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/common/WeightDeterminationMethod -PUT    /referential/ll/common/WeightDeterminati -POST   /referential/ll/common/WeightDeterminationMethod +POST   /referential/ll/common/WeightDeterminationMethod +PUT    /referential/ll/common/WeightDeterminati +DELETE /referential/ll/common/WeightDeterminati

# Referential : referential/ll/observation GET    /referential/ll/observation

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/observation/BaitHaulingStatus -PUT    /referential/ll/observation/BaitHaulingStatus?id={} -POST   /referential/ll/observation/BaitHaulingStatus +POST   /referential/ll/observation/BaitHaulingStatus +PUT    /referential/ll/observation/BaitHaulingStatus?id={} +DELETE /referential/ll/observation/BaitHaulingStatus?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/observation/EncounterType -PUT    /referential/ll/observation/EncounterType?id={} -POST   /referential/ll/observation/EncounterType +POST   /referential/ll/observation/EncounterType +PUT    /referential/ll/observation/EncounterType?id={} +DELETE /referential/ll/observation/EncounterType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/observation/HookPosition -PUT    /referential/ll/observation/HookPosition?id={} -POST   /referential/ll/observation/HookPosition +POST   /referential/ll/observation/HookPosition +PUT    /referential/ll/observation/HookPosition?id={} +DELETE /referential/ll/observation/HookPosition?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/observation/ItemHorizontalPosition -PUT    /referential/ll/observation/ItemHorizont -POST   /referential/ll/observation/ItemHorizontalPosition +POST   /referential/ll/observation/ItemHorizontalPosition +PUT    /referential/ll/observation/ItemHorizont +DELETE /referential/ll/observation/ItemHorizont

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/observation/ItemVerticalPosition -PUT    /referential/ll/observation/ItemVertical -POST   /referential/ll/observation/ItemVerticalPosition +POST   /referential/ll/observation/ItemVerticalPosition +PUT    /referential/ll/observation/ItemVertical +DELETE /referential/ll/observation/ItemVertical

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/observation/MaturityStatus -PUT    /referential/ll/observation/MaturityStatus?id={} -POST   /referential/ll/observation/MaturityStatus +POST   /referential/ll/observation/MaturityStatus +PUT    /referential/ll/observation/MaturityStatus?id={} +DELETE /referential/ll/observation/MaturityStatus?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/observation/SensorBrand -PUT    /referential/ll/observation/SensorBrand?id={} -POST   /referential/ll/observation/SensorBrand +POST   /referential/ll/observation/SensorBrand +PUT    /referential/ll/observation/SensorBrand?id={} +DELETE /referential/ll/observation/SensorBrand?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/observation/SensorDataFormat -PUT    /referential/ll/observation/SensorDataFormat?id={} -POST   /referential/ll/observation/SensorDataFormat +POST   /referential/ll/observation/SensorDataFormat +PUT    /referential/ll/observation/SensorDataFormat?id={} +DELETE /referential/ll/observation/SensorDataFormat?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/observation/SensorType -PUT    /referential/ll/observation/SensorType?id={} -POST   /referential/ll/observation/SensorType +POST   /referential/ll/observation/SensorType +PUT    /referential/ll/observation/SensorType?id={} +DELETE /referential/ll/observation/SensorType?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/observation/StomachFullness -PUT    /referential/ll/observation/StomachFullness?id={} -POST   /referential/ll/observation/StomachFullness +POST   /referential/ll/observation/StomachFullness +PUT    /referential/ll/observation/StomachFullness?id={} +DELETE /referential/ll/observation/StomachFullness?id={}

# Referential : referential/ll/landing GET    /referential/ll/landing

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/landing/Company -PUT    /referential/ll/landing/Company?id={} -POST   /referential/ll/landing/Company +POST   /referential/ll/landing/Company +PUT    /referential/ll/landing/Company?id={} +DELETE /referential/ll/landing/Company?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/landing/Conservation -PUT    /referential/ll/landing/Conservation?id={} -POST   /referential/ll/landing/Conservation +POST   /referential/ll/landing/Conservation +PUT    /referential/ll/landing/Conservation?id={} +DELETE /referential/ll/landing/Conservation?id={}

# Referential : fr.ird.observe.entities.referen GET    /referential/ll/landing/DataSource -PUT    /referential/ll/landing/DataSource?id={} -POST   /referential/ll/landing/DataSource +POST   /referential/ll/landing/DataSource +PUT    /referential/ll/landing/DataSource?id={} +DELETE /referential/ll/landing/DataSource?id={}

===================================== services/api/pom.xml ===================================== @@ -98,11 +98,6 @@ <artifactId>auto-service</artifactI <scope>provided</scope> </dependency> -    <dependency> -      <groupId>com.vladsch.flexmark</grou -      <artifactId>flexmark-util-misc</art -      <scope>provided</scope> -    </dependency> <dependency> <groupId>fr.ird.observe</groupId> <artifactId>toolkit-navigation</art @@ -119,6 +114,11 @@ <version>${project.version}</versio <scope>runtime</scope> </dependency> +    <dependency> +      <groupId>com.vladsch.flexmark</grou +      <artifactId>flexmark-util</artifact +      <scope>runtime</scope> +    </dependency> <dependency> <groupId>io.ultreia.java4all.topia< <artifactId>persistence</artifactId

===================================== services/api/src/main/java/fr/ird/observe/servic ===================================== @@ -25,12 +25,8 @@ package fr.ird.observe.servic import fr.ird.observe.dto.ObserveDto; import fr.ird.observe.dto.referential.Referenti import fr.ird.observe.dto.referential.common.Pr -import fr.ird.observe.spi.module.ObserveBusines

import java.util.Date; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import java.util.Set;

@@ -44,10 +40,10 @@ public class NavigationResult

private final Set<ProgramReference> private final Map<String, Integer> -    private final List<Long> referentialCoun +    private final Map<Class<? extends private final Date timestamp;

-    public NavigationResult(Date timestamp, +    public NavigationResult(Date timestamp, this.timestamp = timestamp; this.programs = programs; this.tripCountByProgram = tripCountByPr @@ -62,16 +58,8 @@ public class NavigationResult return tripCountByProgram; }

-    public List<Long> getReferentialCount() -        return referentialCount; -    } - public Map<Class<? extends ReferentialDto>, -        Set<Class<? extends ReferentialDto>> -        Map<Class<? extends ReferentialDto>, -        Iterator<Long> iterator = referentia -        referentialTypes.forEach(referentialType -        return result; +        return referentialCount; }

public Date getTimestamp() {

===================================== services/local-impl/pom.xml ===================================== @@ -43,6 +43,11 @@ <artifactId>models-navigation-java< <version>${project.version}</versio </dependency> +    <dependency> +      <groupId>com.vladsch.flexmark</grou +      <artifactId>flexmark-util-misc</art +      <scope>runtime</scope> +    </dependency> <dependency> <groupId>${project.groupId}</groupI <artifactId>models-persistence-avdth&l

===================================== services/local-impl/src/main/java/fr/ird/observe ===================================== @@ -35,13 +35,12 @@ import org.apache.logging.lo

import java.util.Collections; import java.util.Date; +import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.TreeMap; -import java.util.stream.Collectors;

/** * Created on 22/11/16. @@ -85,9 +84,10 @@ class NavigationServiceLocalSupport log.info(String.format("Found log.info(String.format("Found Set<Class<? extends ReferentialDto>> -        List<Long> referentialCount +        Map<Class<? extends ReferentialDto>, +        referentialTypes.forEach(t -> log.info(String.format("Found -        return new NavigationResult(timestamp, +        return new NavigationResult(timestamp, }

@Override

View it on GitLab:  l).sum())); referentialTypes = ObserveBusinessProject.get().getReferentialTypes(); = referentialTypes.stream().map(this::countReferential).collect(Collectors.toList()); Long> referentialCount = new LinkedHashMap<>(); referentialCount.put(t, countReferential(t))); %d referential type(s).", referentialCount.size())); programs, tripCountByProgram, referentialCount); programs, tripCountByProgram, Map.copyOf(referentialCount)); s://gitlab.com/ultreiaio/ird-observe/-/compare/970ba3e58a86c5693fc2e2f0049b1fe06e2b403d...ecf8995d4b2471cb7e4ee6043fa3e32989adf76b">https://gitlab.com/ultreiaio/ird-observe/-/compare/970ba3e58a86c5693fc2e2f00... s://gitlab.com/ultreiaio/ird-observe/-/compare/970ba3e58a86c5693fc2e2f0049b1fe06e2b403d...ecf8995d4b2471cb7e4ee6043fa3e32989adf76b">https://gitlab.com/ultreiaio/ird-observe/-/compare/970ba3e58a86c5693fc2e2f00... your account on gitlab.com.

    

Tony CHEMIT (＠tchemit)

tags

participants (1)