Skip to content

Changes

Started 2 yr 4 mo ago
Took 5.9 sec
SensorThings MQTT: Queue notifications to keep their order

Integration tests were failing because sensiNact notifications and their
handling were done in (at least) 2 threads, meaning that the order of
sending of notification couldn't be guaranteed.

This commit uses a single thread that handles the publication of
messages in the same order as the notifications, still using multiple
threads to handle notifications and payload generation.
(commit: 8c06435)
thomas.calmant at
Package regsitration and Model Package Uri

Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz>
(commit: b36801f)
southbound/http/http-callback-whiteboard/integration-test.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/command/impl/ActionHandler.java core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/UriParam.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/SetMethod.java southbound/history/timescale-provider/src/test/java/org/eclipse/sensinact/gateway/southbound/history/timescale/integration/TimescaleHistoryTest.java core/impl/src/main/java/org/eclipse/sensinact/core/model/nexus/emf/compare/EMFCompareUtil.java northbound/rest/integration-test.bndrun distribution/features/core-feature/src/main/resources/core-feature.json northbound/filters/ldap/integration-test.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/impl/SetValueCommand.java core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/dto/ModelPackageUri.java distribution/launcher/pom.xml core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/ACT.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java core/api/src/main/java/org/eclipse/sensinact/core/command/ResourceCommand.java core/impl/src/main/java/org/eclipse/sensinact/core/command/impl/ResourcePushHandler.java core/impl/src/main/java/org/eclipse/sensinact/core/model/nexus/emf/EMFUtil.java core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/GET.java southbound/http/http-device-factory/integration-test.bndrun core/impl/src/test/java/org/eclipse/sensinact/core/twin/impl/SensinactTwinTest.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/RegistryKey.java core/impl/src/test/java/org/eclipse/sensinact/core/model/nexus/impl/SubscriptionTest.java core/api/dependency-check.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/dto/impl/AbstractUpdateDto.java core/models/provider/src/main/resources/model/sensinact.ecore core/impl/src/main/java/org/eclipse/sensinact/core/model/nexus/ModelNexus.java core/impl/src/main/java/org/eclipse/sensinact/core/notification/impl/ImmediateNotificationAccumulator.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/SensinactWhiteboard.java core/impl/src/test/java/org/eclipse/sensinact/core/extract/impl/AnnotationBasedDtoExtractorTest.java core/impl/src/test/java/org/eclipse/sensinact/core/model/nexus/impl/NexusTest.java core/impl/src/main/java/org/eclipse/sensinact/core/command/impl/ResourcePullHandler.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/ActMethod.java core/impl/src/main/java/org/eclipse/sensinact/core/twin/impl/SensinactProviderImpl.java northbound/sensorthings/mqtt/pom.xml core/emf-api/src/main/java/org/eclipse/sensinact/core/emf/twin/SensinactEMFDigitalTwin.java northbound/query-handler/integration-test.bndrun pom.xml core/impl/src/main/java/org/eclipse/sensinact/core/extract/impl/GenericDtoDataExtractor.java northbound/sensorthings/mqtt/integration-test.bndrun northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/ObservationHistoryTest.java examples/model-based/src/main/java/org/eclipse/sensinact/prototype/resource/ResourceModelProvider.java core/impl/src/main/java/org/eclipse/sensinact/core/twin/impl/SensinactDigitalTwinImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/twin/impl/SensinactResourceImpl.java core/impl/src/test/java/org/eclipse/sensinact/core/command/impl/GatewayThreadImplTest.java southbound/history/timescale-provider/src/main/java/org/eclipse/sensinact/gateway/southbound/history/timescale/TimescaleDatabaseWorker.java northbound/sensorthings/mqtt/src/test/java/org/eclipse/sensinact/gateway/northbound/sensorthings/mqtt/integration/InsecureMqttNotificationsTest.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/GetMethod.java northbound/security/openid-connect/integration-test.bndrun core/impl/src/test/java/org/eclipse/sensinact/core/integration/notification/SubscribeTest.java southbound/mqtt/mqtt-device-factory/integration-test.bndrun distribution/launcher/export.bndrun core/api/src/main/java/org/eclipse/sensinact/core/push/dto/BaseValueDto.java core/emf-api/dependency-check.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/impl/SetMetadataCommand.java core/api/src/main/java/org/eclipse/sensinact/core/notification/NotificationAccumulator.java distribution/features/core-feature/src/test/java/org/eclipse/sensinact/gateway/feature/integration/core/CoreFeatureTest.java northbound/websocket/integration-test.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/extract/impl/AnnotationMapping.java southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java core/api/src/main/java/org/eclipse/sensinact/core/twin/SensinactDigitalTwin.java core/impl/src/test/java/org/eclipse/sensinact/core/notification/impl/NotificationSenderTest.java core/impl/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/integration-test.bndrun core/impl/src/test/java/org/eclipse/sensinact/core/command/impl/WhiteboardImplTest.java northbound/sensorthings/rest.gateway/integration-test.bndrun core/api/src/main/java/org/eclipse/sensinact/core/model/SensinactModelManager.java core/impl/src/main/java/org/eclipse/sensinact/core/model/impl/ModelBuilderImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/model/impl/SensinactModelManagerImpl.java core/models/provider/src/main/resources/model/sensinact.genmodel core/api/src/main/java/org/eclipse/sensinact/core/notification/AbstractResourceNotification.java core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/SET.java southbound/history/timescale-provider/src/main/java/org/eclipse/sensinact/gateway/southbound/history/timescale/TimescaleHistoricalStore.java core/impl/src/main/java/org/eclipse/sensinact/core/notification/impl/AbstractNotificationAccumulatorImpl.java southbound/history/timescale-provider/integration-test.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/notification/impl/NotificationAccumulatorImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/AbstractResourceMethod.java
j.albert at
Update the osgi-test version to 1.3.0-SNAPSHOT

