Skip to content

Changes

Started 2 yr 3 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/api/src/main/java/org/eclipse/sensinact/core/model/SensinactModelManager.java core/impl/src/main/java/org/eclipse/sensinact/core/extract/impl/GenericDtoDataExtractor.java core/impl/src/main/java/org/eclipse/sensinact/core/notification/impl/AbstractNotificationAccumulatorImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/command/impl/ActionHandler.java core/impl/src/test/java/org/eclipse/sensinact/core/command/impl/GatewayThreadImplTest.java core/api/dependency-check.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/impl/SetMetadataCommand.java core/impl/src/test/java/org/eclipse/sensinact/core/model/nexus/impl/SubscriptionTest.java core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/UriParam.java southbound/history/timescale-provider/src/test/java/org/eclipse/sensinact/gateway/southbound/history/timescale/integration/TimescaleHistoryTest.java northbound/websocket/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/command/impl/ResourcePushHandler.java core/impl/src/main/java/org/eclipse/sensinact/core/twin/impl/SensinactProviderImpl.java southbound/http/http-callback-whiteboard/integration-test.bndrun core/impl/src/test/java/org/eclipse/sensinact/core/extract/impl/AnnotationBasedDtoExtractorTest.java southbound/virtual/virtual-temperature-sensor/integration-test.bndrun distribution/features/core-feature/src/test/java/org/eclipse/sensinact/gateway/feature/integration/core/CoreFeatureTest.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/command/impl/ResourcePullHandler.java northbound/security/openid-connect/integration-test.bndrun core/api/src/main/java/org/eclipse/sensinact/core/push/dto/BaseValueDto.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/GetMethod.java northbound/query-handler/integration-test.bndrun distribution/launcher/export.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/ActMethod.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/RegistryKey.java distribution/launcher/pom.xml northbound/filters/ldap/integration-test.bndrun 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/ObservationHistoryTest.java core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/ACT.java southbound/history/timescale-provider/src/main/java/org/eclipse/sensinact/gateway/southbound/history/timescale/TimescaleDatabaseWorker.java northbound/sensorthings/mqtt/integration-test.bndrun core/impl/src/test/java/org/eclipse/sensinact/core/integration/notification/SubscribeTest.java core/impl/integration-test.bndrun distribution/features/core-feature/src/main/resources/core-feature.json core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/SensinactWhiteboard.java northbound/sensorthings/rest.gateway/integration-test.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/model/impl/ModelBuilderImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/notification/impl/ImmediateNotificationAccumulator.java pom.xml core/api/src/main/java/org/eclipse/sensinact/core/notification/NotificationAccumulator.java core/impl/src/main/java/org/eclipse/sensinact/core/twin/impl/SensinactDigitalTwinImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/extract/impl/AnnotationMapping.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/SetMethod.java core/api/src/main/java/org/eclipse/sensinact/core/twin/SensinactDigitalTwin.java core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/dto/ModelPackageUri.java core/impl/src/main/java/org/eclipse/sensinact/core/dto/impl/AbstractUpdateDto.java core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/GET.java core/impl/src/main/java/org/eclipse/sensinact/core/model/nexus/emf/EMFUtil.java core/impl/src/main/java/org/eclipse/sensinact/core/twin/impl/SensinactResourceImpl.java core/models/provider/src/main/resources/model/sensinact.genmodel core/impl/src/main/java/org/eclipse/sensinact/core/model/impl/SensinactModelManagerImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/model/nexus/emf/compare/EMFCompareUtil.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/AbstractResourceMethod.java core/api/src/main/java/org/eclipse/sensinact/core/notification/AbstractResourceNotification.java core/impl/src/test/java/org/eclipse/sensinact/core/model/nexus/impl/NexusTest.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/impl/SetValueCommand.java core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/SET.java northbound/rest/integration-test.bndrun northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java core/impl/src/main/java/org/eclipse/sensinact/core/model/nexus/ModelNexus.java core/impl/src/test/java/org/eclipse/sensinact/core/command/impl/WhiteboardImplTest.java core/models/provider/src/main/resources/model/sensinact.ecore southbound/http/http-device-factory/integration-test.bndrun northbound/sensorthings/mqtt/pom.xml southbound/history/timescale-provider/integration-test.bndrun core/impl/src/test/java/org/eclipse/sensinact/core/twin/impl/SensinactTwinTest.java core/emf-api/dependency-check.bndrun core/api/src/main/java/org/eclipse/sensinact/core/command/ResourceCommand.java southbound/mqtt/mqtt-device-factory/integration-test.bndrun examples/model-based/src/main/java/org/eclipse/sensinact/prototype/resource/ResourceModelProvider.java core/impl/src/main/java/org/eclipse/sensinact/core/notification/impl/NotificationAccumulatorImpl.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)
pom.xml northbound/filters/ldap/src/test/java/org/eclipse/sensinact/northbound/filters/ldap/integration/LdapFilterTest.java northbound/rest/integration-test.bndrun northbound/websocket/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java northbound/sensorthings/mqtt/integration-test.bndrun northbound/filters/ldap/src/test/java/org/eclipse/sensinact/northbound/filters/ldap/integration/LdapComponentTest.java southbound/virtual/virtual-temperature-sensor/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/query-handler/integration-test.bndrun northbound/security/openid-connect/integration-test.bndrun northbound/sensorthings/rest.gateway/integration-test.bndrun southbound/history/timescale-provider/integration-test.bndrun core/impl/integration-test.bndrun core/impl/src/test/java/org/eclipse/sensinact/core/integration/notification/SubscribeTest.java southbound/history/timescale-provider/src/test/java/org/eclipse/sensinact/gateway/southbound/history/timescale/integration/TimescaleHistoryTest.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/ResourceAccessTest.java southbound/http/http-callback-whiteboard/pom.xml core/impl/src/test/java/org/eclipse/sensinact/core/integration/metrics/MetricsTest.java southbound/mqtt/mqtt-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/mqtt/factory/integration/MqttDeviceFactoryTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/SecureAccessTest.java northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/ObservationHistoryTest.java southbound/http/http-callback-whiteboard/src/test/java/org/eclipse/sensinact/gateway/southbound/http/callback/integration/HttpCallbackWhiteboardTest.java northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/MissingEntityTest.java southbound/history/timescale-provider/tests.bnd southbound/http/http-device-factory/integration-test.bndrun 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 northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/WebSocketTest.java southbound/http/http-callback-whiteboard/integration-test.bndrun northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java northbound/filters/ldap/integration-test.bndrun southbound/mqtt/mqtt-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)
distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml core/api/src/main/java/org/eclipse/sensinact/core/security/UserInfo.java northbound/rest/integration-test.bndrun northbound/session/session-api/pom.xml northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSessionManager.java southbound/http/http-device-factory/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/integration-test.bndrun northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/Authenticator.java northbound/security/authentication-api/src/main/java/org/eclipse/sensinact/northbound/security/api/Authenticator.java northbound/security/authentication-api/pom.xml northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/package-info.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactorySSLTest.java northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.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/DescriptionsTest.java northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/SensinactSessionProvider.java distribution/features/northbound-ogc-sensorthings-feature/pom.xml northbound/security/openid-connect/src/main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/JwsUserInfo.java northbound/sensorthings/rest.gateway/integration-test.bndrun distribution/features/northbound-ogc-sensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json northbound/security/openid-connect/integration-test.bndrun northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SessionManager.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SensinactSessionTest.java northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSession.java northbound/query-handler/integration-test.bndrun northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SessionSubscribeTest.java 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 distribution/features/northbound-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java distribution/features/northbound-oidc-authenticator-feature/pom.xml northbound/security/pom.xml northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/SensinactSessionProvider.java northbound/websocket/src/main/java/org/eclipse/sensinact/northbound/ws/impl/WebSocketJettyRegistrar.java northbound/security/openid-connect/src/test/java/org/eclipse/sensinact/gateway/northbound/security/oidc/integration/ValidatorTest.java distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json northbound/security/openid-connect/src/main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/OIDCTokenValidator.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryTest.java northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/SecureWebSocketTest.java core/api/src/main/java/org/eclipse/sensinact/core/security/package-info.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json northbound/rest/pom.xml southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryAuthTest.java northbound/security/security-api/pom.xml northbound/security/authentication-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/MissingEntityTest.java northbound/websocket/integration-test.bndrun northbound/websocket/pom.xml northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/ResourceAccessTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java distribution/features/northbound-rest-feature/pom.xml northbound/security/openid-connect/pom.xml southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryParallelQueries.java southbound/mqtt/mqtt-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/mqtt/factory/integration/MqttDeviceFactoryTest.java northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/UserInfo.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SensiNactSessionImpl.java southbound/mqtt/mqtt-device-factory/integration-test.bndrun
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 core/pom.xml distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml distribution/test-utils/pom.xml southbound/history/pom.xml core/annotation/pom.xml northbound/pom.xml distribution/features/gogo-shell-feature/src/main/resources/gogo-shell-feature.json examples/pom.xml southbound/mqtt/mqtt-device-factory/pom.xml core/models/metadata/pom.xml core/models/provider/pom.xml distribution/features/northbound-ogc-sensorthings-feature/pom.xml distribution/features/timescale-history-provider-feature/pom.xml distribution/features/jakarta-rest-whiteboard-feature/src/main/resources/jakarta-rest-whiteboard-feature.json examples/action/pom.xml southbound/history/timescale-provider/pom.xml distribution/assembly/pom.xml distribution/features/gogo-shell-feature/pom.xml distribution/features/core-feature/pom.xml distribution/features/jakarta-servlet-whiteboard-feature/src/main/resources/jakarta-servlet-whiteboard-feature.json sensinact-bom/pom.xml core/models/pom.xml distribution/pom.xml distribution/features/virtual-temperature-sensor-feature/src/main/resources/virtual-temperature-sensor-feature.json northbound/filters/filters.core/pom.xml northbound/websocket/pom.xml northbound/sensorthings/rest.gateway/pom.xml pom.xml distribution/features/virtual-temperature-sensor-feature/pom.xml southbound/history/history-api/pom.xml distribution/features/northbound-websocket-feature/pom.xml northbound/filters/ldap/pom.xml distribution/features/core-feature/src/main/resources/core-feature.json southbound/virtual/virtual-temperature-sensor/pom.xml northbound/security/security-api/pom.xml distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json northbound/security/openid-connect/pom.xml core/geo-json/pom.xml northbound/filters/pom.xml northbound/sensorthings/mqtt/pom.xml southbound/http/http-callback-whiteboard/pom.xml distribution/features/timescale-history-provider-feature/src/main/resources/timescale-history-provider-feature.json southbound/device-factory/parser-json/pom.xml southbound/virtual/pom.xml southbound/mqtt/pom.xml northbound/security/pom.xml examples/pull-based/pom.xml southbound/pom.xml northbound/sensorthings/filter/pom.xml southbound/http/pom.xml core/api/pom.xml distribution/features/pom.xml southbound/http/http-device-factory/pom.xml northbound/session/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 distribution/features/northbound-rest-feature/pom.xml southbound/device-factory/device-factory-core/pom.xml examples/generic/pom.xml northbound/sensorthings/dto/pom.xml southbound/device-factory/pom.xml distribution/features/northbound-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json examples/model-based/pom.xml northbound/sensorthings/rest.api/pom.xml distribution/features/northbound-websocket-feature/src/main/resources/northbound-websocket-feature.json distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json examples/notification/pom.xml examples/push-based/pom.xml core/emf-api/pom.xml examples/writable/pom.xml northbound/sensorthings/pom.xml distribution/features/jakarta-rest-whiteboard-feature/pom.xml examples/reflective/pom.xml distribution/launcher/pom.xml northbound/gogo-shell/pom.xml northbound/session/session-impl/pom.xml southbound/mqtt/mqtt-client/pom.xml core/impl/pom.xml northbound/session/session-api/pom.xml distribution/features/northbound-oidc-authenticator-feature/pom.xml distribution/features/jakarta-servlet-whiteboard-feature/pom.xml northbound/query-handler/pom.xml
timothyjward at