Skip to content

Changes

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