Skip to content

Changes

Started 2 yr 4 mo ago
Took 2.5 sec
Package regsitration and Model Package Uri

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

The User Info class belongs with the northbound security API which is a factory for it

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: e12ff02)
northbound/websocket/pom.xml southbound/mqtt/mqtt-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/mqtt/factory/integration/MqttDeviceFactoryTest.java northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSession.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/SecureAccessTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java northbound/rest/integration-test.bndrun distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SessionSubscribeTest.java northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/SecureWebSocketTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryParallelQueries.java northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/SensinactSessionProvider.java northbound/session/session-api/pom.xml northbound/websocket/src/main/java/org/eclipse/sensinact/northbound/ws/impl/WebSocketJettyRegistrar.java distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml distribution/features/northbound-rest-feature/pom.xml southbound/http/http-device-factory/integration-test.bndrun northbound/security/openid-connect/integration-test.bndrun northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/AuthenticationFilter.java northbound/websocket/src/main/java/org/eclipse/sensinact/northbound/ws/impl/WebSocketCreator.java southbound/mqtt/mqtt-device-factory/integration-test.bndrun core/api/src/main/java/org/eclipse/sensinact/core/security/package-info.java northbound/security/openid-connect/src/main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/OIDCTokenValidator.java northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/package-info.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/DescriptionsTest.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SessionManager.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SensiNactSessionImpl.java northbound/security/authentication-api/pom.xml northbound/security/openid-connect/src/test/java/org/eclipse/sensinact/gateway/northbound/security/oidc/integration/ValidatorTest.java northbound/security/pom.xml northbound/query-handler/integration-test.bndrun distribution/features/northbound-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactorySSLTest.java core/api/src/main/java/org/eclipse/sensinact/core/security/UserInfo.java northbound/security/authentication-api/src/main/java/org/eclipse/sensinact/northbound/security/api/package-info.java northbound/sensorthings/rest.gateway/integration-test.bndrun distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json northbound/security/openid-connect/pom.xml northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SensinactSessionTest.java northbound/rest/pom.xml northbound/security/openid-connect/src/main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/JwsUserInfo.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/ResourceAccessTest.java northbound/security/security-api/pom.xml northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryTest.java northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/SensinactSessionProvider.java distribution/features/northbound-ogc-sensorthings-feature/pom.xml northbound/security/authentication-api/src/main/java/org/eclipse/sensinact/northbound/security/api/Authenticator.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/MissingEntityTest.java northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/UserInfo.java distribution/features/northbound-oidc-authenticator-feature/pom.xml northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/Authenticator.java northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSessionManager.java northbound/websocket/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryAuthTest.java southbound/virtual/virtual-temperature-sensor/integration-test.bndrun distribution/features/northbound-ogc-sensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json
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)
southbound/mqtt/pom.xml southbound/device-factory/device-factory-core/pom.xml distribution/features/northbound-oidc-authenticator-feature/pom.xml southbound/device-factory/parser-csv/pom.xml southbound/history/timescale-provider/pom.xml northbound/sensorthings/dto/pom.xml core/models/pom.xml distribution/launcher/pom.xml distribution/features/core-feature/src/main/resources/core-feature.json southbound/http/http-callback-whiteboard/pom.xml distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json distribution/test-utils/pom.xml distribution/features/timescale-history-provider-feature/pom.xml core/models/metadata/pom.xml southbound/history/pom.xml northbound/session/session-impl/pom.xml examples/writable/pom.xml distribution/features/jakarta-rest-whiteboard-feature/src/main/resources/jakarta-rest-whiteboard-feature.json pom.xml southbound/history/history-api/pom.xml core/models/provider/pom.xml core/geo-json/pom.xml northbound/session/pom.xml examples/pull-based/pom.xml sensinact-bom/pom.xml distribution/features/core-feature/pom.xml distribution/features/northbound-websocket-feature/src/main/resources/northbound-websocket-feature.json distribution/pom.xml core/annotation/pom.xml examples/push-based/pom.xml core/emf-api/pom.xml core/pom.xml distribution/features/virtual-temperature-sensor-feature/pom.xml distribution/features/gogo-shell-feature/src/main/resources/gogo-shell-feature.json examples/action/pom.xml distribution/features/northbound-rest-feature/pom.xml northbound/security/security-api/pom.xml southbound/virtual/virtual-temperature-sensor/pom.xml distribution/features/northbound-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json northbound/sensorthings/rest.gateway/pom.xml examples/model-based/pom.xml distribution/features/jakarta-rest-whiteboard-feature/pom.xml examples/notification/pom.xml distribution/features/northbound-ogc-sensorthings-feature/pom.xml distribution/features/jakarta-servlet-whiteboard-feature/pom.xml examples/pom.xml northbound/sensorthings/filter/pom.xml examples/generic/pom.xml northbound/security/pom.xml northbound/sensorthings/pom.xml core/api/pom.xml northbound/filters/pom.xml southbound/device-factory/parser-json/pom.xml distribution/features/pom.xml core/impl/pom.xml distribution/features/northbound-ogc-sensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json distribution/features/jakarta-servlet-whiteboard-feature/src/main/resources/jakarta-servlet-whiteboard-feature.json northbound/query-handler/pom.xml northbound/rest/pom.xml northbound/security/openid-connect/pom.xml northbound/sensorthings/mqtt/pom.xml distribution/features/gogo-shell-feature/pom.xml southbound/device-factory/pom.xml distribution/features/timescale-history-provider-feature/src/main/resources/timescale-history-provider-feature.json southbound/http/pom.xml distribution/assembly/pom.xml southbound/virtual/pom.xml northbound/session/session-api/pom.xml northbound/filters/filters.core/pom.xml distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml southbound/pom.xml northbound/filters/ldap/pom.xml northbound/sensorthings/rest.api/pom.xml distribution/features/virtual-temperature-sensor-feature/src/main/resources/virtual-temperature-sensor-feature.json southbound/http/http-device-factory/pom.xml southbound/mqtt/mqtt-device-factory/pom.xml distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json northbound/pom.xml northbound/websocket/pom.xml distribution/features/northbound-websocket-feature/pom.xml examples/reflective/pom.xml northbound/gogo-shell/pom.xml southbound/mqtt/mqtt-client/pom.xml
timothyjward at