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
Make TenantResource getAll return enabled and disabled tenants
Rich Turnerd856690c8d61
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex 7ea49b2de..651d16583 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -256,7 +256,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse).forEach(this::deployGlobalRuleset);LOG.info("Deploying tenant rulesets");- tenants = identityService.getIdentityProvider().getTenants();+ tenants = Arrays.stream(identityService.getIdentityProvider().getTenants()).filter(Tenant::getEnabled).toArray(Tenant[]::new);rulesetStorageService.findAll(TenantRuleset.class,new RulesetQuery()diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.javaindex 2d18a907c..3375111ff 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java@@ -188,7 +188,7 @@ public interface ManagerIdentityProvider extends IdentityProvider {static Tenant[] getTenantsFromDb(PersistenceService persistenceService) {return persistenceService.doReturningTransaction(entityManager -> {List<Tenant> realms = entityManager.createQuery(- "select t from Tenant t where t.enabled = true and (t.notBefore is null or t.notBefore = 0 or to_timestamp(t.notBefore) <= now())"+ "select t from Tenant t where t.notBefore is null or t.notBefore = 0 or to_timestamp(t.notBefore) <= now()", Tenant.class).getResultList();// Make sure the master tenant is always on top