This upgrade improves the lifecycle of osgi-test considerably, particularly for configurations. It allows some test tidy-up, as well as preparing for more stable tests with the new OSGi Technology Jakarta REST implementation

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: 0a4ee42)
northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java southbound/history/timescale-provider/integration-test.bndrun northbound/sensorthings/mqtt/integration-test.bndrun northbound/filters/ldap/integration-test.bndrun northbound/filters/ldap/src/test/java/org/eclipse/sensinact/northbound/filters/ldap/integration/LdapComponentTest.java northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/WebSocketTest.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/ResourceAccessTest.java core/impl/src/test/java/org/eclipse/sensinact/core/integration/notification/SubscribeTest.java northbound/filters/ldap/src/test/java/org/eclipse/sensinact/northbound/filters/ldap/integration/LdapFilterTest.java southbound/http/http-callback-whiteboard/integration-test.bndrun southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryTest.java northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java southbound/history/timescale-provider/tests.bnd southbound/mqtt/mqtt-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/mqtt/factory/integration/MqttDeviceFactoryTest.java core/impl/src/test/java/org/eclipse/sensinact/core/integration/metrics/MetricsTest.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/DescriptionsTest.java northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/SecureWebSocketTest.java southbound/virtual/virtual-temperature-sensor/integration-test.bndrun core/impl/integration-test.bndrun northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java pom.xml northbound/websocket/integration-test.bndrun southbound/http/http-device-factory/integration-test.bndrun northbound/query-handler/integration-test.bndrun southbound/history/timescale-provider/src/test/java/org/eclipse/sensinact/gateway/southbound/history/timescale/integration/TimescaleHistoryTest.java southbound/http/http-callback-whiteboard/pom.xml southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java northbound/rest/integration-test.bndrun northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/MissingEntityTest.java core/impl/src/test/java/org/eclipse/sensinact/core/integration/session/AdminServiceTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/SecureAccessTest.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/MissingEntityTest.java southbound/http/http-callback-whiteboard/src/test/java/org/eclipse/sensinact/gateway/southbound/http/callback/integration/HttpCallbackWhiteboardTest.java southbound/mqtt/mqtt-device-factory/integration-test.bndrun northbound/sensorthings/rest.gateway/integration-test.bndrun northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/ObservationHistoryTest.java northbound/security/openid-connect/integration-test.bndrun
timothyjward at
Added ability to configure logging (via logback) for JUnit tests in all projects that currently have tests.

Signed-off-by: David Leangen <osgi@leangen.net>
(commit: a165d94)
osgi at
Reduce the verbosity of integration test logging

Ensure that the test-logback.xml is used in the integration tests, and that we use the jul-to-slf4j bridge where appropriate

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: aa0e8fc)
timothyjward at
Improve reliability of sensorthings MQTT tests

