diff --git a/CHANGELOG.md b/CHANGELOG.md index c3da5ae0d..a1a6caa13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ **New Features** * Added support for headers in JSON-Batch requets, enabling JSON-Patch requests in JSON-Batch requests. +**Internal changes & Bugfixes** +* Fixed #1754: resultTime/phenomenonTime mixup in MultiDatastream + ## Release version 2.2.0 diff --git a/Plugins/MultiDatastream/src/main/java/de/fraunhofer/iosb/ilt/frostserver/plugin/multidatastream/TableImpMultiDatastreams.java b/Plugins/MultiDatastream/src/main/java/de/fraunhofer/iosb/ilt/frostserver/plugin/multidatastream/TableImpMultiDatastreams.java index 1bba6f48d..51049cbfd 100644 --- a/Plugins/MultiDatastream/src/main/java/de/fraunhofer/iosb/ilt/frostserver/plugin/multidatastream/TableImpMultiDatastreams.java +++ b/Plugins/MultiDatastream/src/main/java/de/fraunhofer/iosb/ilt/frostserver/plugin/multidatastream/TableImpMultiDatastreams.java @@ -275,7 +275,7 @@ public void initProperties(final EntityFactories entityFactories) { new NFP<>(KEY_TIME_INTERVAL_END, table -> table.colPhenomenonTimeEnd)); pfReg.addEntryMap(ModelRegistry.EP_PROPERTIES, table -> table.colProperties); pfReg.addEntry(pluginCoreModel.epResultTimeDs, - new PropertyFieldRegistry.ConverterTimeInterval<>(pluginCoreModel.epPhenomenonTimeDs, table -> table.colResultTimeStart, table -> table.colResultTimeEnd), + new PropertyFieldRegistry.ConverterTimeInterval<>(pluginCoreModel.epResultTimeDs, table -> table.colResultTimeStart, table -> table.colResultTimeEnd), new NFP<>(KEY_TIME_INTERVAL_START, table -> table.colResultTimeStart), new NFP<>(KEY_TIME_INTERVAL_END, table -> table.colResultTimeEnd)); pfReg.addEntry(pluginMultiDatastream.getEpUnitOfMeasurements(), table -> table.colUnitOfMeasurements,