Skip to content

Changes

Started 2 yr 4 mo ago
Took 2.1 sec
Move the Session API into the Northbound project

User Sessions are really part of the northbound access mechanism, and should not be part of the core. This will simplify adding access restrictions in the future.

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: aa0c559)
core/api/src/main/java/org/eclipse/sensinact/core/session/SensiNactSessionManager.java core/impl/src/test/java/org/eclipse/sensinact/core/integration/admin/AdminServiceTest.java core/api/src/main/java/org/eclipse/sensinact/core/session/ProviderDescription.java northbound/websocket/pom.xml distribution/features/northbound-rest-feature/pom.xml northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/ThingsAccessImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/impl/SensiNactSessionImpl.java examples/notification/pom.xml northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSessionManager.java northbound/rest/pom.xml northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/SensinactSessionProvider.java core/api/src/main/java/org/eclipse/sensinact/core/session/ResourceShortDescription.java core/impl/src/test/java/org/eclipse/sensinact/core/integration/DataUpdateServiceTest.java southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java northbound/gogo-shell/src/main/java/org/eclipse/sensinact/gateway/commands/gogo/converter/ServiceConverter.java northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/package-info.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryAuthTest.java northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/HistoricalLocationsAccessImpl.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SessionSubscribeTest.java core/impl/src/main/java/org/eclipse/sensinact/core/impl/SessionManager.java southbound/http/http-device-factory/integration-test.bndrun northbound/gogo-shell/src/main/java/org/eclipse/sensinact/gateway/commands/gogo/ProviderCommands.java northbound/query-handler/src/main/java/org/eclipse/sensinact/northbound/query/api/IQueryHandler.java northbound/gogo-shell/src/main/java/org/eclipse/sensinact/gateway/commands/gogo/ServiceCommands.java northbound/sensorthings/pom.xml northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/ResourceShortDescription.java core/api/src/main/java/org/eclipse/sensinact/core/session/package-info.java northbound/query-handler/pom.xml northbound/query-handler/src/main/java/org/eclipse/sensinact/northbound/query/impl/QueryHandler.java northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSession.java southbound/mqtt/mqtt-device-factory/integration-test.bndrun southbound/mqtt/mqtt-device-factory/pom.xml northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/RootResourceAccessImpl.java northbound/websocket/src/main/java/org/eclipse/sensinact/northbound/ws/impl/WebSocketEndpoint.java northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/DtoMapper.java northbound/session/session-impl/pom.xml distribution/features/northbound-ogc-sensorthings-feature/pom.xml northbound/websocket/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/pom.xml northbound/websocket/src/main/java/org/eclipse/sensinact/northbound/ws/impl/WebSocketJettyRegistrar.java examples/notification/src/main/java/notification/_02_ClientNotification.java core/impl/src/test/java/org/eclipse/sensinact/core/integration/session/AdminServiceTest.java northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/ProviderDescription.java northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/ObservationsAccessImpl.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/MissingEntityTest.java northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/ResourceDescription.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactorySSLTest.java distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SensiNactSessionImpl.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/DescriptionsTest.java core/impl/src/test/java/org/eclipse/sensinact/core/integration/notification/SubscribeTest.java northbound/gogo-shell/src/main/java/org/eclipse/sensinact/gateway/commands/gogo/converter/ResourceConverter.java northbound/sensorthings/rest.gateway/pom.xml northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/RestAccessApplication.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/FeaturesOfInterestAccessImpl.java northbound/session/session-api/pom.xml northbound/gogo-shell/src/main/java/org/eclipse/sensinact/gateway/commands/gogo/converter/ProviderConverter.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SessionManager.java northbound/pom.xml northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/SensorsAccessImpl.java core/api/src/main/java/org/eclipse/sensinact/core/session/ResourceDescription.java northbound/gogo-shell/src/main/java/org/eclipse/sensinact/gateway/commands/gogo/SensiNactCommandSession.java distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/ServiceDescription.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java southbound/mqtt/mqtt-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/mqtt/factory/integration/MqttDeviceFactoryTest.java northbound/gogo-shell/src/main/java/org/eclipse/sensinact/gateway/commands/gogo/ResourceCommands.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SensinactSessionTest.java southbound/http/http-device-factory/pom.xml northbound/rest/integration-test.bndrun northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/SensinactSessionProvider.java northbound/websocket/src/main/java/org/eclipse/sensinact/northbound/ws/impl/WebSocketCreator.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/ResourceAccessTest.java northbound/sensorthings/rest.gateway/integration-test.bndrun northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/RestNorthbound.java northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/SensinactSensorthingsApplication.java core/api/src/main/java/org/eclipse/sensinact/core/session/ServiceDescription.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryTest.java northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/DatastreamsAccessImpl.java northbound/session/pom.xml southbound/virtual/virtual-temperature-sensor/integration-test.bndrun northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/LocationsAccessImpl.java northbound/query-handler/integration-test.bndrun northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java northbound/gogo-shell/pom.xml northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/ObservedPropertiesAccessImpl.java core/api/src/main/java/org/eclipse/sensinact/core/session/SensiNactSession.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryParallelQueries.java
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/ResourceAccessTest.java northbound/websocket/integration-test.bndrun northbound/security/openid-connect/src/main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/OIDCTokenValidator.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SessionManager.java northbound/rest/integration-test.bndrun southbound/mqtt/mqtt-device-factory/integration-test.bndrun northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryParallelQueries.java northbound/security/authentication-api/src/main/java/org/eclipse/sensinact/northbound/security/api/package-info.java northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSessionManager.java distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/package-info.java northbound/security/openid-connect/src/main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/JwsUserInfo.java northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/SensinactSessionProvider.java southbound/http/http-device-factory/integration-test.bndrun northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SensinactSessionTest.java northbound/security/openid-connect/integration-test.bndrun northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SensiNactSessionImpl.java core/api/src/main/java/org/eclipse/sensinact/core/security/UserInfo.java core/api/src/main/java/org/eclipse/sensinact/core/security/package-info.java northbound/websocket/src/main/java/org/eclipse/sensinact/northbound/ws/impl/WebSocketCreator.java distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/SensinactSessionProvider.java distribution/features/northbound-ogc-sensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json northbound/websocket/pom.xml northbound/security/authentication-api/src/main/java/org/eclipse/sensinact/northbound/security/api/Authenticator.java northbound/websocket/src/main/java/org/eclipse/sensinact/northbound/ws/impl/WebSocketJettyRegistrar.java northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/AuthenticationFilter.java northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/UserInfo.java northbound/query-handler/integration-test.bndrun northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SessionSubscribeTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactorySSLTest.java distribution/features/northbound-rest-feature/pom.xml northbound/rest/pom.xml northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/DescriptionsTest.java southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java northbound/security/security-api/pom.xml northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSession.java distribution/features/northbound-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/SecureWebSocketTest.java northbound/security/openid-connect/src/test/java/org/eclipse/sensinact/gateway/northbound/security/oidc/integration/ValidatorTest.java northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/Authenticator.java distribution/features/northbound-oidc-authenticator-feature/pom.xml southbound/mqtt/mqtt-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/mqtt/factory/integration/MqttDeviceFactoryTest.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/MissingEntityTest.java 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/notification/ResourceNotificationsTest.java northbound/sensorthings/rest.gateway/integration-test.bndrun northbound/security/pom.xml distribution/features/northbound-ogc-sensorthings-feature/pom.xml southbound/virtual/virtual-temperature-sensor/integration-test.bndrun southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryAuthTest.java northbound/security/authentication-api/pom.xml northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/SecureAccessTest.java northbound/security/openid-connect/pom.xml northbound/session/session-api/pom.xml southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryTest.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)
northbound/session/pom.xml distribution/assembly/pom.xml northbound/pom.xml examples/pull-based/pom.xml distribution/launcher/pom.xml northbound/rest/pom.xml distribution/features/virtual-temperature-sensor-feature/pom.xml distribution/features/jakarta-servlet-whiteboard-feature/src/main/resources/jakarta-servlet-whiteboard-feature.json distribution/features/northbound-websocket-feature/pom.xml southbound/history/timescale-provider/pom.xml southbound/http/http-callback-whiteboard/pom.xml distribution/features/gogo-shell-feature/pom.xml distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json distribution/features/northbound-ogc-sensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json northbound/filters/pom.xml northbound/session/session-api/pom.xml core/annotation/pom.xml northbound/security/openid-connect/pom.xml distribution/pom.xml southbound/mqtt/mqtt-client/pom.xml core/models/pom.xml northbound/gogo-shell/pom.xml northbound/security/security-api/pom.xml southbound/device-factory/parser-csv/pom.xml southbound/virtual/virtual-temperature-sensor/pom.xml distribution/features/northbound-rest-feature/pom.xml southbound/pom.xml southbound/history/history-api/pom.xml southbound/virtual/pom.xml distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml distribution/features/timescale-history-provider-feature/src/main/resources/timescale-history-provider-feature.json southbound/history/pom.xml distribution/features/northbound-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json northbound/sensorthings/pom.xml examples/push-based/pom.xml southbound/device-factory/parser-json/pom.xml southbound/device-factory/device-factory-core/pom.xml northbound/websocket/pom.xml distribution/features/core-feature/pom.xml core/impl/pom.xml northbound/sensorthings/rest.api/pom.xml examples/writable/pom.xml distribution/features/jakarta-servlet-whiteboard-feature/pom.xml examples/generic/pom.xml northbound/filters/filters.core/pom.xml examples/action/pom.xml examples/pom.xml core/api/pom.xml examples/model-based/pom.xml core/geo-json/pom.xml distribution/features/jakarta-rest-whiteboard-feature/src/main/resources/jakarta-rest-whiteboard-feature.json distribution/features/northbound-websocket-feature/src/main/resources/northbound-websocket-feature.json distribution/features/timescale-history-provider-feature/pom.xml distribution/features/northbound-ogc-sensorthings-feature/pom.xml northbound/filters/ldap/pom.xml northbound/sensorthings/rest.gateway/pom.xml core/models/metadata/pom.xml northbound/query-handler/pom.xml distribution/features/jakarta-rest-whiteboard-feature/pom.xml distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json northbound/sensorthings/filter/pom.xml southbound/http/http-device-factory/pom.xml northbound/session/session-impl/pom.xml distribution/features/northbound-oidc-authenticator-feature/pom.xml distribution/features/virtual-temperature-sensor-feature/src/main/resources/virtual-temperature-sensor-feature.json distribution/test-utils/pom.xml examples/notification/pom.xml southbound/mqtt/pom.xml sensinact-bom/pom.xml core/models/provider/pom.xml southbound/device-factory/pom.xml distribution/features/gogo-shell-feature/src/main/resources/gogo-shell-feature.json distribution/features/pom.xml southbound/http/pom.xml core/pom.xml distribution/features/core-feature/src/main/resources/core-feature.json core/emf-api/pom.xml northbound/security/pom.xml northbound/sensorthings/mqtt/pom.xml pom.xml northbound/sensorthings/dto/pom.xml southbound/mqtt/mqtt-device-factory/pom.xml examples/reflective/pom.xml
timothyjward at