* Upgrade to the released osgi-test 1.3.0
* Upgrade to Moquette 0.17.0
* Use Configuration annotations in SensorThings MQTT integration tests
* Update to non-deprecated configuration properties for Moquette

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: d694802)
timothyjward at
Make the sensiNact build more CI friendly

Since Maven 3.5.0 poms have had the ability to be [CI-friendly](https://maven.apache.org/maven-ci-friendly.html) allowing a more flexible approach to releasing without the need to edit POM files. This also impacts the creation of our feature files, which can now flexibly alter the versions of the bundles they deploy to match what's being built in by CI. The end result should be a much simpler time when we want to tag or release any particular commit.

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: 75ebfda)
northbound/rest/pom.xml northbound/filters/filters.core/pom.xml distribution/features/core-feature/pom.xml northbound/sensorthings/dto/pom.xml distribution/features/virtual-temperature-sensor-feature/src/main/resources/virtual-temperature-sensor-feature.json distribution/features/northbound-rest-feature/pom.xml core/pom.xml northbound/sensorthings/pom.xml distribution/features/timescale-history-provider-feature/src/main/resources/timescale-history-provider-feature.json distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json northbound/pom.xml northbound/query-handler/pom.xml northbound/sensorthings/rest.api/pom.xml distribution/features/timescale-history-provider-feature/pom.xml distribution/features/northbound-ogc-sensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json southbound/device-factory/parser-csv/pom.xml examples/writable/pom.xml core/models/provider/pom.xml examples/generic/pom.xml examples/pom.xml southbound/virtual/virtual-temperature-sensor/pom.xml southbound/http/http-device-factory/pom.xml southbound/device-factory/pom.xml examples/notification/pom.xml northbound/sensorthings/mqtt/pom.xml distribution/features/northbound-ogc-sensorthings-feature/pom.xml distribution/features/northbound-oidc-authenticator-feature/pom.xml distribution/features/virtual-temperature-sensor-feature/pom.xml distribution/features/northbound-websocket-feature/pom.xml southbound/device-factory/parser-json/pom.xml southbound/mqtt/mqtt-client/pom.xml southbound/mqtt/mqtt-device-factory/pom.xml northbound/sensorthings/filter/pom.xml southbound/virtual/pom.xml distribution/features/pom.xml northbound/security/pom.xml distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml northbound/security/openid-connect/pom.xml sensinact-bom/pom.xml distribution/features/northbound-websocket-feature/src/main/resources/northbound-websocket-feature.json examples/reflective/pom.xml distribution/assembly/pom.xml examples/action/pom.xml examples/model-based/pom.xml southbound/history/pom.xml southbound/http/http-callback-whiteboard/pom.xml core/models/metadata/pom.xml pom.xml southbound/device-factory/device-factory-core/pom.xml core/api/pom.xml northbound/session/session-impl/pom.xml northbound/gogo-shell/pom.xml distribution/launcher/pom.xml northbound/security/security-api/pom.xml core/models/pom.xml distribution/features/jakarta-rest-whiteboard-feature/pom.xml northbound/session/pom.xml distribution/features/gogo-shell-feature/src/main/resources/gogo-shell-feature.json distribution/features/jakarta-servlet-whiteboard-feature/pom.xml distribution/test-utils/pom.xml core/geo-json/pom.xml distribution/features/gogo-shell-feature/pom.xml northbound/filters/ldap/pom.xml southbound/history/timescale-provider/pom.xml southbound/pom.xml northbound/session/session-api/pom.xml distribution/pom.xml southbound/http/pom.xml southbound/mqtt/pom.xml northbound/filters/pom.xml northbound/sensorthings/rest.gateway/pom.xml distribution/features/core-feature/src/main/resources/core-feature.json distribution/features/jakarta-servlet-whiteboard-feature/src/main/resources/jakarta-servlet-whiteboard-feature.json distribution/features/northbound-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json examples/pull-based/pom.xml distribution/features/jakarta-rest-whiteboard-feature/src/main/resources/jakarta-rest-whiteboard-feature.json distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json core/impl/pom.xml core/emf-api/pom.xml northbound/websocket/pom.xml core/annotation/pom.xml examples/push-based/pom.xml southbound/history/history-api/pom.xml
timothyjward at