100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Merge remote-tracking branch 'remotes/origin/master' into web_wip
Rich Turnerc01af34c525a
diff --cc manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 8bc2f91f2,8db843f1f..cad6bc9b5--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@@ -40,8 -40,8 +40,9 @@@ import org.openremote.container.timer.Timport org.openremote.container.web.WebService;import org.openremote.manager.asset.console.ConsoleResourceImpl;import org.openremote.manager.event.ClientEventService;+ import org.openremote.manager.rules.AssetQueryPredicate;import org.openremote.manager.security.ManagerIdentityService;+import org.openremote.manager.web.ManagerWebService;import org.openremote.model.Constants;import org.openremote.model.ValidationFailure;import org.openremote.model.asset.*;diff --cc test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovyindex d94c0399d,b0c549d60..b151194a8--- a/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy@@@ -49,8 -49,8 +49,9 @@@ class AssetPublicQueryTest extends SpeckeycloakDemoSetup = container.getService(SetupService.class).getTaskOfType(KeycloakDemoSetup.class)assetStorageService = container.getService(AssetStorageService.class)persistenceService = container.getService(PersistenceService.class)- assetResource = getClientTarget(serverUri(serverPort), MASTER_REALM).proxy(AssetResource.class)+ assetResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM).proxy(AssetResource.class)+ returnedAssets = new ArrayList<>()+ returnedAssets = new ArrayList<>()for (int i = 0; i < 10; i++) {Asset somePublicAsset = new Asset("Some Public Asset", THING)diff --cc test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovyindex b9360fd8b,624aedc7f..6cb171454--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy@@@ -110,26 -109,26 +109,26 @@@ class NotificationTest extends Specific).tokendef notification = new Notification("TestAction",- new PushNotificationMessage("Test Action",- "Click to cancel",- writeAttributeValueAction(- new AttributeRef(- managerDemoSetup.apartment1LivingroomId,- "alarmEnabled"- ),- Values.create(false)),null, null), null)+ new PushNotificationMessage("Test Action",+ "Click to cancel",+ writeAttributeValueAction(+ new AttributeRef(+ managerDemoSetup.apartment1LivingroomId,+ "alarmEnabled"+ ),+ Values.create(false)), null, null), null, null, null)and: "the notification resource"- def testuser1NotificationResource = getClientTarget(serverUri(serverPort), MASTER_REALM, testuser1AccessToken).proxy(NotificationResource.class)- def testuser2NotificationResource = getClientTarget(serverUri(serverPort), realm, testuser2AccessToken).proxy(NotificationResource.class)- def testuser3NotificationResource = getClientTarget(serverUri(serverPort), realm, testuser3AccessToken).proxy(NotificationResource.class)- def adminNotificationResource = getClientTarget(serverUri(serverPort), MASTER_REALM, adminAccessToken).proxy(NotificationResource.class)- def anonymousNotificationResource = getClientTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm).proxy(NotificationResource.class)- def testuser1ConsoleResource = getClientTarget(serverUri(serverPort), MASTER_REALM, testuser1AccessToken).proxy(ConsoleResource.class)- def testuser2ConsoleResource = getClientTarget(serverUri(serverPort), realm, testuser2AccessToken).proxy(ConsoleResource.class)- def testuser3ConsoleResource = getClientTarget(serverUri(serverPort), realm, testuser3AccessToken).proxy(ConsoleResource.class)- def adminConsoleResource = getClientTarget(serverUri(serverPort), MASTER_REALM, adminAccessToken).proxy(ConsoleResource.class)- def anonymousConsoleResource = getClientTarget(serverUri(serverPort), realm).proxy(ConsoleResource.class)+ def testuser1NotificationResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, testuser1AccessToken).proxy(NotificationResource.class)+ def testuser2NotificationResource = getClientApiTarget(serverUri(serverPort), realm, testuser2AccessToken).proxy(NotificationResource.class)+ def testuser3NotificationResource = getClientApiTarget(serverUri(serverPort), realm, testuser3AccessToken).proxy(NotificationResource.class)+ def adminNotificationResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, adminAccessToken).proxy(NotificationResource.class)+ def anonymousNotificationResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.customerATenant.realm).proxy(NotificationResource.class)+ def testuser1ConsoleResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, testuser1AccessToken).proxy(ConsoleResource.class)+ def testuser2ConsoleResource = getClientApiTarget(serverUri(serverPort), realm, testuser2AccessToken).proxy(ConsoleResource.class)+ def testuser3ConsoleResource = getClientApiTarget(serverUri(serverPort), realm, testuser3AccessToken).proxy(ConsoleResource.class)+ def adminConsoleResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, adminAccessToken).proxy(ConsoleResource.class)+ def anonymousConsoleResource = getClientApiTarget(serverUri(serverPort), realm).proxy(ConsoleResource.class)when: "various consoles are registered"def consoleRegistration = new ConsoleRegistration(null,