Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Implemented realm deletion with propagation and also renamed all usages of Tenant to Realm (#716)

Rich Turner1f0fe8a40b0f
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
index 4f5a35012..51e22af90 100644
--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
@@ -44,9 +44,9 @@ import org.openremote.model.provisioning.ProvisioningConfig;
import org.openremote.model.provisioning.X509ProvisioningConfig;
import org.openremote.model.rules.AssetRuleset;
import org.openremote.model.rules.GlobalRuleset;
-import org.openremote.model.rules.TenantRuleset;
+import org.openremote.model.rules.RealmRuleset;
+import org.openremote.model.security.Realm;
import org.openremote.model.security.RealmRole;
-import org.openremote.model.security.Tenant;
import org.openremote.model.security.User;
import org.openremote.model.security.UserAttribute;
import org.openremote.model.syslog.SyslogEvent;
@@ -296,13 +296,13 @@ public class PersistenceService implements ContainerService, Consumer<Persistenc
entityClasses.add(AssetDatapoint.class.getName());
entityClasses.add(SentNotification.class.getName());
entityClasses.add(AssetPredictedDatapoint.class.getName());
- entityClasses.add(Tenant.class.getName());
+ entityClasses.add(Realm.class.getName());
entityClasses.add(User.class.getName());
entityClasses.add(UserAttribute.class.getName());
entityClasses.add(RealmRole.class.getName());
entityClasses.add(GlobalRuleset.class.getName());
entityClasses.add(AssetRuleset.class.getName());
- entityClasses.add(TenantRuleset.class.getName());
+ entityClasses.add(RealmRuleset.class.getName());
entityClasses.add(SyslogEvent.class.getName());
entityClasses.add(GatewayConnection.class.getName());
entityClasses.add(ConsoleAppConfig.class.getName());
@@ -448,7 +448,7 @@ public class PersistenceService implements ContainerService, Consumer<Persistenc
* Generate {@link PersistenceEvent}s for entities not managed by JPA (i.e. Keycloak entities)
*/
public void publishPersistenceEvent(PersistenceEvent.Cause cause, Object entity, String[] propertyNames, Object[] currentState, Object[] previousState) {
- // Fire persistence event although we don't use database for Tenant CUD but call Keycloak API
+ // Fire persistence event although we don't use database for Realm CUD but call Keycloak API
PersistenceEvent<?> persistenceEvent = new PersistenceEvent<>(cause, entity, propertyNames, currentState, previousState);
if (messageBrokerService.getProducerTemplate() != null) {
diff --git a/container/src/main/java/org/openremote/container/security/AuthContext.java b/container/src/main/java/org/openremote/container/security/AuthContext.java
index 906dcba9a..53d611d63 100644
--- a/container/src/main/java/org/openremote/container/security/AuthContext.java
+++ b/container/src/main/java/org/openremote/container/security/AuthContext.java
@@ -26,7 +26,7 @@ import org.openremote.model.Constants;
*/
public interface AuthContext {
- String getAuthenticatedRealm();
+ String getAuthenticatedRealmName();
String getUsername();
@@ -38,7 +38,7 @@ public interface AuthContext {
* @return <code>true</code> if the user is authenticated in the "master" realm and has the realm role "admin".
*/
default boolean isSuperUser() {
- return Constants.MASTER_REALM.equals(getAuthenticatedRealm()) && hasRealmRole(Constants.REALM_ADMIN_ROLE);
+ return Constants.MASTER_REALM.equals(getAuthenticatedRealmName()) && hasRealmRole(Constants.REALM_ADMIN_ROLE);
}
boolean hasRealmRole(String role);
@@ -53,6 +53,6 @@ public interface AuthContext {
* @return <code>true</code> if the user is authenticated in the same realm or if the user is the superuser (admin).
*/
default boolean isRealmAccessibleByUser(String realm) {
- return realm != null && realm.length() > 0 && (realm.equals(getAuthenticatedRealm()) || isSuperUser());
+ return realm != null && realm.length() > 0 && (realm.equals(getAuthenticatedRealmName()) || isSuperUser());
}
}
diff --git a/container/src/main/java/org/openremote/container/security/basic/BasicAuthContext.java b/container/src/main/java/org/openremote/container/security/basic/BasicAuthContext.java
index 2a6343681..445e7552e 100644
--- a/container/src/main/java/org/openremote/container/security/basic/BasicAuthContext.java
+++ b/container/src/main/java/org/openremote/container/security/basic/BasicAuthContext.java
@@ -45,7 +45,7 @@ public class BasicAuthContext implements AuthContext, Principal {
@Override
- public String getAuthenticatedRealm() {
+ public String getAuthenticatedRealmName() {
return authenticatedRealm;
}
diff --git a/container/src/main/java/org/openremote/container/security/keycloak/AccessTokenAuthContext.java b/container/src/main/java/org/openremote/container/security/keycloak/AccessTokenAuthContext.java
index 21034aeeb..bc6621250 100644
--- a/container/src/main/java/org/openremote/container/security/keycloak/AccessTokenAuthContext.java
+++ b/container/src/main/java/org/openremote/container/security/keycloak/AccessTokenAuthContext.java
@@ -36,7 +36,7 @@ public class AccessTokenAuthContext implements AuthContext {
}
@Override
- public String getAuthenticatedRealm() {
+ public String getAuthenticatedRealmName() {
return authenticatedRealm;
}
diff --git a/container/src/main/java/org/openremote/container/web/WebResource.java b/container/src/main/java/org/openremote/container/web/WebResource.java
index 551dccd2e..f0a0955f5 100644
--- a/container/src/main/java/org/openremote/container/web/WebResource.java
+++ b/container/src/main/java/org/openremote/container/web/WebResource.java
@@ -31,7 +31,6 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.*;
import java.security.Principal;
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
import static org.openremote.model.Constants.REALM_PARAM_NAME;
@@ -67,7 +66,7 @@ public class WebResource implements AuthContext {
return request.getRemoteAddr();
}
- public String getRequestRealm() {
+ public String getRequestRealmName() {
return request.getHeader(REALM_PARAM_NAME);
}
@@ -98,8 +97,8 @@ public class WebResource implements AuthContext {
// Convenience methods
@Override
- public String getAuthenticatedRealm() {
- return isAuthenticated() ? getAuthContext().getAuthenticatedRealm() : null;
+ public String getAuthenticatedRealmName() {
+ return isAuthenticated() ? getAuthContext().getAuthenticatedRealmName() : null;
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
index f267a0ea8..091452e7b 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
@@ -71,7 +71,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
public Agent<?, ?, ?>[] doProtocolInstanceDiscovery(RequestParams requestParams, String parentId, String agentType, String realm) {
if (!isSuperUser()) {
- realm = getAuthenticatedRealm();
+ realm = getAuthenticatedRealmName();
}
if (parentId != null) {
@@ -109,7 +109,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
public AssetTreeNode[] doProtocolAssetDiscovery(RequestParams requestParams, String agentId, String realm) {
if (!isSuperUser()) {
- realm = getAuthenticatedRealm();
+ realm = getAuthenticatedRealmName();
}
Agent<?, ?, ?> agent = agentService.getAgent(agentId);
@@ -149,7 +149,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
public AssetTreeNode[] doProtocolAssetImport(RequestParams requestParams, String agentId, String realm, FileInfo fileInfo) {
if (!isSuperUser()) {
- realm = getAuthenticatedRealm();
+ realm = getAuthenticatedRealmName();
}
Agent<?, ?, ?> agent = agentService.getAgent(agentId);
@@ -234,7 +234,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
}
protected Asset<?> getParent(String parentId, String realm) throws WebApplicationException {
- if (!isSuperUser() && !realm.equals(getAuthenticatedRealm())) {
+ if (!isSuperUser() && !realm.equals(getAuthenticatedRealmName())) {
throw new ForbiddenException();
}
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
index 58132279b..d1c2549d2 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
@@ -303,7 +303,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
}
} else {
// Check realm, must be accessible
- if (!identityService.getIdentityProvider().isTenantActiveAndAccessible(authContext,
+ if (!identityService.getIdentityProvider().isRealmActiveAndAccessible(authContext,
asset.getRealm())) {
throw new AssetProcessingException(INSUFFICIENT_ACCESS);
}
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
index c5770eb65..9da2ba0eb 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
@@ -31,7 +31,7 @@ import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.attribute.*;
import org.openremote.model.http.RequestParams;
import org.openremote.model.query.AssetQuery;
-import org.openremote.model.query.filter.TenantPredicate;
+import org.openremote.model.query.filter.RealmPredicate;
import org.openremote.model.security.ClientRole;
import org.openremote.model.util.TextUtil;
import org.openremote.model.util.ValueUtil;
@@ -80,7 +80,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
if (!isRestrictedUser()) {
assetQuery
- .tenant(new TenantPredicate(getAuthenticatedRealm()))
+ .realm(new RealmPredicate(getAuthenticatedRealmName()))
.recursive(true);
} else {
assetQuery
@@ -101,20 +101,20 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
@Override
public UserAssetLink[] getUserAssetLinks(RequestParams requestParams, String realm, String userId, String assetId) {
try {
- realm = TextUtil.isNullOrEmpty(realm) ? getAuthenticatedRealm() : realm;
+ realm = TextUtil.isNullOrEmpty(realm) ? getAuthenticatedRealmName() : realm;
boolean hasAdminReadRole = hasResourceRole(ClientRole.READ_ADMIN.getValue(), Constants.KEYCLOAK_CLIENT_ID);
if (realm == null)
throw new WebApplicationException(BAD_REQUEST);
- if (!(isSuperUser() || getAuthenticatedRealm().equals(realm)))
+ if (!(isSuperUser() || getAuthenticatedRealmName().equals(realm)))
throw new WebApplicationException(FORBIDDEN);
if (!hasAdminReadRole && userId != null && !Objects.equals(getUserId(), userId)) {
throw new ForbiddenException("Can only retrieve own asset links unless you have role '" + ClientRole.READ_ADMIN + "'");
}
- if (userId != null && !identityService.getIdentityProvider().isUserInTenant(userId, realm))
+ if (userId != null && !identityService.getIdentityProvider().isUserInRealm(userId, realm))
throw new WebApplicationException(BAD_REQUEST);
UserAssetLink[] result = assetStorageService.findUserAssetLinks(realm, userId, assetId).toArray(new UserAssetLink[0]);
@@ -152,18 +152,18 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
}
});
- if (!isSuperUser() && !realm.equals(getAuthenticatedRealm())) {
+ if (!isSuperUser() && !realm.equals(getAuthenticatedRealmName())) {
throw new WebApplicationException(FORBIDDEN);
}
- if (!identityService.getIdentityProvider().isUserInTenant(userId, realm)) {
+ if (!identityService.getIdentityProvider().isUserInRealm(userId, realm)) {
throw new WebApplicationException(FORBIDDEN);
}
List<Asset<?>> assets = assetStorageService.findAll(
new AssetQuery()
.select(new AssetQuery.Select().excludeAttributes())
- .tenant(new TenantPredicate(realm))
+ .realm(new RealmPredicate(realm))
.ids(assetIds)
);
@@ -191,12 +191,12 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
}
// Regular users in a different realm can not delete links
- if (!isSuperUser() && !getAuthenticatedTenant().getRealm().equals(realm)) {
+ if (!isSuperUser() && !getAuthenticatedRealm().getName().equals(realm)) {
throw new WebApplicationException(FORBIDDEN);
}
// User must be in the same realm as the requested realm
- if (!identityService.getIdentityProvider().isUserInTenant(userId, realm)) {
+ if (!identityService.getIdentityProvider().isUserInRealm(userId, realm)) {
throw new WebApplicationException(FORBIDDEN);
}
@@ -219,7 +219,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
}
// Regular users in a different realm can not delete links
- if (!isSuperUser() && !getAuthenticatedTenant().getRealm().equals(realm)) {
+ if (!isSuperUser() && !getAuthenticatedRealm().getName().equals(realm)) {
throw new WebApplicationException(FORBIDDEN);
}
@@ -259,7 +259,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
if (asset == null)
throw new WebApplicationException(NOT_FOUND);
- if (!isTenantActiveAndAccessible(asset.getRealm())) {
+ if (!isRealmActiveAndAccessible(asset.getRealm())) {
LOG.info("Forbidden access for user '" + getUsername() + "': " + asset);
throw new WebApplicationException(FORBIDDEN);
}
@@ -283,8 +283,8 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
throw new WebApplicationException(NOT_FOUND);
// Realm of asset must be accessible
- if (!isTenantActiveAndAccessible(storageAsset.getRealm())) {
- LOG.info("Tenant not accessible by user '" + getUsername() + "', can't update: " + storageAsset);
+ if (!isRealmActiveAndAccessible(storageAsset.getRealm())) {
+ LOG.info("Realm not accessible by user '" + getUsername() + "', can't update: " + storageAsset);
throw new WebApplicationException(FORBIDDEN);
}
@@ -476,8 +476,8 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
// If there was no realm provided (create was called by regular user in manager UI), use the auth realm
if (asset.getRealm() == null || asset.getRealm().length() == 0) {
- asset.setRealm(getAuthenticatedTenant().getRealm());
- } else if (!isTenantActiveAndAccessible(asset.getRealm())) {
+ asset.setRealm(getAuthenticatedRealm().getName());
+ } else if (!isRealmActiveAndAccessible(asset.getRealm())) {
LOG.info("Forbidden access for user '" + getUsername() + "', can't create: " + asset);
throw new WebApplicationException(FORBIDDEN);
}
@@ -544,7 +544,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
throw new WebApplicationException(BAD_REQUEST);
}
- if (assets.stream().map(Asset::getRealm).distinct().anyMatch(asset -> !isTenantActiveAndAccessible(asset))) {
+ if (assets.stream().map(Asset::getRealm).distinct().anyMatch(asset -> !isRealmActiveAndAccessible(asset))) {
LOG.info("Forbidden access for user '" + getUsername() + "', can't delete requested assets");
throw new WebApplicationException(FORBIDDEN);
}
@@ -560,7 +560,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
@Override
public Asset<?>[] queryAssets(RequestParams requestParams, AssetQuery query) {
try {
- query = assetStorageService.prepareAssetQuery(query, getAuthContext(), getRequestRealm());
+ query = assetStorageService.prepareAssetQuery(query, getAuthContext(), getRequestRealmName());
List<Asset<?>> result = assetStorageService.findAll(query);
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
index 633c0043a..7cc627a46 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -33,7 +33,10 @@ import org.openremote.manager.event.EventSubscriptionAuthorizer;
import org.openremote.manager.gateway.GatewayService;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebService;
-import org.openremote.model.*;
+import org.openremote.model.Constants;
+import org.openremote.model.Container;
+import org.openremote.model.ContainerService;
+import org.openremote.model.PersistenceEvent;
import org.openremote.model.asset.*;
import org.openremote.model.asset.impl.GroupAsset;
import org.openremote.model.attribute.Attribute;
@@ -163,14 +166,14 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
boolean isAnonymous = auth == null;
boolean isRestricted = identityService.getIdentityProvider().isRestrictedUser(auth);
String userId = !isAnonymous ? auth.getUserId() : null;
- String realm = requestRealm != null ? requestRealm : !isAnonymous ? auth.getAuthenticatedRealm() : null;
+ String realm = requestRealm != null ? requestRealm : !isAnonymous ? auth.getAuthenticatedRealmName() : null;
if (realm == null) {
LOG.fine("Anonymous subscriptions must specify a realm");
return false;
}
- if (isAnonymous || (requestRealm != null && !requestRealm.equals(auth.getAuthenticatedRealm()))) {
+ if (isAnonymous || (requestRealm != null && !requestRealm.equals(auth.getAuthenticatedRealmName()))) {
// Users can only request public assets in different realms so force public events in the filter
filter.setPublicEvents(true);
}
@@ -471,7 +474,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
boolean isRestricted = identityService.getIdentityProvider().isRestrictedUser(authContext);
// Take realm from query, requestRealm or lastly auth context (super users can query with no realm)
- String realm = query.tenant != null ? query.tenant.realm : requestRealm != null ? requestRealm : (!isSuperUser && authContext != null ? authContext.getAuthenticatedRealm() : null);
+ String realm = query.realm != null ? query.realm.name : requestRealm != null ? requestRealm : (!isSuperUser && authContext != null ? authContext.getAuthenticatedRealmName() : null);
if (!isSuperUser) {
if (TextUtil.isNullOrEmpty(realm)) {
@@ -504,20 +507,20 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
throw new IllegalStateException(msg);
}
- if (query.access != PUBLIC && !realm.equals(authContext.getAuthenticatedRealm())) {
+ if (query.access != PUBLIC && !realm.equals(authContext.getAuthenticatedRealmName())) {
String msg = "Realm must match authenticated realm for non public access queries";
LOG.finer(msg);
throw new IllegalStateException(msg);
}
- query.tenant = new TenantPredicate(realm);
+ query.realm = new RealmPredicate(realm);
if (query.access == PROTECTED) {
query.userIds(authContext.getUserId());
}
}
- if (!identityService.getIdentityProvider().isTenantActiveAndAccessible(authContext, realm)) {
+ if (!identityService.getIdentityProvider().isRealmActiveAndAccessible(authContext, realm)) {
String msg = "Realm is not present or is inactive";
LOG.finer(msg);
throw new IllegalStateException(msg);
@@ -725,7 +728,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
throw new IllegalStateException(msg);
}
- if (!identityService.getIdentityProvider().tenantExists(asset.getRealm())) {
+ if (!identityService.getIdentityProvider().realmExists(asset.getRealm())) {
String msg = "Asset realm not found or is inactive: asset=" + asset;
LOG.info(msg);
throw new IllegalStateException(msg);
@@ -858,7 +861,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
Map<String, List<String>> gatewayIdAssetIdMap = new HashMap<>();
if (!skipGatewayCheck) {
- List<String> gatewayIds = ids.stream().filter(id -> gatewayService.isLocallyRegisteredGateway(id)).collect(Collectors.toList());
+ List<String> gatewayIds = ids.stream().filter(id -> gatewayService.isLocallyRegisteredGateway(id)).toList();
if (!gatewayIds.isEmpty()) {
// Handle gateway asset deletion in a special way
@@ -1722,10 +1725,10 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
}
if (!recursive || level == 3) {
- if (query.tenant != null && !TextUtil.isNullOrEmpty(query.tenant.realm)) {
+ if (query.realm != null && !TextUtil.isNullOrEmpty(query.realm.name)) {
final int pos = binders.size() + 1;
sb.append(" and A.REALM = ?").append(pos);
- binders.add((em, st) -> st.setParameter(pos, query.tenant.realm));
+ binders.add((em, st) -> st.setParameter(pos, query.realm.name));
}
if (query.userIds != null) {
diff --git a/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java
index a0e80c4a3..a523059b6 100644
--- a/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java
@@ -38,8 +38,8 @@ import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.filter.AttributePredicate;
import org.openremote.model.query.filter.ParentPredicate;
import org.openremote.model.query.filter.StringPredicate;
-import org.openremote.model.query.filter.TenantPredicate;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.query.filter.RealmPredicate;
+import org.openremote.model.security.Realm;
import org.openremote.model.util.TextUtil;
import javax.ws.rs.BadRequestException;
@@ -77,7 +77,7 @@ public class ConsoleResourceImpl extends ManagerWebResource implements ConsoleRe
@Override
public ConsoleRegistration register(RequestParams requestParams, ConsoleRegistration consoleRegistration) {
- if (getRequestTenant() == null) {
+ if (getRequestRealm() == null) {
throw new BadRequestException("Invalid realm");
}
@@ -94,8 +94,8 @@ public class ConsoleResourceImpl extends ManagerWebResource implements ConsoleRe
if (consoleAsset == null) {
consoleAsset = initConsoleAsset(consoleRegistration, true, true);
- consoleAsset.setRealm(getRequestRealm());
- consoleAsset.setParentId(getConsoleParentAssetId(getRequestRealm()));
+ consoleAsset.setRealm(getRequestRealmName());
+ consoleAsset.setParentId(getConsoleParentAssetId(getRequestRealmName()));
consoleAsset.setId(consoleRegistration.getId());
}
@@ -109,7 +109,7 @@ public class ConsoleResourceImpl extends ManagerWebResource implements ConsoleRe
// If authenticated link the console to this user
if (isAuthenticated()) {
- assetStorageService.storeUserAssetLinks(Collections.singletonList(new UserAssetLink(getAuthenticatedRealm(), getUserId(), consoleAsset.getId())));
+ assetStorageService.storeUserAssetLinks(Collections.singletonList(new UserAssetLink(getAuthenticatedRealmName(), getUserId(), consoleAsset.getId())));
}
return consoleRegistration;
@@ -137,7 +137,7 @@ public class ConsoleResourceImpl extends ManagerWebResource implements ConsoleRe
String id = realmConsoleParentMap.get(realm);
if (TextUtil.isNullOrEmpty(id)) {
- Asset<?> consoleParent = getConsoleParentAsset(assetStorageService, getRequestTenant());
+ Asset<?> consoleParent = getConsoleParentAsset(assetStorageService, getRequestRealm());
id = consoleParent.getId();
realmConsoleParentMap.put(realm, id);
}
@@ -146,7 +146,7 @@ public class ConsoleResourceImpl extends ManagerWebResource implements ConsoleRe
});
}
- public static Asset<?> getConsoleParentAsset(AssetStorageService assetStorageService, Tenant tenant) {
+ public static Asset<?> getConsoleParentAsset(AssetStorageService assetStorageService, Realm realm) {
// Look for a group asset with a child type of console in the realm root
GroupAsset consoleParent = (GroupAsset) assetStorageService.find(
@@ -155,14 +155,14 @@ public class ConsoleResourceImpl extends ManagerWebResource implements ConsoleRe
.names(CONSOLE_PARENT_ASSET_NAME)
.parents(new ParentPredicate(null))
.types(GroupAsset.class)
- .tenant(new TenantPredicate(tenant.getRealm()))
+ .realm(new RealmPredicate(realm.getName()))
.attributes(new AttributePredicate("childAssetType", new StringPredicate(ConsoleAsset.DESCRIPTOR.getName())))
);
if (consoleParent == null) {
consoleParent = new GroupAsset(CONSOLE_PARENT_ASSET_NAME, ConsoleAsset.class);
consoleParent.setChildAssetType(ConsoleAsset.DESCRIPTOR.getName());
- consoleParent.setRealm(tenant.getRealm());
+ consoleParent.setRealm(realm.getName());
consoleParent = assetStorageService.merge(consoleParent);
}
return consoleParent;
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
index d637bafe4..51955a44f 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
@@ -93,7 +93,7 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
- if (!isTenantActiveAndAccessible(asset.getRealm())) {
+ if (!isRealmActiveAndAccessible(asset.getRealm())) {
LOG.info("Forbidden access for user '" + getUsername() + "': " + asset);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
@@ -128,7 +128,7 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
- if (!isTenantActiveAndAccessible(asset.getRealm())) {
+ if (!isRealmActiveAndAccessible(asset.getRealm())) {
LOG.info("Forbidden access for user '" + getUsername() + "': " + asset);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
@@ -161,7 +161,7 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
- if (!isTenantActiveAndAccessible(asset.getRealm())) {
+ if (!isRealmActiveAndAccessible(asset.getRealm())) {
DATA_EXPORT_LOG.info("Forbidden access for user '" + getUsername() + "': " + asset);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointResourceImpl.java
index 11f8882eb..c47a31562 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointResourceImpl.java
@@ -74,7 +74,7 @@ public class AssetPredictedDatapointResourceImpl extends ManagerWebResource impl
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
- if (!isTenantActiveAndAccessible(asset.getRealm())) {
+ if (!isRealmActiveAndAccessible(asset.getRealm())) {
LOG.info("Forbidden access for user '" + getUsername() + "': " + asset);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.java
index 00dc8b058..cf0d04314 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.java
@@ -47,7 +47,7 @@ public class GatewayClientResourceImpl extends ManagerWebResource implements Gat
@Override
public GatewayConnection getConnection(RequestParams requestParams, String realm) {
- if (!realm.equals(getAuthenticatedRealm()) && !isSuperUser()) {
+ if (!realm.equals(getAuthenticatedRealmName()) && !isSuperUser()) {
throw new WebApplicationException(FORBIDDEN);
}
@@ -60,7 +60,7 @@ public class GatewayClientResourceImpl extends ManagerWebResource implements Gat
@Override
public ConnectionStatus getConnectionStatus(RequestParams requestParams, String realm) {
- if (!realm.equals(getAuthenticatedRealm()) && !isSuperUser()) {
+ if (!realm.equals(getAuthenticatedRealmName()) && !isSuperUser()) {
throw new WebApplicationException(FORBIDDEN);
}
@@ -84,7 +84,7 @@ public class GatewayClientResourceImpl extends ManagerWebResource implements Gat
public void setConnection(RequestParams requestParams, String realm, GatewayConnection connection) {
connection.setLocalRealm(realm);
- if (!connection.getLocalRealm().equals(getAuthenticatedRealm()) && !isSuperUser()) {
+ if (!connection.getLocalRealm().equals(getAuthenticatedRealmName()) && !isSuperUser()) {
throw new WebApplicationException(FORBIDDEN);
}
@@ -106,7 +106,7 @@ public class GatewayClientResourceImpl extends ManagerWebResource implements Gat
throw new WebApplicationException(BAD_REQUEST);
}
- if ((realms.size() > 1 || !getAuthenticatedRealm().equals(realms.get(0))) && !isSuperUser()) {
+ if ((realms.size() > 1 || !getAuthenticatedRealmName().equals(realms.get(0))) && !isSuperUser()) {
throw new WebApplicationException(FORBIDDEN);
}
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
index 05620ffef..e475c8fc4 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
@@ -43,12 +43,12 @@ import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.event.shared.EventRequestResponseWrapper;
import org.openremote.model.event.shared.EventSubscription;
import org.openremote.model.event.shared.SharedEvent;
-import org.openremote.model.event.shared.TenantFilter;
+import org.openremote.model.event.shared.RealmFilter;
import org.openremote.model.gateway.GatewayConnection;
import org.openremote.model.gateway.GatewayConnectionStatusEvent;
import org.openremote.model.gateway.GatewayDisconnectEvent;
import org.openremote.model.query.AssetQuery;
-import org.openremote.model.query.filter.TenantPredicate;
+import org.openremote.model.query.filter.RealmPredicate;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.ValueUtil;
@@ -109,7 +109,7 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi
if (!authContext.isSuperUser()) {
@SuppressWarnings("unchecked")
EventSubscription<GatewayConnectionStatusEvent> subscription = (EventSubscription<GatewayConnectionStatusEvent>) eventSubscription;
- subscription.setFilter(new TenantFilter<>(authContext.getAuthenticatedRealm()));
+ subscription.setFilter(new RealmFilter<>(authContext.getAuthenticatedRealmName()));
}
return true;
@@ -339,7 +339,7 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi
ReadAssetsEvent readAssets = (ReadAssetsEvent)event;
AssetQuery query = readAssets.getAssetQuery();
// Force realm to be the one that this client is associated with
- query.tenant(new TenantPredicate(connection.getLocalRealm()));
+ query.realm(new RealmPredicate(connection.getLocalRealm()));
List<Asset<?>> assets = assetStorageService.findAll(readAssets.getAssetQuery());
sendCentralManagerMessage(
@@ -390,7 +390,7 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi
persistenceService.doTransaction(em -> em.merge(connection));
}
- protected boolean deleteConnections(List<String> realms) {
+ public boolean deleteConnections(List<String> realms) {
LOG.info("Deleting gateway connections for the following realm(s): " + Arrays.toString(realms.toArray()));
try {
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
index b0dc39994..878b7c48d 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
@@ -43,7 +43,7 @@ import org.openremote.model.event.shared.SharedEvent;
import org.openremote.model.gateway.GatewayDisconnectEvent;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.rules.Ruleset;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import org.openremote.model.security.User;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.TextUtil;
@@ -91,7 +91,7 @@ public class GatewayService extends RouteBuilder implements ContainerService, As
protected final Map<String, GatewayConnector> gatewayConnectorMap = new HashMap<>();
protected final Map<String, String> assetIdGatewayIdMap = new HashMap<>();
protected boolean active;
- protected List<String> tenantIds = new ArrayList<>();
+ protected List<String> realmIds = new ArrayList<>();
@SuppressWarnings("unchecked")
public static Predicate isNotForGateway(GatewayService gatewayService) {
@@ -104,17 +104,17 @@ public class GatewayService extends RouteBuilder implements ContainerService, As
// Need to look at parent as this asset may not have been acknowledged by the gateway service yet
return gatewayService.getLocallyRegisteredGatewayId(asset.getId(), asset.getParentId()) == null;
}
- if (isPersistenceEventForEntityType(Tenant.class).matches(exchange)) {
- PersistenceEvent<Tenant> persistenceEvent = (PersistenceEvent<Tenant>)exchange.getIn().getBody(PersistenceEvent.class);
- Tenant tenant = persistenceEvent.getEntity();
+ if (isPersistenceEventForEntityType(Realm.class).matches(exchange)) {
+ PersistenceEvent<Realm> persistenceEvent = (PersistenceEvent<Realm>)exchange.getIn().getBody(PersistenceEvent.class);
+ Realm realm = persistenceEvent.getEntity();
if (persistenceEvent.getCause() == PersistenceEvent.Cause.DELETE) {
// Ruleset won't exist in storage so check cache
- return gatewayService.tenantIds.remove(tenant.getId());
+ return gatewayService.realmIds.remove(realm.getId());
}
- Tenant localTenant = gatewayService.identityProvider.getTenant(tenant.getRealm());
- if (localTenant != null && localTenant.getId().equals(tenant.getId())) {
- gatewayService.tenantIds.add(tenant.getId());
+ Realm localRealm = gatewayService.identityProvider.getRealm(realm.getName());
+ if (localRealm != null && localRealm.getId().equals(realm.getId())) {
+ gatewayService.realmIds.add(realm.getId());
return true;
}
return false;
diff --git a/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java b/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java
index 9764e4678..1d2c93ba2 100644
--- a/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java
@@ -41,7 +41,7 @@ public class MapResourceImpl extends WebResource implements MapResource {
@Override
public ObjectNode getSettings(RequestParams requestParams) {
return mapService.getMapSettings(
- getRequestRealm(),
+ getRequestRealmName(),
requestParams.getExternalRequestBaseUri()
);
}
@@ -49,7 +49,7 @@ public class MapResourceImpl extends WebResource implements MapResource {
@Override
public ObjectNode getSettingsJs(RequestParams requestParams) {
return mapService.getMapSettingsJs(
- getAuthenticatedRealm(),
+ getAuthenticatedRealmName(),
requestParams.getExternalRequestBaseUri()
);
}
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
index 221c77c75..fcb7b2f72 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
@@ -40,7 +40,7 @@ import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import org.openremote.model.security.User;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.TextUtil;
@@ -203,10 +203,10 @@ public class MqttBrokerService extends RouteBuilder implements ContainerService,
*/
@Override
public boolean checkValid(String clientId, String username, byte[] password) {
- String realm = null;
+ String realmName = null;
if (username != null) {
String[] realmAndClientId = username.split(":");
- realm = realmAndClientId[0];
+ realmName = realmAndClientId[0];
username = realmAndClientId[1]; // This is OAuth clientId
}
String suppliedClientSecret = password != null ? new String(password, StandardCharsets.UTF_8) : null;
@@ -214,21 +214,21 @@ public class MqttBrokerService extends RouteBuilder implements ContainerService,
// Removed client ID check as it won't execute for anonymous connections; single connection per user is more
// important
- if (TextUtil.isNullOrEmpty(realm)
+ if (TextUtil.isNullOrEmpty(realmName)
|| TextUtil.isNullOrEmpty(username)
|| TextUtil.isNullOrEmpty(suppliedClientSecret)) {
LOG.fine("Realm, client ID and/or client secret missing so this is an anonymous session: " + clientId);
return true;
}
- Tenant tenant = identityProvider.getTenant(realm);
+ Realm realm = identityProvider.getRealm(realmName);
- if (tenant == null || !tenant.isActive(timerService.getCurrentTimeMillis())) {
- LOG.warning("Realm not found or is inactive: " + realm);
+ if (realm == null || !realm.isActive(timerService.getCurrentTimeMillis())) {
+ LOG.warning("Realm not found or is inactive: " + realmName);
return false;
}
- User user = identityProvider.getUserByUsername(realm, User.SERVICE_ACCOUNT_PREFIX + username);
+ User user = identityProvider.getUserByUsername(realmName, User.SERVICE_ACCOUNT_PREFIX + username);
if (user == null || user.getEnabled() == null || !user.getEnabled() || TextUtil.isNullOrEmpty(user.getSecret())) {
LOG.warning("User not found, disabled or doesn't support client credentials grant type: username=" + username);
return false;
diff --git a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
index f486a4970..897f5bbc3 100644
--- a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
+++ b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
@@ -29,7 +29,7 @@ import org.openremote.model.notification.EmailNotificationMessage;
import org.openremote.model.notification.Notification;
import org.openremote.model.notification.NotificationSendResult;
import org.openremote.model.query.UserQuery;
-import org.openremote.model.query.filter.TenantPredicate;
+import org.openremote.model.query.filter.RealmPredicate;
import org.openremote.model.query.filter.UserAssetPredicate;
import org.openremote.model.util.TextUtil;
import org.simplejavamail.email.Email;
@@ -157,8 +157,8 @@ public class EmailNotificationHandler implements NotificationHandler {
switch (targetType) {
- case TENANT:
- userQuery = new UserQuery().tenant(new TenantPredicate(targetId));
+ case REALM:
+ userQuery = new UserQuery().realm(new RealmPredicate(targetId));
break;
case USER:
userQuery = new UserQuery().ids(targetId);
diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/NotificationHandler.java
index d8598ea7f..d27c3e12a 100644
--- a/manager/src/main/java/org/openremote/manager/notification/NotificationHandler.java
+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationHandler.java
@@ -60,9 +60,9 @@ public interface NotificationHandler extends ContainerService {
* Map the requested targets to one or more targets that are compatible with this handler; if there are no compatible
* targets then return null. If the requested target is already compatible then it can just be returned; handlers
* are free to determine how the requested target should be mapped (e.g. if requested {@link Notification.TargetType}
- * was {@link Notification.TargetType#TENANT} and this handler only supports targets of type
+ * was {@link Notification.TargetType#REALM} and this handler only supports targets of type
* {@link Notification.TargetType#ASSET} where the {@link Asset}s must be {@link ConsoleAsset} then the handler
- * needs to find all console assets that belong to the specified tenant). Handlers can also add extra
+ * needs to find all console assets that belong to the specified realm). Handlers can also add extra
* {@link org.openremote.model.notification.Notification.TargetType#CUSTOM} handlers extracted from the message.
*/
List<Notification.Target> getTargets(Notification.Source source, String sourceId, List<Notification.Target> requestedTargets, AbstractNotificationMessage message);
diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java b/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java
index 3858e6c9a..f9b747b1f 100644
--- a/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java
@@ -62,14 +62,14 @@ public class NotificationResourceImpl extends WebResource implements Notificatio
}
@Override
- public SentNotification[] getNotifications(RequestParams requestParams, Long id, String type, Long fromTimestamp, Long toTimestamp, String tenantId, String userId, String assetId) {
+ public SentNotification[] getNotifications(RequestParams requestParams, Long id, String type, Long fromTimestamp, Long toTimestamp, String realmId, String userId, String assetId) {
try {
return notificationService.getNotifications(
id != null ? Collections.singletonList(id) : null,
type != null ? Collections.singletonList(type) : null,
fromTimestamp,
toTimestamp,
- tenantId != null ? Collections.singletonList(tenantId) : null,
+ realmId != null ? Collections.singletonList(realmId) : null,
userId != null ? Collections.singletonList(userId) : null,
assetId != null ? Collections.singletonList(assetId) : null
).toArray(new SentNotification[0]);
@@ -79,14 +79,14 @@ public class NotificationResourceImpl extends WebResource implements Notificatio
}
@Override
- public void removeNotifications(RequestParams requestParams, Long id, String type, Long fromTimestamp, Long toTimestamp, String tenantId, String userId, String assetId) {
+ public void removeNotifications(RequestParams requestParams, Long id, String type, Long fromTimestamp, Long toTimestamp, String realmId, String userId, String assetId) {
try {
notificationService.removeNotifications(
id != null ? Collections.singletonList(id) : null,
type != null ? Collections.singletonList(type) : null,
fromTimestamp,
toTimestamp,
- tenantId != null ? Collections.singletonList(tenantId) : null,
+ realmId != null ? Collections.singletonList(realmId) : null,
userId != null ? Collections.singletonList(userId) : null,
assetId != null ? Collections.singletonList(assetId) : null);
} catch (IllegalArgumentException e) {
@@ -184,11 +184,11 @@ public class NotificationResourceImpl extends WebResource implements Notificatio
boolean isRestrictedUser = managerIdentityService.getIdentityProvider().isRestrictedUser(getAuthContext());
switch (sentNotification.getTarget()) {
- case TENANT:
- // What does it mean when a notification has been sent to a tenant - who can acknowledge them?
+ case REALM:
+ // What does it mean when a notification has been sent to a realm - who can acknowledge them?
if (isRestrictedUser) {
- LOG.fine("DENIED: Restricted user request to update a notification sent to a tenant");
- throw new WebApplicationException("Restricted users cannot update a tenant notification", FORBIDDEN);
+ LOG.fine("DENIED: Restricted user request to update a notification sent to a realm");
+ throw new WebApplicationException("Restricted users cannot update a realm notification", FORBIDDEN);
}
break;
case USER:
@@ -203,7 +203,7 @@ public class NotificationResourceImpl extends WebResource implements Notificatio
LOG.fine("DENIED: User request to update a notification sent to an asset that doesn't exist");
throw new WebApplicationException("Asset not found", NOT_FOUND);
}
- if (!asset.getRealm().equals(getAuthenticatedRealm())) {
+ if (!asset.getRealm().equals(getAuthenticatedRealmName())) {
LOG.fine("DENIED: User request to update a notification sent to an asset that is in another realm");
throw new WebApplicationException("Asset not in users realm", FORBIDDEN);
}
diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
index 45d22c3fb..0896d670f 100644
--- a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
@@ -196,7 +196,7 @@ public class NotificationService extends RouteBuilder implements ContainerServic
throw new NotificationProcessingException(INSUFFICIENT_ACCESS);
}
- realm = authContext.getAuthenticatedRealm();
+ realm = authContext.getAuthenticatedRealmName();
userId = authContext.getUserId();
sourceId.set(userId);
isSuperUser = authContext.isSuperUser();
@@ -207,7 +207,7 @@ public class NotificationService extends RouteBuilder implements ContainerServic
isSuperUser = true;
break;
- case TENANT_RULESET:
+ case REALM_RULESET:
realm = exchange.getIn().getHeader(Notification.HEADER_SOURCE_ID, String.class);
sourceId.set(realm);
break;
@@ -341,11 +341,11 @@ public class NotificationService extends RouteBuilder implements ContainerServic
return persistenceService.doReturningTransaction(em -> em.find(SentNotification.class, notificationId));
}
- public List<SentNotification> getNotifications(List<Long> ids, List<String> types, Long fromTimestamp, Long toTimestamp, List<String> tenantIds, List<String> userIds, List<String> assetIds) throws IllegalArgumentException {
+ public List<SentNotification> getNotifications(List<Long> ids, List<String> types, Long fromTimestamp, Long toTimestamp, List<String> realmIds, List<String> userIds, List<String> assetIds) throws IllegalArgumentException {
StringBuilder builder = new StringBuilder();
builder.append("select n from SentNotification n where 1=1");
List<Object> parameters = new ArrayList<>();
- processCriteria(builder, parameters, ids, types, fromTimestamp, toTimestamp, tenantIds, userIds, assetIds, false);
+ processCriteria(builder, parameters, ids, types, fromTimestamp, toTimestamp, realmIds, userIds, assetIds, false);
builder.append(" order by n.sentOn asc");
return persistenceService.doReturningTransaction(entityManager -> {
TypedQuery<SentNotification> query = entityManager.createQuery(builder.toString(), SentNotification.class);
@@ -363,12 +363,12 @@ public class NotificationService extends RouteBuilder implements ContainerServic
);
}
- public void removeNotifications(List<Long> ids, List<String> types, Long fromTimestamp, Long toTimestamp, List<String> tenantIds, List<String> userIds, List<String> assetIds) throws IllegalArgumentException {
+ public void removeNotifications(List<Long> ids, List<String> types, Long fromTimestamp, Long toTimestamp, List<String> realmIds, List<String> userIds, List<String> assetIds) throws IllegalArgumentException {
StringBuilder builder = new StringBuilder();
builder.append("delete from SentNotification n where 1=1");
List<Object> parameters = new ArrayList<>();
- processCriteria(builder, parameters, ids, types, fromTimestamp, toTimestamp, tenantIds, userIds, assetIds, true);
+ processCriteria(builder, parameters, ids, types, fromTimestamp, toTimestamp, realmIds, userIds, assetIds, true);
persistenceService.doTransaction(entityManager -> {
Query query = entityManager.createQuery(builder.toString());
@@ -378,10 +378,10 @@ public class NotificationService extends RouteBuilder implements ContainerServic
});
}
- protected void processCriteria(StringBuilder builder, List<Object> parameters, List<Long> ids, List<String> types, Long fromTimestamp, Long toTimestamp, List<String> tenantIds, List<String> userIds, List<String> assetIds, boolean isRemove) {
+ protected void processCriteria(StringBuilder builder, List<Object> parameters, List<Long> ids, List<String> types, Long fromTimestamp, Long toTimestamp, List<String> realmIds, List<String> userIds, List<String> assetIds, boolean isRemove) {
boolean hasIds = ids != null && !ids.isEmpty();
boolean hasTypes = types != null && !types.isEmpty();
- boolean hasTenants = tenantIds != null && !tenantIds.isEmpty();
+ boolean hasRealms = realmIds != null && !realmIds.isEmpty();
boolean hasUsers = userIds != null && !userIds.isEmpty();
boolean hasAssets = assetIds != null && !assetIds.isEmpty();
int counter = 0;
@@ -392,7 +392,7 @@ public class NotificationService extends RouteBuilder implements ContainerServic
if (hasTypes) {
counter++;
}
- if (hasTenants) {
+ if (hasRealms) {
counter++;
}
if (hasUsers) {
@@ -452,14 +452,14 @@ public class NotificationService extends RouteBuilder implements ContainerServic
parameters.add(Notification.TargetType.USER);
parameters.add(userIds);
- } else if (hasTenants) {
+ } else if (hasRealms) {
builder.append(" AND n.target = ?")
.append(parameters.size() + 1)
.append(" AND n.targetId IN ?")
.append(parameters.size() + 2);
- parameters.add(Notification.TargetType.TENANT);
- parameters.add(tenantIds);
+ parameters.add(Notification.TargetType.REALM);
+ parameters.add(realmIds);
}
}
@@ -512,7 +512,7 @@ public class NotificationService extends RouteBuilder implements ContainerServic
switch (target.getType()) {
- case TENANT:
+ case REALM:
if (source == CLIENT || source == ASSET_RULESET) {
throw new NotificationProcessingException(INSUFFICIENT_ACCESS);
}
diff --git a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
index b00ebe0ea..d01e2534b 100644
--- a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
+++ b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
@@ -46,7 +46,7 @@ import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.UserQuery;
import org.openremote.model.query.filter.AttributePredicate;
import org.openremote.model.query.filter.NameValuePredicate;
-import org.openremote.model.query.filter.TenantPredicate;
+import org.openremote.model.query.filter.RealmPredicate;
import org.openremote.model.security.User;
import org.openremote.model.util.TextUtil;
import org.openremote.model.util.ValueUtil;
@@ -230,9 +230,9 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatio
.attributes(new AttributePredicate(ConsoleAsset.CONSOLE_PROVIDERS, null, false, new NameValuePredicate.Path(PushNotificationMessage.TYPE)));
switch (targetType) {
- case TENANT ->
+ case REALM ->
// Any console assets in the target realm
- assetQuery.tenant(new TenantPredicate(targetId));
+ assetQuery.realm(new RealmPredicate(targetId));
case USER ->
// Any console assets linked to the target user
assetQuery.userIds(targetId);
diff --git a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java
index 274d1a6d1..c82d81e94 100644
--- a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java
+++ b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java
@@ -97,8 +97,8 @@ public class AssetQueryPredicate implements Predicate<AssetState<?>> {
}
}
- if (query.tenant != null) {
- if (!AssetQueryPredicate.asPredicate(query.tenant).test(assetState)) {
+ if (query.realm != null) {
+ if (!AssetQueryPredicate.asPredicate(query.realm).test(assetState)) {
return false;
}
}
@@ -127,9 +127,9 @@ public class AssetQueryPredicate implements Predicate<AssetState<?>> {
return givenPath -> Arrays.equals(predicate.path, givenPath);
}
- public static Predicate<AssetState<?>> asPredicate(TenantPredicate predicate) {
+ public static Predicate<AssetState<?>> asPredicate(RealmPredicate predicate) {
return assetState ->
- predicate == null || (predicate.realm != null && predicate.realm.equals(assetState.getRealm()));
+ predicate == null || (predicate.name != null && predicate.name.equals(assetState.getRealm()));
}
public static Predicate<NameValueHolder<?>> asPredicate(Supplier<Long> currentMillisSupplier, NameValuePredicate predicate) {
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngineId.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngineId.java
index d47374d6c..dbcdd49d6 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngineId.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngineId.java
@@ -22,16 +22,16 @@ package org.openremote.manager.rules;
import org.openremote.model.rules.AssetRuleset;
import org.openremote.model.rules.GlobalRuleset;
import org.openremote.model.rules.Ruleset;
-import org.openremote.model.rules.TenantRuleset;
+import org.openremote.model.rules.RealmRuleset;
import java.util.Objects;
import java.util.Optional;
/**
- * The scope of a {@link RulesEngine} and, optional, the tenant or asset it belongs to.
+ * The scope of a {@link RulesEngine} and, optional, the realm or asset it belongs to.
*
* An engine in {@link org.openremote.model.rules.GlobalRuleset} scope has no {@link #realm}
- * or {@link #assetId}. An engine {@link org.openremote.model.rules.TenantRuleset} scope has only
+ * or {@link #assetId}. An engine {@link RealmRuleset} scope has only
* {@link #realm}. An engine in {@link org.openremote.model.rules.AssetRuleset} scope has both.
*/
public class RulesEngineId<T extends Ruleset> {
@@ -47,7 +47,7 @@ public class RulesEngineId<T extends Ruleset> {
@SuppressWarnings("unchecked")
public RulesEngineId(String realm) {
- this((Class<T>) TenantRuleset.class, realm, null);
+ this((Class<T>) RealmRuleset.class, realm, null);
}
@SuppressWarnings("unchecked")
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java
index 11bd887b4..e8d42f02c 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import org.openremote.model.Container;
import org.openremote.model.ContainerService;
import org.openremote.model.rules.AssetRuleset;
-import org.openremote.model.rules.TenantRuleset;
+import org.openremote.model.rules.RealmRuleset;
import org.openremote.model.system.HealthStatusProvider;
import org.openremote.model.util.ValueUtil;
@@ -66,7 +66,7 @@ public class RulesHealthStatusProvider implements HealthStatusProvider, Containe
@Override
public Object getHealthStatus() {
- int totalEngines = rulesService.tenantEngines.size() + rulesService.assetEngines.size();
+ int totalEngines = rulesService.realmEngines.size() + rulesService.assetEngines.size();
int stoppedEngines = 0;
int errorEngines = 0;
@@ -80,17 +80,17 @@ public class RulesHealthStatusProvider implements HealthStatusProvider, Containe
}
}
- ObjectNode tenantEngines = ValueUtil.createJsonObject();
+ ObjectNode realmEngines = ValueUtil.createJsonObject();
- for (RulesEngine<TenantRuleset> tenantEngine : rulesService.tenantEngines.values()) {
- if (!tenantEngine.isRunning()) {
+ for (RulesEngine<RealmRuleset> realmEngine : rulesService.realmEngines.values()) {
+ if (!realmEngine.isRunning()) {
stoppedEngines++;
}
- if (tenantEngine.isError()) {
+ if (realmEngine.isError()) {
errorEngines++;
}
- tenantEngines.set(tenantEngine.getId().getRealm().orElse(""), getEngineHealthStatus(tenantEngine));
+ realmEngines.set(realmEngine.getId().getRealm().orElse(""), getEngineHealthStatus(realmEngine));
}
ObjectNode assetEngines = ValueUtil.createJsonObject();
@@ -114,7 +114,7 @@ public class RulesHealthStatusProvider implements HealthStatusProvider, Containe
if (rulesService.globalEngine != null) {
objectValue.set("global", getEngineHealthStatus(rulesService.globalEngine));
}
- objectValue.set("tenant", tenantEngines);
+ objectValue.set("realm", realmEngines);
objectValue.set("asset", assetEngines);
return objectValue;
}
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
index 292235d39..3c500109c 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
@@ -32,7 +32,7 @@ import org.openremote.model.query.RulesetQuery;
import org.openremote.model.rules.*;
import org.openremote.model.rules.geofence.GeofenceDefinition;
import org.openremote.model.security.ClientRole;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import javax.ws.rs.BeanParam;
import javax.ws.rs.WebApplicationException;
@@ -74,12 +74,12 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
}
@Override
- public RulesEngineInfo getTenantEngineInfo(RequestParams requestParams, String realm) {
+ public RulesEngineInfo getRealmEngineInfo(RequestParams requestParams, String realm) {
if (!isRealmAccessibleByUser(realm) || isRestrictedUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- RulesEngine<TenantRuleset> engine = rulesService.tenantEngines.get(realm);
+ RulesEngine<RealmRuleset> engine = rulesService.realmEngines.get(realm);
return getEngineInfo(engine);
}
@@ -139,7 +139,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
}
@Override
- public TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, String realm, List<Ruleset.Lang> languages, boolean fullyPopulate) {
+ public RealmRuleset[] getRealmRulesets(@BeanParam RequestParams requestParams, String realm, List<Ruleset.Lang> languages, boolean fullyPopulate) {
if (isAuthenticated() && !isRealmAccessibleByUser(realm)) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
@@ -147,8 +147,8 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
boolean publicOnly = !isAuthenticated() || isRestrictedUser() | !hasResourceRole(ClientRole.READ_RULES.getValue(), Constants.KEYCLOAK_CLIENT_ID);
- List<TenantRuleset> result = rulesetStorageService.findAll(
- TenantRuleset.class,
+ List<RealmRuleset> result = rulesetStorageService.findAll(
+ RealmRuleset.class,
new RulesetQuery().
setRealm(realm)
.setLanguages(languages.toArray(new Ruleset.Lang[0]))
@@ -165,7 +165,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
})
);
- return result.toArray(new TenantRuleset[0]);
+ return result.toArray(new RealmRuleset[0]);
}
@Override
@@ -246,13 +246,13 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
/* ################################################################################################# */
@Override
- public long createTenantRuleset(@BeanParam RequestParams requestParams, TenantRuleset ruleset) {
- Tenant tenant = identityService.getIdentityProvider().getTenant(ruleset.getRealm());
- if (tenant == null) {
+ public long createRealmRuleset(@BeanParam RequestParams requestParams, RealmRuleset ruleset) {
+ Realm realm = identityService.getIdentityProvider().getRealm(ruleset.getRealm());
+ if (realm == null) {
throw new WebApplicationException(BAD_REQUEST);
}
- if (!isTenantActiveAndAccessible(tenant) || isRestrictedUser()) {
- LOG.info("Forbidden access for user '" + getUsername() + "': " + tenant);
+ if (!isRealmActiveAndAccessible(realm) || isRestrictedUser()) {
+ LOG.info("Forbidden access for user '" + getUsername() + "': " + realm);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
ruleset = rulesetStorageService.merge(ruleset);
@@ -260,34 +260,34 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
}
@Override
- public TenantRuleset getTenantRuleset(@BeanParam RequestParams requestParams, Long id) {
- TenantRuleset ruleset = rulesetStorageService.find(TenantRuleset.class, id);
+ public RealmRuleset getRealmRuleset(@BeanParam RequestParams requestParams, Long id) {
+ RealmRuleset ruleset = rulesetStorageService.find(RealmRuleset.class, id);
if (ruleset == null) {
throw new WebApplicationException(NOT_FOUND);
}
- Tenant tenant = identityService.getIdentityProvider().getTenant(ruleset.getRealm());
- if (tenant == null) {
+ Realm realm = identityService.getIdentityProvider().getRealm(ruleset.getRealm());
+ if (realm == null) {
throw new WebApplicationException(BAD_REQUEST);
}
- if (!isTenantActiveAndAccessible(tenant) || isRestrictedUser()) {
- LOG.fine("Forbidden access for user '" + getUsername() + "': " + tenant);
+ if (!isRealmActiveAndAccessible(realm) || isRestrictedUser()) {
+ LOG.fine("Forbidden access for user '" + getUsername() + "': " + realm);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
return ruleset;
}
@Override
- public void updateTenantRuleset(@BeanParam RequestParams requestParams, Long id, TenantRuleset ruleset) {
- TenantRuleset existingRuleset = rulesetStorageService.find(TenantRuleset.class, id);
+ public void updateRealmRuleset(@BeanParam RequestParams requestParams, Long id, RealmRuleset ruleset) {
+ RealmRuleset existingRuleset = rulesetStorageService.find(RealmRuleset.class, id);
if (existingRuleset == null) {
throw new WebApplicationException(NOT_FOUND);
}
- Tenant tenant = identityService.getIdentityProvider().getTenant(existingRuleset.getRealm());
- if (tenant == null) {
+ Realm realm = identityService.getIdentityProvider().getRealm(existingRuleset.getRealm());
+ if (realm == null) {
throw new WebApplicationException(BAD_REQUEST);
}
- if (!isTenantActiveAndAccessible(tenant) || isRestrictedUser()) {
- LOG.fine("Forbidden access for user '" + getUsername() + "': " + tenant);
+ if (!isRealmActiveAndAccessible(realm) || isRestrictedUser()) {
+ LOG.fine("Forbidden access for user '" + getUsername() + "': " + realm);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
if (!id.equals(ruleset.getId())) {
@@ -300,19 +300,19 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
}
@Override
- public void deleteTenantRuleset(@BeanParam RequestParams requestParams, Long id) {
- TenantRuleset ruleset = rulesetStorageService.find(TenantRuleset.class, id);
+ public void deleteRealmRuleset(@BeanParam RequestParams requestParams, Long id) {
+ RealmRuleset ruleset = rulesetStorageService.find(RealmRuleset.class, id);
if (ruleset == null) {
return;
}
- Tenant tenant = identityService.getIdentityProvider().getTenant(ruleset.getRealm());
- if (tenant == null) {
+ Realm realm = identityService.getIdentityProvider().getRealm(ruleset.getRealm());
+ if (realm == null) {
throw new WebApplicationException(BAD_REQUEST);
}
- if (!isTenantActiveAndAccessible(tenant) || isRestrictedUser()) {
+ if (!isRealmActiveAndAccessible(realm) || isRestrictedUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- rulesetStorageService.delete(TenantRuleset.class, id);
+ rulesetStorageService.delete(RealmRuleset.class, id);
}
/* ################################################################################################# */
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
index db43e52b7..72de1466d 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
@@ -49,7 +49,7 @@ import org.openremote.model.query.filter.LocationAttributePredicate;
import org.openremote.model.rules.*;
import org.openremote.model.rules.geofence.GeofenceDefinition;
import org.openremote.model.security.ClientRole;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import org.openremote.model.util.Pair;
import org.openremote.model.util.TextUtil;
import org.openremote.model.util.TimeUtil;
@@ -92,7 +92,7 @@ import static org.openremote.model.attribute.Attribute.getAddedOrModifiedAttribu
* Each asset attribute update is processed in the following order:
* <ol>
* <li>Global Rulesets</li>
- * <li>Tenant Rulesets</li>
+ * <li>Realm Rulesets</li>
* <li>Asset Rulesets (in hierarchical order from oldest ancestor down)</li>
* </ol>
* Processing order of rulesets with the same scope or same parent is not guaranteed.
@@ -103,7 +103,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
public static final String OR_RULE_EVENT_EXPIRES = "OR_RULE_EVENT_EXPIRES";
public static final String OR_RULE_EVENT_EXPIRES_DEFAULT = "PT1H";
private static final Logger LOG = Logger.getLogger(RulesService.class.getName());
- protected final Map<String, RulesEngine<TenantRuleset>> tenantEngines = new HashMap<>();
+ protected final Map<String, RulesEngine<RealmRuleset>> realmEngines = new HashMap<>();
protected final Map<String, RulesEngine<AssetRuleset>> assetEngines = new HashMap<>();
protected List<GeofenceAssetAdapter> geofenceAssetAdapters = new ArrayList<>();
protected TimerService timerService;
@@ -119,7 +119,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
protected ClientEventService clientEventService;
protected GatewayService gatewayService;
protected RulesEngine<GlobalRuleset> globalEngine;
- protected Tenant[] tenants;
+ protected Realm[] realms;
protected AssetLocationPredicateProcessor locationPredicateRulesConsumer;
protected Map<RulesEngine<?>, List<RulesEngine.AssetStateLocationPredicates>> engineAssetLocationPredicateMap = new HashMap<>();
protected Set<String> assetsWithModifiedLocationPredicates = new HashSet<>();
@@ -127,7 +127,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
// The objects are already in memory inside the rule engines but keeping them
// here means we can quickly insert facts into newly started engines
protected Set<AssetState<?>> assetStates = new HashSet<>();
- protected Set<AssetState<?>> preInitassetStates = new HashSet<>();
+ protected Set<AssetState<?>> preInitAssetStates = new HashSet<>();
protected long defaultEventExpiresMillis = 1000*60*60;
protected boolean initDone;
protected boolean startDone;
@@ -222,16 +222,16 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
processRulesetChange((Ruleset) persistenceEvent.getEntity(), persistenceEvent.getCause());
});
- // If any tenant was modified in the database then check its' status and undeploy, deploy or update any
+ // If any realm was modified in the database then check its' status and undeploy, deploy or update any
// associated rulesets
from(PERSISTENCE_TOPIC)
- .routeId("RuleEngineTenantChanges")
- .filter(isPersistenceEventForEntityType(Tenant.class))
+ .routeId("RuleEngineRealmChanges")
+ .filter(isPersistenceEventForEntityType(Realm.class))
.filter(isNotForGateway(gatewayService))
.process(exchange -> {
PersistenceEvent<?> persistenceEvent = exchange.getIn().getBody(PersistenceEvent.class);
- Tenant tenant = (Tenant) persistenceEvent.getEntity();
- processTenantChange(tenant, persistenceEvent.getCause());
+ Realm realm = (Realm) persistenceEvent.getEntity();
+ processRealmChange(realm, persistenceEvent.getCause());
});
// If any asset was modified in the database, detect changed attributes
@@ -265,21 +265,21 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
.setFullyPopulate(true)
).forEach(this::deployGlobalRuleset);
- LOG.info("Deploying tenant rulesets");
- tenants = Arrays.stream(identityService.getIdentityProvider().getTenants()).filter(Tenant::getEnabled).toArray(Tenant[]::new);
+ LOG.info("Deploying realm rulesets");
+ realms = Arrays.stream(identityService.getIdentityProvider().getRealms()).filter(Realm::getEnabled).toArray(Realm[]::new);
rulesetStorageService.findAll(
- TenantRuleset.class,
+ RealmRuleset.class,
new RulesetQuery()
.setEnabledOnly(true)
.setFullyPopulate(true))
.stream()
.filter(rd ->
- Arrays.stream(tenants)
- .anyMatch(tenant -> rd.getRealm().equals(tenant.getRealm()))
- ).forEach(this::deployTenantRuleset);
+ Arrays.stream(realms)
+ .anyMatch(realm -> rd.getRealm().equals(realm.getName()))
+ ).forEach(this::deployRealmRuleset);
LOG.info("Deploying asset rulesets");
- // Group by asset ID then tenant and check tenant is enabled
+ // Group by asset ID then realm and check realm is enabled
//noinspection ResultOfMethodCallIgnored
deployAssetRulesets(
rulesetStorageService.findAll(
@@ -307,13 +307,13 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
if (globalEngine != null) {
globalEngine.start();
}
- tenantEngines.values().forEach(RulesEngine::start);
+ realmEngines.values().forEach(RulesEngine::start);
assetEngines.values().forEach(RulesEngine::start);
startDone = true;
- preInitassetStates.forEach(this::doProcessAssetUpdate);
- preInitassetStates.clear();
+ preInitAssetStates.forEach(this::doProcessAssetUpdate);
+ preInitAssetStates.clear();
}
@Override
@@ -329,8 +329,8 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
assetEngines.forEach((assetId, rulesEngine) -> rulesEngine.stop(true));
assetEngines.clear();
- tenantEngines.forEach((realm, rulesEngine) -> rulesEngine.stop(true));
- tenantEngines.clear();
+ realmEngines.forEach((realm, rulesEngine) -> rulesEngine.stop(true));
+ realmEngines.clear();
if (globalEngine != null) {
globalEngine.stop(true);
@@ -355,7 +355,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
Attribute<?> attribute,
Source source) throws AssetProcessingException {
if (!startDone) {
- preInitassetStates.add(new AssetState<>(asset, attribute, source));
+ preInitAssetStates.add(new AssetState<>(asset, attribute, source));
} else {
doProcessAssetUpdate(new AssetState<>(asset, attribute, source));
}
@@ -396,12 +396,12 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
&& globalEngine.deployments.containsKey(ruleset.getId())
&& globalEngine.deployments.get(ruleset.getId()).ruleset.getRules().equals(ruleset.getRules());
}
- if (ruleset instanceof TenantRuleset) {
- TenantRuleset tenantRuleset = (TenantRuleset) ruleset;
- return tenantEngines.get(tenantRuleset.getRealm()) != null
- && tenantEngines.get(tenantRuleset.getRealm()).deployments != null
- && tenantEngines.get(tenantRuleset.getRealm()).deployments.containsKey(ruleset.getId())
- && tenantEngines.get(tenantRuleset.getRealm()).deployments.get(ruleset.getId()).ruleset.getRules().equals(ruleset.getRules());
+ if (ruleset instanceof RealmRuleset) {
+ RealmRuleset realmRuleset = (RealmRuleset) ruleset;
+ return realmEngines.get(realmRuleset.getRealm()) != null
+ && realmEngines.get(realmRuleset.getRealm()).deployments != null
+ && realmEngines.get(realmRuleset.getRealm()).deployments.containsKey(ruleset.getId())
+ && realmEngines.get(realmRuleset.getRealm()).deployments.get(ruleset.getId()).ruleset.getRules().equals(ruleset.getRules());
}
if (ruleset instanceof AssetRuleset) {
AssetRuleset assetRuleset = (AssetRuleset) ruleset;
@@ -430,12 +430,12 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
});
}
- protected void processTenantChange(Tenant tenant, PersistenceEvent.Cause cause) {
- withLock(getClass().getSimpleName() + "::processTenantChange", () -> {
+ protected void processRealmChange(Realm realm, PersistenceEvent.Cause cause) {
+ withLock(getClass().getSimpleName() + "::processRealmChange", () -> {
// Check if enabled status has changed
- boolean wasEnabled = Arrays.stream(tenants).anyMatch(t -> tenant.getRealm().equals(t.getRealm()) && tenant.getId().equals(t.getId()));
- boolean isEnabled = tenant.getEnabled() && cause != PersistenceEvent.Cause.DELETE;
- tenants = Arrays.stream(identityService.getIdentityProvider().getTenants()).filter(Tenant::getEnabled).toArray(Tenant[]::new);
+ boolean wasEnabled = Arrays.stream(realms).anyMatch(t -> realm.getName().equals(t.getName()) && realm.getId().equals(t.getId()));
+ boolean isEnabled = realm.getEnabled() && cause != PersistenceEvent.Cause.DELETE;
+ realms = Arrays.stream(identityService.getIdentityProvider().getRealms()).filter(Realm::getEnabled).toArray(Realm[]::new);
if (wasEnabled == isEnabled) {
// Nothing to do here
@@ -443,33 +443,33 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
}
if (wasEnabled) {
- // Remove tenant rules engine for this tenant if it exists
- RulesEngine<TenantRuleset> tenantRulesEngine = tenantEngines.get(tenant.getRealm());
- if (tenantRulesEngine != null) {
- tenantRulesEngine.stop();
- tenantEngines.remove(tenant.getRealm());
+ // Remove realm rules engine for this realm if it exists
+ RulesEngine<RealmRuleset> realmRulesEngine = realmEngines.get(realm.getName());
+ if (realmRulesEngine != null) {
+ realmRulesEngine.stop();
+ realmEngines.remove(realm.getName());
}
// Remove any asset rules engines for assets in this realm
assetEngines.values().stream()
- .filter(re -> re.getId().getRealm().map(realm -> realm.equals(tenant.getRealm())).orElse(false))
+ .filter(re -> re.getId().getRealm().map(r -> r.equals(realm.getName())).orElse(false))
.forEach(RulesEngine::stop);
assetEngines.entrySet().removeIf(entry ->
- entry.getValue().getId().getRealm().map(realm -> realm.equals(tenant.getRealm())).orElse(
+ entry.getValue().getId().getRealm().map(r -> r.equals(realm.getName())).orElse(
false)
);
} else {
- // Create tenant rules engines for this tenant if it has any rulesets
+ // Create realm rules engines for this realm if it has any rulesets
rulesetStorageService
.findAll(
- TenantRuleset.class,
+ RealmRuleset.class,
new RulesetQuery()
- .setRealm(tenant.getRealm())
+ .setRealm(realm.getName())
.setFullyPopulate(true)
.setEnabledOnly(true))
.stream()
- .map(this::deployTenantRuleset)
+ .map(this::deployRealmRuleset)
.filter(Objects::nonNull)
.forEach(RulesEngine::start);
@@ -478,7 +478,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
rulesetStorageService.findAll(
AssetRuleset.class,
new RulesetQuery()
- .setRealm(tenant.getRealm())
+ .setRealm(realm.getName())
.setEnabledOnly(true)
.setFullyPopulate(true)))
.forEach(RulesEngine::start);
@@ -580,8 +580,8 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
if (cause == PersistenceEvent.Cause.DELETE || !ruleset.isEnabled()) {
if (ruleset instanceof GlobalRuleset) {
undeployGlobalRuleset((GlobalRuleset) ruleset);
- } else if (ruleset instanceof TenantRuleset) {
- undeployTenantRuleset((TenantRuleset) ruleset);
+ } else if (ruleset instanceof RealmRuleset) {
+ undeployRealmRuleset((RealmRuleset) ruleset);
} else if (ruleset instanceof AssetRuleset) {
undeployAssetRuleset((AssetRuleset) ruleset);
}
@@ -598,15 +598,15 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
engine.start();
- } else if (ruleset instanceof TenantRuleset) {
+ } else if (ruleset instanceof RealmRuleset) {
- boolean isNewEngine = !tenantEngines.containsKey(((TenantRuleset) ruleset).getRealm());
- RulesEngine<TenantRuleset> engine = deployTenantRuleset((TenantRuleset) ruleset);
+ boolean isNewEngine = !realmEngines.containsKey(((RealmRuleset) ruleset).getRealm());
+ RulesEngine<RealmRuleset> engine = deployRealmRuleset((RealmRuleset) ruleset);
if (isNewEngine) {
// Push all existing facts into the engine
assetStates.forEach(assetState -> {
- if (assetState.getRealm().equals(((TenantRuleset) ruleset).getRealm())) {
+ if (assetState.getRealm().equals(((RealmRuleset) ruleset).getRealm())) {
engine.updateOrInsertAssetState(assetState, true);
}
});
@@ -675,12 +675,11 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
});
}
- protected RulesEngine<TenantRuleset> deployTenantRuleset(TenantRuleset ruleset) {
- return withLockReturning(getClass().getSimpleName() + "::deployTenantRuleset", () -> {
+ protected RulesEngine<RealmRuleset> deployRealmRuleset(RealmRuleset ruleset) {
+ return withLockReturning(getClass().getSimpleName() + "::deployRealmRuleset", () -> {
-
- // Look for existing rules engines for this tenant
- RulesEngine<TenantRuleset> tenantRulesEngine = tenantEngines
+ // Look for existing rules engines for this realm
+ RulesEngine<RealmRuleset> realmRulesEngine = realmEngines
.computeIfAbsent(ruleset.getRealm(), (realm) ->
new RulesEngine<>(
timerService,
@@ -696,22 +695,23 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
locationPredicateRulesConsumer
));
- tenantRulesEngine.addRuleset(ruleset);
+ realmRulesEngine.addRuleset(ruleset);
- return tenantRulesEngine;
+ return realmRulesEngine;
});
}
- protected void undeployTenantRuleset(TenantRuleset ruleset) {
- withLock(getClass().getSimpleName() + "::undeployTenantRuleset", () -> {
- RulesEngine<TenantRuleset> rulesEngine = tenantEngines.get(ruleset.getRealm());
+ protected void undeployRealmRuleset(RealmRuleset ruleset) {
+ withLock(getClass().getSimpleName() + "::undeployRealmRuleset", () -> {
+
+ RulesEngine<RealmRuleset> rulesEngine = realmEngines.get(ruleset.getRealm());
if (rulesEngine == null) {
return;
}
if (rulesEngine.removeRuleset(ruleset)) {
rulesEngine.stop();
- tenantEngines.remove(ruleset.getRealm());
+ realmEngines.remove(ruleset.getRealm());
}
});
}
@@ -732,19 +732,19 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
.filter(es -> {
try {
return Arrays
- .stream(tenants)
- .anyMatch(at -> es.getKey().equals(at.getRealm()));
+ .stream(realms)
+ .anyMatch(at -> es.getKey().equals(at.getName()));
} catch (Exception e) {
e.printStackTrace();
return false;
}
})
.flatMap(es -> {
- List<Pair<Asset<?>, List<AssetRuleset>>> tenantAssetAndRules = es.getValue();
+ List<Pair<Asset<?>, List<AssetRuleset>>> realmAssetAndRules = es.getValue();
// RT: Not sure we need ordering here for starting engines so removing it
- // Order rulesets by asset hierarchy within this tenant
- return tenantAssetAndRules.stream()
+ // Order rulesets by asset hierarchy within this realm
+ return realmAssetAndRules.stream()
//.sorted(Comparator.comparingInt(item -> item.key.getPath().length))
.flatMap(assetAndRules -> assetAndRules.value.stream())
.map(this::deployAssetRuleset);
@@ -869,11 +869,11 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
rulesEngines.add(globalEngine);
}
- // Add tenant engine (if it exists)
- RulesEngine<?> tenantRulesEngine = tenantEngines.get(realm);
+ // Add realm engine (if it exists)
+ RulesEngine<?> realmRulesEngine = realmEngines.get(realm);
- if (tenantRulesEngine != null) {
- rulesEngines.add(tenantRulesEngine);
+ if (realmRulesEngine != null) {
+ rulesEngines.add(realmRulesEngine);
}
// Add asset engines, iterate through asset hierarchy using asset IDs from asset path
@@ -1035,7 +1035,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
}
}
- for (Map.Entry<String, RulesEngine<TenantRuleset>> realmAndEngine : tenantEngines.entrySet()) {
+ for (Map.Entry<String, RulesEngine<RealmRuleset>> realmAndEngine : realmEngines.entrySet()) {
if (realmAndEngine.getValue().deployments.containsKey(rulesetId)) {
return Optional.of(realmAndEngine.getValue().deployments.get(rulesetId));
}
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
index b4380c18d..39b683b71 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
@@ -317,7 +317,7 @@ public class RulesetDeployment {
"var NumberPredicate = Java.type(\"org.openremote.model.query.filter.NumberPredicate\");\n" +
"var ParentPredicate = Java.type(\"org.openremote.model.query.filter.ParentPredicate\");\n" +
"var PathPredicate = Java.type(\"org.openremote.model.query.filter.PathPredicate\");\n" +
- "var TenantPredicate = Java.type(\"org.openremote.model.query.filter.TenantPredicate\");\n" +
+ "var RealmPredicate = Java.type(\"org.openremote.model.query.filter.RealmPredicate\");\n" +
"var AttributePredicate = Java.type(\"org.openremote.model.query.filter.AttributePredicate\");\n" +
"var AttributeExecuteStatus = Java.type(\"org.openremote.model.attribute.AttributeExecuteStatus\");\n" +
"var EXACT = Match.EXACT;\n" +
@@ -439,8 +439,8 @@ public class RulesetDeployment {
binding.setVariable("historicDatapoints", historicDatapointsFacade);
binding.setVariable("predictedDatapoints", predictedDatapointsFacade);
- if(ruleset instanceof TenantRuleset) {
- binding.setVariable("realm", ((TenantRuleset) ruleset).getRealm());
+ if(ruleset instanceof RealmRuleset) {
+ binding.setVariable("realm", ((RealmRuleset) ruleset).getRealm());
}
if (ruleset instanceof AssetRuleset) {
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
index 6f3e4170b..5152ad678 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
@@ -33,7 +33,7 @@ import org.openremote.model.query.RulesetQuery;
import org.openremote.model.rules.AssetRuleset;
import org.openremote.model.rules.GlobalRuleset;
import org.openremote.model.rules.Ruleset;
-import org.openremote.model.rules.TenantRuleset;
+import org.openremote.model.rules.RealmRuleset;
import org.openremote.model.util.ValueUtil;
import java.sql.Connection;
@@ -172,7 +172,7 @@ public class RulesetStorageService implements ContainerService {
sb.append(", R.RULES");
}
- if (rulesetType == TenantRuleset.class) {
+ if (rulesetType == RealmRuleset.class) {
sb.append(", R.ACCESS_PUBLIC_READ, R.REALM");
} else if (rulesetType == AssetRuleset.class) {
sb.append(", R.ACCESS_PUBLIC_READ, R.ASSET_ID, A.REALM AS REALM");
@@ -182,8 +182,8 @@ public class RulesetStorageService implements ContainerService {
protected <T extends Ruleset> void appendFromString(StringBuilder sb, Class<T> rulesetType, RulesetQuery query) {
if (rulesetType == GlobalRuleset.class) {
sb.append(" FROM GLOBAL_RULESET R");
- }else if (rulesetType == TenantRuleset.class) {
- sb.append(" FROM TENANT_RULESET R");
+ }else if (rulesetType == RealmRuleset.class) {
+ sb.append(" FROM REALM_RULESET R");
} else if (rulesetType == AssetRuleset.class) {
sb.append(" FROM ASSET_RULESET R JOIN ASSET A ON (R.ASSET_ID = A.ID)");
} else {
@@ -231,7 +231,7 @@ public class RulesetStorageService implements ContainerService {
// TODO: Add meta filtering support
}
- if (query.realm != null && (rulesetType == TenantRuleset.class || rulesetType == AssetRuleset.class)) {
+ if (query.realm != null && (rulesetType == RealmRuleset.class || rulesetType == AssetRuleset.class)) {
sb.append(" AND REALM = ?");
final int pos = binders.size() + 1;
binders.add(st -> st.setString(pos, query.realm));
@@ -267,11 +267,11 @@ public class RulesetStorageService implements ContainerService {
if (rulesetType == GlobalRuleset.class) {
ruleset = (T) new GlobalRuleset();
- } else if (rulesetType == TenantRuleset.class) {
- TenantRuleset tenantRuleset = new TenantRuleset();
- tenantRuleset.setRealm(rs.getString("REALM"));
- tenantRuleset.setAccessPublicRead(rs.getBoolean("ACCESS_PUBLIC_READ"));
- ruleset = (T) tenantRuleset;
+ } else if (rulesetType == RealmRuleset.class) {
+ RealmRuleset realmRuleset = new RealmRuleset();
+ realmRuleset.setRealm(rs.getString("REALM"));
+ realmRuleset.setAccessPublicRead(rs.getBoolean("ACCESS_PUBLIC_READ"));
+ ruleset = (T) realmRuleset;
} else if (rulesetType == AssetRuleset.class) {
AssetRuleset assetRuleset = new AssetRuleset();
assetRuleset.setAssetId(rs.getString("ASSET_ID"));
diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java
index 38138d6a9..32aeaa0de 100644
--- a/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java
+++ b/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java
@@ -23,14 +23,13 @@ import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.rules.RulesEngineId;
import org.openremote.model.asset.Asset;
import org.openremote.model.attribute.AttributeEvent;
-import org.openremote.model.attribute.AttributeExecuteStatus;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.filter.PathPredicate;
-import org.openremote.model.query.filter.TenantPredicate;
+import org.openremote.model.query.filter.RealmPredicate;
import org.openremote.model.rules.AssetRuleset;
import org.openremote.model.rules.Assets;
import org.openremote.model.rules.Ruleset;
-import org.openremote.model.rules.TenantRuleset;
+import org.openremote.model.rules.RealmRuleset;
import java.util.Arrays;
import java.util.function.Consumer;
@@ -57,14 +56,14 @@ public class AssetsFacade<T extends Ruleset> extends Assets {
@Override
public Stream<Asset<?>> getResults(AssetQuery assetQuery) {
- if (TenantRuleset.class.isAssignableFrom(rulesEngineId.getScope())) {
+ if (RealmRuleset.class.isAssignableFrom(rulesEngineId.getScope())) {
// Realm is restricted to rules
- assetQuery.tenant = new TenantPredicate(
+ assetQuery.realm = new RealmPredicate(
rulesEngineId.getRealm().orElseThrow(() -> new IllegalArgumentException("Realm missing: " + rulesEngineId))
);
} else if (AssetRuleset.class.isAssignableFrom(rulesEngineId.getScope())) {
// Realm is restricted to assets'
- assetQuery.tenant = new TenantPredicate(
+ assetQuery.realm = new RealmPredicate(
rulesEngineId.getRealm().orElseThrow(() -> new IllegalArgumentException("Realm missing: " + rulesEngineId))
);
diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/NotificationsFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/NotificationsFacade.java
index 38d4c813d..54d0fcb84 100644
--- a/manager/src/main/java/org/openremote/manager/rules/facade/NotificationsFacade.java
+++ b/manager/src/main/java/org/openremote/manager/rules/facade/NotificationsFacade.java
@@ -25,11 +25,11 @@ import org.openremote.model.notification.Notification;
import org.openremote.model.rules.GlobalRuleset;
import org.openremote.model.rules.Notifications;
import org.openremote.model.rules.Ruleset;
-import org.openremote.model.rules.TenantRuleset;
+import org.openremote.model.rules.RealmRuleset;
import static org.openremote.model.notification.Notification.Source.ASSET_RULESET;
import static org.openremote.model.notification.Notification.Source.GLOBAL_RULESET;
-import static org.openremote.model.notification.Notification.Source.TENANT_RULESET;
+import static org.openremote.model.notification.Notification.Source.REALM_RULESET;
public class NotificationsFacade<T extends Ruleset> extends Notifications {
@@ -47,9 +47,9 @@ public class NotificationsFacade<T extends Ruleset> extends Notifications {
if (rulesEngineId.getScope() == GlobalRuleset.class) {
source = GLOBAL_RULESET;
- } else if (rulesEngineId.getScope() == TenantRuleset.class) {
- source = TENANT_RULESET;
- sourceId = rulesEngineId.getRealm().orElseThrow(() -> new IllegalStateException("Tenant ruleset must have a realm ID"));
+ } else if (rulesEngineId.getScope() == RealmRuleset.class) {
+ source = REALM_RULESET;
+ sourceId = rulesEngineId.getRealm().orElseThrow(() -> new IllegalStateException("Realm ruleset must have a realm ID"));
} else {
source = ASSET_RULESET;
sourceId = rulesEngineId.getAssetId().orElseThrow(() -> new IllegalStateException("Asset ruleset must have an asset ID"));
diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java
index 85e226990..cec3b64ff 100644
--- a/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java
+++ b/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java
@@ -25,7 +25,7 @@ import org.openremote.manager.rules.RulesEngineId;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.model.query.UserQuery;
import org.openremote.model.query.filter.PathPredicate;
-import org.openremote.model.query.filter.TenantPredicate;
+import org.openremote.model.query.filter.RealmPredicate;
import org.openremote.model.query.filter.UserAssetPredicate;
import org.openremote.model.rules.*;
import org.openremote.model.security.User;
@@ -56,13 +56,13 @@ public class UsersFacade<T extends Ruleset> extends Users {
public Stream<String> getResults(UserQuery userQuery) {
// Do security checks to ensure correct scoping
// No restriction for global rulesets
- if (TenantRuleset.class.isAssignableFrom(rulesEngineId.getScope())) {
- // Restrict tenant
- userQuery.tenantPredicate = new TenantPredicate(
+ if (RealmRuleset.class.isAssignableFrom(rulesEngineId.getScope())) {
+ // Restrict realm
+ userQuery.realmPredicate = new RealmPredicate(
rulesEngineId.getRealm().orElseThrow(() -> new IllegalArgumentException("Realm ID missing: " + rulesEngineId))
);
} else if (AssetRuleset.class.isAssignableFrom(rulesEngineId.getScope())) {
- userQuery.tenantPredicate = null;
+ userQuery.realmPredicate = null;
String assetId = rulesEngineId.getAssetId().orElseThrow(() -> new IllegalArgumentException("Asset ID missing: " + rulesEngineId));
// Asset<?> must be this engines asset or a child
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
index 43344af36..619ca3e11 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
@@ -24,9 +24,8 @@ import org.openremote.model.Container;
import org.openremote.container.security.AuthContext;
import org.openremote.container.security.basic.BasicIdentityProvider;
import org.openremote.container.security.basic.PasswordStorage;
-import org.openremote.model.event.shared.TenantFilter;
+import org.openremote.model.event.shared.RealmFilter;
import org.openremote.model.query.UserQuery;
-import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.security.*;
import org.openremote.model.util.TextUtil;
@@ -54,9 +53,9 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
public void start(Container container) {
super.start(container);
- // Create master tenant and admin user
- if (!tenantExists(MASTER_REALM)) {
- LOG.info("Creating master tenant and admin user");
+ // Create master realm and admin user
+ if (!realmExists(MASTER_REALM)) {
+ LOG.info("Creating master realm and admin user");
// Configure the master realm
persistenceService.doTransaction(em -> em.unwrap(Session.class).doWork(connection -> {
@@ -207,52 +206,52 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
}
@Override
- public boolean isUserInTenant(String userId, String realm) {
- return ManagerIdentityProvider.userInTenantFromDb(persistenceService, userId, realm);
+ public boolean isUserInRealm(String userId, String realm) {
+ return ManagerIdentityProvider.userInRealmFromDb(persistenceService, userId, realm);
}
@Override
- public Tenant[] getTenants() {
- return ManagerIdentityProvider.getTenantsFromDb(persistenceService);
+ public Realm[] getRealms() {
+ return ManagerIdentityProvider.getRealmsFromDb(persistenceService);
}
@Override
- public Tenant getTenant(String realm) {
- return ManagerIdentityProvider.getTenantFromDb(persistenceService, realm);
+ public Realm getRealm(String realm) {
+ return ManagerIdentityProvider.getRealmFromDb(persistenceService, realm);
}
@Override
- public void updateTenant(Tenant tenant) {
- throw new UnsupportedOperationException("This provider does not support modifying tenants");
+ public void updateRealm(Realm realm) {
+ throw new UnsupportedOperationException("This provider does not support modifying realms");
}
@Override
- public Tenant createTenant(Tenant tenant) {
- throw new UnsupportedOperationException("This provider does not support multiple tenants");
+ public Realm createRealm(Realm realm) {
+ throw new UnsupportedOperationException("This provider does not support multiple realms");
}
@Override
- public void deleteTenant(String realm) {
- throw new UnsupportedOperationException("This provider does not support multiple tenants");
+ public void deleteRealm(String realm) {
+ throw new UnsupportedOperationException("This provider does not support multiple realms");
}
@Override
- public boolean isTenantActiveAndAccessible(AuthContext authContext, Tenant tenant) {
- return Objects.equals(tenant.getId(), MASTER_REALM);
+ public boolean isRealmActiveAndAccessible(AuthContext authContext, Realm realm) {
+ return Objects.equals(realm.getId(), MASTER_REALM);
}
@Override
- public boolean isTenantActiveAndAccessible(AuthContext authContext, String realm) {
+ public boolean isRealmActiveAndAccessible(AuthContext authContext, String realm) {
return Objects.equals(realm, MASTER_REALM);
}
@Override
- public boolean tenantExists(String realm) {
- return ManagerIdentityProvider.tenantExistsFromDb(persistenceService, realm);
+ public boolean realmExists(String realm) {
+ return ManagerIdentityProvider.realmExistsFromDb(persistenceService, realm);
}
@Override
- public boolean canSubscribeWith(AuthContext auth, TenantFilter<?> filter, ClientRole... requiredRoles) {
+ public boolean canSubscribeWith(AuthContext auth, RealmFilter<?> filter, ClientRole... requiredRoles) {
// TODO Doesn't really respect the description of the interface
return auth.isSuperUser();
}
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
index a94dd60b2..8333601ac 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
@@ -22,8 +22,7 @@ package org.openremote.manager.security;
import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.security.AuthContext;
import org.openremote.container.security.IdentityProvider;
-import org.openremote.manager.asset.AssetStorageService;
-import org.openremote.model.event.shared.TenantFilter;
+import org.openremote.model.event.shared.RealmFilter;
import org.openremote.model.query.UserQuery;
import org.openremote.model.query.filter.StringPredicate;
import org.openremote.model.security.*;
@@ -40,7 +39,7 @@ import static org.openremote.model.Constants.MASTER_REALM;
// TODO: Normalise interface for Basic and Keycloak providers and add client CRUD
/**
* SPI for implementations used by {@link ManagerIdentityService}, provides CRUD of
- * {@link User} and {@link Tenant}.
+ * {@link User} and {@link Realm}.
*/
public interface ManagerIdentityProvider extends IdentityProvider {
@@ -78,23 +77,23 @@ public interface ManagerIdentityProvider extends IdentityProvider {
boolean isRestrictedUser(AuthContext authContext);
- boolean isUserInTenant(String userId, String realm);
+ boolean isUserInRealm(String userId, String realm);
- Tenant[] getTenants();
+ Realm[] getRealms();
- Tenant getTenant(String realm);
+ Realm getRealm(String realm);
- void updateTenant(Tenant tenant);
+ void updateRealm(Realm realm);
- Tenant createTenant(Tenant tenant);
+ Realm createRealm(Realm realm);
- void deleteTenant(String realm);
+ void deleteRealm(String realm);
- boolean isTenantActiveAndAccessible(AuthContext authContext, Tenant tenant);
+ boolean isRealmActiveAndAccessible(AuthContext authContext, Realm realm);
- boolean isTenantActiveAndAccessible(AuthContext authContext, String realm);
+ boolean isRealmActiveAndAccessible(AuthContext authContext, String realm);
- boolean tenantExists(String realm);
+ boolean realmExists(String realm);
/**
* Superusers can subscribe to all events, regular users must be in the same realm as the filter and any
@@ -102,7 +101,7 @@ public interface ManagerIdentityProvider extends IdentityProvider {
*
* @return <code>true</code> if the authenticated party can subscribe to events with the given filter.
*/
- boolean canSubscribeWith(AuthContext auth, TenantFilter<?> filter, ClientRole... requiredRoles);
+ boolean canSubscribeWith(AuthContext auth, RealmFilter<?> filter, ClientRole... requiredRoles);
/**
* Returns the frontend URL to be used for frontend apps to authenticate
@@ -135,9 +134,9 @@ public interface ManagerIdentityProvider extends IdentityProvider {
// BUILD WHERE
sb.append(" WHERE 1=1");
- if (userQuery.tenantPredicate != null && !TextUtil.isNullOrEmpty(userQuery.tenantPredicate.realm)) {
+ if (userQuery.realmPredicate != null && !TextUtil.isNullOrEmpty(userQuery.realmPredicate.name)) {
sb.append(" AND u.realm = ?").append(parameters.size() + 1);
- parameters.add(userQuery.tenantPredicate.realm);
+ parameters.add(userQuery.realmPredicate.name);
}
if (userQuery.assetPredicate != null) {
sb.append(" AND ua.id.assetId = ?").append(parameters.size() + 1);
@@ -263,46 +262,46 @@ public interface ManagerIdentityProvider extends IdentityProvider {
});
}
- static Tenant[] getTenantsFromDb(PersistenceService persistenceService) {
+ static Realm[] getRealmsFromDb(PersistenceService persistenceService) {
return persistenceService.doReturningTransaction(entityManager -> {
- List<Tenant> realms = entityManager.createQuery(
- "select t from Tenant t where t.notBefore is null or t.notBefore = 0 or to_timestamp(t.notBefore) <= now()"
- , Tenant.class).getResultList();
+ List<Realm> realms = entityManager.createQuery(
+ "select r from Realm r where r.notBefore is null or r.notBefore = 0 or to_timestamp(r.notBefore) <= now()"
+ , Realm.class).getResultList();
- // Make sure the master tenant is always on top
+ // Make sure the master realm is always on top
realms.sort((o1, o2) -> {
- if (o1.getRealm().equals(MASTER_REALM))
+ if (o1.getName().equals(MASTER_REALM))
return -1;
- if (o2.getRealm().equals(MASTER_REALM))
+ if (o2.getName().equals(MASTER_REALM))
return 1;
- return o1.getRealm().compareTo(o2.getRealm());
+ return o1.getName().compareTo(o2.getName());
});
- return realms.toArray(new Tenant[realms.size()]);
+ return realms.toArray(new Realm[realms.size()]);
});
}
- static Tenant getTenantFromDb(PersistenceService persistenceService, String realm) {
+ static Realm getRealmFromDb(PersistenceService persistenceService, String realm) {
return persistenceService.doReturningTransaction(em -> {
- List<Tenant> tenants = em.createQuery("select t from Tenant t where t.realm = :realm", Tenant.class)
+ List<Realm> realms = em.createQuery("select r from Realm r where r.name = :realm", Realm.class)
.setParameter("realm", realm).getResultList();
- return tenants.size() == 1 ? tenants.get(0) : null;
+ return realms.size() == 1 ? realms.get(0) : null;
}
);
}
- static boolean tenantExistsFromDb(PersistenceService persistenceService, String realm) {
+ static boolean realmExistsFromDb(PersistenceService persistenceService, String realm) {
return persistenceService.doReturningTransaction(em -> {
long count = em.createQuery(
- "select count(t) from Tenant t where t.realm = :realm and t.enabled = true and (t.notBefore is null or t.notBefore = 0 or to_timestamp(t.notBefore) <= now())",
+ "select count(r) from Realm r where r.name = :realm and r.enabled = true and (r.notBefore is null or r.notBefore = 0 or to_timestamp(r.notBefore) <= now())",
Long.class).setParameter("realm", realm).getSingleResult();
return count > 0;
});
}
- static boolean userInTenantFromDb(PersistenceService persistenceService, String userId, String realm) {
+ static boolean userInRealmFromDb(PersistenceService persistenceService, String userId, String realm) {
return persistenceService.doReturningTransaction(em -> {
User user = em.find(User.class, userId);
return (user != null && realm.equals(user.getRealm()));
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityService.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityService.java
index 332528700..1fae2b9d6 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityService.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityService.java
@@ -25,7 +25,6 @@ import org.openremote.container.timer.TimerService;
import org.openremote.manager.web.ManagerWebService;
import org.openremote.model.Container;
-import javax.persistence.EntityManager;
import java.util.Locale;
import java.util.logging.Logger;
@@ -42,7 +41,7 @@ public class ManagerIdentityService extends IdentityService {
persistenceService = container.getService(PersistenceService.class);
container.getService(ManagerWebService.class).addApiSingleton(
- new TenantResourceImpl(container.getService(TimerService.class), this, container)
+ new RealmResourceImpl(container.getService(TimerService.class), this, container)
);
container.getService(ManagerWebService.class).addApiSingleton(
new UserResourceImpl(container.getService(TimerService.class), this)
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index 6bd2971ad..94baa2ef7 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -21,10 +21,12 @@ package org.openremote.manager.security;
import io.undertow.util.Headers;
import org.apache.commons.io.IOUtils;
+import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.admin.client.resource.*;
import org.keycloak.common.enums.SslRequired;
import org.keycloak.representations.idm.*;
+import org.openremote.container.concurrent.GlobalLock;
import org.openremote.container.message.MessageBrokerService;
import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.security.AuthContext;
@@ -32,19 +34,26 @@ import org.openremote.container.security.keycloak.KeycloakIdentityProvider;
import org.openremote.container.timer.TimerService;
import org.openremote.container.web.WebService;
import org.openremote.manager.apps.ConsoleAppService;
+import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.event.ClientEventService;
import org.openremote.model.Constants;
import org.openremote.model.Container;
import org.openremote.model.PersistenceEvent;
+import org.openremote.model.asset.Asset;
import org.openremote.model.auth.OAuthGrant;
-import org.openremote.model.event.shared.TenantFilter;
+import org.openremote.model.event.shared.RealmFilter;
+import org.openremote.model.gateway.GatewayConnection;
+import org.openremote.model.provisioning.ProvisioningConfig;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.UserQuery;
+import org.openremote.model.query.filter.RealmPredicate;
import org.openremote.model.query.filter.StringPredicate;
+import org.openremote.model.rules.RealmRuleset;
import org.openremote.model.security.*;
import org.openremote.model.util.TextUtil;
import org.openremote.model.util.ValueUtil;
+import javax.persistence.Query;
import javax.validation.constraints.NotNull;
import javax.ws.rs.BadRequestException;
import javax.ws.rs.NotAllowedException;
@@ -88,6 +97,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
public static final String KEYCLOAK_FRONTEND_URL = "KEYCLOAK_FRONTEND_URL";
protected PersistenceService persistenceService;
+ protected AssetStorageService assetStorageService;
protected TimerService timerService;
protected MessageBrokerService messageBrokerService;
protected ClientEventService clientEventService;
@@ -115,6 +125,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
messageBrokerService = container.getService(MessageBrokerService.class);
clientEventService = container.getService(ClientEventService.class);
consoleAppService = container.getService(ConsoleAppService.class);
+ assetStorageService = container.getService(AssetStorageService.class);
// Allow all external hostnames with wildcard and same host with wildcard
validRedirectUris = new ArrayList<>();
@@ -737,68 +748,68 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
}
@Override
- public Tenant[] getTenants() {
- return ManagerIdentityProvider.getTenantsFromDb(persistenceService);
+ public Realm[] getRealms() {
+ return ManagerIdentityProvider.getRealmsFromDb(persistenceService);
}
@Override
- public Tenant getTenant(String realm) {
+ public Realm getRealm(String realm) {
try {
- return ManagerIdentityProvider.getTenantFromDb(persistenceService, realm);
+ return ManagerIdentityProvider.getRealmFromDb(persistenceService, realm);
} catch (Exception ex) {
- LOG.log(Level.INFO, "Failed to get tenant for realm: " + realm, ex);
+ LOG.log(Level.INFO, "Failed to get realm by name: " + realm, ex);
}
return null;
}
@Override
- public void updateTenant(Tenant tenant) {
- LOG.fine("Update tenant: " + tenant);
+ public void updateRealm(Realm realm) {
+ LOG.fine("Update realm: " + realm);
getRealms(realmsResource -> {
- if (TextUtil.isNullOrEmpty(tenant.getId())) {
- throw new IllegalStateException("Tenant must already exist, ID does not match an existing tenant");
+ if (TextUtil.isNullOrEmpty(realm.getId())) {
+ throw new IllegalStateException("Realm must already exist, ID does not match an existing realm");
}
// Force realm to lowercase
- tenant.setRealm(tenant.getRealm().toLowerCase(Locale.ROOT));
+ realm.setName(realm.getName().toLowerCase(Locale.ROOT));
// Find existing realm by ID as realm name could have been changed
- RealmRepresentation realmRepresentation = realmsResource.findAll().stream().filter(r -> r.getId().equals(tenant.getId())).findFirst().orElse(null);
+ RealmRepresentation realmRepresentation = realmsResource.findAll().stream().filter(r -> r.getId().equals(realm.getId())).findFirst().orElse(null);
if (realmRepresentation == null) {
- throw new IllegalStateException("Tenant must already exist, ID does not match an existing tenant");
+ throw new IllegalStateException("Realm must already exist, ID does not match an existing realm");
}
- String realm = realmRepresentation.getRealm();
- RealmResource realmResource = realmsResource.realm(realm);
- Tenant existingTenant = getTenant(realm);
-
- // Tenant only has a subset of realm representation so overlay on actual realm representation
- realmRepresentation.setDisplayName(tenant.getDisplayName());
- realmRepresentation.setAccountTheme(tenant.getAccountTheme());
- realmRepresentation.setAdminTheme(tenant.getAdminTheme());
- realmRepresentation.setEmailTheme(tenant.getEmailTheme());
- realmRepresentation.setLoginTheme(tenant.getLoginTheme());
- realmRepresentation.setRememberMe(tenant.getRememberMe());
- realmRepresentation.setVerifyEmail(tenant.getVerifyEmail());
- realmRepresentation.setLoginWithEmailAllowed(tenant.getLoginWithEmail());
- realmRepresentation.setRegistrationAllowed(tenant.getRegistrationAllowed());
- realmRepresentation.setRegistrationEmailAsUsername(tenant.getRegistrationEmailAsUsername());
- realmRepresentation.setEnabled(tenant.getEnabled());
- realmRepresentation.setDuplicateEmailsAllowed(tenant.getDuplicateEmailsAllowed());
- realmRepresentation.setResetPasswordAllowed(tenant.getResetPasswordAllowed());
- realmRepresentation.setNotBefore(tenant.getNotBefore() != null ? tenant.getNotBefore().intValue() : null);
+ String realmName = realmRepresentation.getRealm();
+ RealmResource realmResource = realmsResource.realm(realmName);
+ Realm existingRealm = getRealm(realmName);
+
+ // Realm only has a subset of realm representation so overlay on actual realm representation
+ realmRepresentation.setDisplayName(realm.getDisplayName());
+ realmRepresentation.setAccountTheme(realm.getAccountTheme());
+ realmRepresentation.setAdminTheme(realm.getAdminTheme());
+ realmRepresentation.setEmailTheme(realm.getEmailTheme());
+ realmRepresentation.setLoginTheme(realm.getLoginTheme());
+ realmRepresentation.setRememberMe(realm.getRememberMe());
+ realmRepresentation.setVerifyEmail(realm.getVerifyEmail());
+ realmRepresentation.setLoginWithEmailAllowed(realm.getLoginWithEmail());
+ realmRepresentation.setRegistrationAllowed(realm.getRegistrationAllowed());
+ realmRepresentation.setRegistrationEmailAsUsername(realm.getRegistrationEmailAsUsername());
+ realmRepresentation.setEnabled(realm.getEnabled());
+ realmRepresentation.setDuplicateEmailsAllowed(realm.getDuplicateEmailsAllowed());
+ realmRepresentation.setResetPasswordAllowed(realm.getResetPasswordAllowed());
+ realmRepresentation.setNotBefore(realm.getNotBefore() != null ? realm.getNotBefore().intValue() : null);
configureRealm(realmRepresentation);
realmResource.update(realmRepresentation);
- Set<RealmRole> existingRealmRoles = existingTenant.getRealmRoles();
- existingTenant.setRealmRoles(existingRealmRoles);
+ Set<RealmRole> existingRealmRoles = existingRealm.getRealmRoles();
+ existingRealm.setRealmRoles(existingRealmRoles);
// Update realm roles if required
- if (tenant.getRealmRoles() != null) {
+ if (realm.getRealmRoles() != null) {
- Set<RealmRole> realmRoles = tenant.getNormalisedRealmRoles();
+ Set<RealmRole> realmRoles = realm.getNormalisedRealmRoles();
RolesResource rolesResource = realmResource.roles();
// Handle removed roles
@@ -813,26 +824,29 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
});
}
- Tenant updatedTenant = convert(realmRepresentation, Tenant.class);
- updatedTenant.setRealmRoles((tenant.getRealmRoles() == null) ? existingRealmRoles : tenant.getNormalisedRealmRoles());
- persistenceService.publishPersistenceEvent(PersistenceEvent.Cause.UPDATE, updatedTenant, existingTenant, Tenant.getPropertyFields());
+ Realm updatedRealm = convert(realmRepresentation, Realm.class);
+ updatedRealm.setName(realmRepresentation.getRealm());
+ updatedRealm.setRealmRoles((realm.getRealmRoles() == null) ? existingRealmRoles : realm.getNormalisedRealmRoles());
+ persistenceService.publishPersistenceEvent(PersistenceEvent.Cause.UPDATE, updatedRealm, existingRealm, Realm.getPropertyFields());
return null;
});
}
@Override
- public Tenant createTenant(Tenant tenant) {
- LOG.fine("Create tenant: " + tenant);
+ public Realm createRealm(Realm realm) {
+ LOG.fine("Create realm: " + realm);
return getRealms(realmsResource -> {
// Force realm to lowercase
- tenant.setRealm(tenant.getRealm().toLowerCase(Locale.ROOT));
+ realm.setName(realm.getName().toLowerCase(Locale.ROOT));
- RealmRepresentation realmRepresentation = convert(tenant, RealmRepresentation.class);
+ RealmRepresentation realmRepresentation = convert(realm, RealmRepresentation.class);
+ // Inject name as it is called realm in the realmRepresentation
+ realmRepresentation.setRealm(realm.getName());
try {
realmsResource.create(realmRepresentation);
- RealmResource realmResource = realmsResource.realm(tenant.getRealm());
+ RealmResource realmResource = realmsResource.realm(realm.getName());
realmRepresentation = realmResource.toRepresentation();
// Need a committed realmRepresentation to update the security
@@ -842,7 +856,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
// Set realm roles
RolesResource rolesResource = realmResource.roles();
List<RoleRepresentation> existingRealmRoles = rolesResource.list();
- tenant.getNormalisedRealmRoles().stream().filter(realmRole -> existingRealmRoles.stream().noneMatch(roleRepresentation -> roleRepresentation.getName().equals(realmRole.getName())))
+ realm.getNormalisedRealmRoles().stream().filter(realmRole -> existingRealmRoles.stream().noneMatch(roleRepresentation -> roleRepresentation.getName().equals(realmRole.getName())))
.forEach(realmRole -> {
LOG.finer("Adding realm role + " + realmRole);
rolesResource.create(new RoleRepresentation(realmRole.getName(), realmRole.getDescription(), false));
@@ -850,31 +864,64 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
// Auto create the standard openremote client
ClientRepresentation clientRepresentation = generateOpenRemoteClientRepresentation();
- createUpdateClient(tenant.getRealm(), clientRepresentation);
+ createUpdateClient(realm.getName(), clientRepresentation);
- Tenant createdTenant = convert(realmRepresentation, Tenant.class);
- createdTenant.setRealmRoles(tenant.getRealmRoles());
- persistenceService.publishPersistenceEvent(PersistenceEvent.Cause.CREATE, tenant, null, Tenant.getPropertyFields());
- return createdTenant;
+ Realm createdRealm = convert(realmRepresentation, Realm.class);
+ createdRealm.setName(realmRepresentation.getRealm());
+ createdRealm.setRealmRoles(realm.getRealmRoles());
+ persistenceService.publishPersistenceEvent(PersistenceEvent.Cause.CREATE, realm, null, Realm.getPropertyFields());
+ return createdRealm;
} catch (Exception e) {
- LOG.log(Level.INFO, "Failed to create tenant: " + tenant, e);
+ LOG.log(Level.INFO, "Failed to create realm: " + realm, e);
throw e;
}
});
}
@Override
- public void deleteTenant(String realm) {
- Tenant tenant = getTenant(realm);
+ public void deleteRealm(String realmName) {
+ Realm realm = getRealm(realmName);
+
+ if (realm == null) {
+ throw new NotFoundException("Realm does not exist: " + realmName);
+ }
+
+ // TODO: This should be de-centralised and use a realm lock to prevent any resources being added to the realm during deletion
+ GlobalLock.withLock("RealmDeletion", () -> {
+ persistenceService.doTransaction(entityManager -> {
+
+ // Delete gateway connections
+ Query query = entityManager.createQuery("delete from " + GatewayConnection.class.getSimpleName() + " gc " +
+ "where gc.localRealm = ?0");
+
+ query.setParameter(0, realmName);
+ query.executeUpdate();
+
+ // Delete provisioning configs
+ query = entityManager.createQuery("delete from " + ProvisioningConfig.class.getSimpleName() + " pc " +
+ "where pc.realm = ?0");
- if (tenant != null) {
- LOG.fine("Delete tenant: " + realm);
+ query.setParameter(0, realmName);
+ query.executeUpdate();
+
+ // Delete Rules
+ query = entityManager.createQuery("delete from " + RealmRuleset.class.getSimpleName() + " rs " +
+ "where rs.realm = ?0");
+ query.setParameter(0, realmName);
+ query.executeUpdate();
+
+ // Delete Assets
+ List<String> assetIds = assetStorageService.findAll(new AssetQuery().select(new AssetQuery.Select().excludeAttributes()).realm(new RealmPredicate(realmName))).stream().map(Asset::getId).toList();
+ assetStorageService.delete(assetIds);
+ });
+
+ LOG.fine("Deleting realm: " + realmName);
getRealms(realmsResource -> {
- realmsResource.realm(realm).remove();
+ realmsResource.realm(realmName).remove();
return null;
});
- persistenceService.publishPersistenceEvent(PersistenceEvent.Cause.DELETE, null, tenant, Tenant.getPropertyFields());
- }
+ persistenceService.publishPersistenceEvent(PersistenceEvent.Cause.DELETE, null, realm, Realm.getPropertyFields());
+ });
}
/**
@@ -1012,32 +1059,32 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
/**
* @return <code>true</code> if the user is the superuser (admin) or if the user is authenticated
- * in the same realm as the tenant and the tenant is active.
+ * in the same realm as the realm and the realm is active.
*/
@Override
- public boolean isTenantActiveAndAccessible(AuthContext authContext, Tenant tenant) {
- if (tenant == null) {
+ public boolean isRealmActiveAndAccessible(AuthContext authContext, Realm realm) {
+ if (realm == null) {
return false;
}
boolean isSuperUser = authContext != null && authContext.isSuperUser();
- boolean isUsersRealm = isSuperUser || authContext == null || authContext.isRealmAccessibleByUser(tenant.getRealm());
+ boolean isUsersRealm = isSuperUser || authContext == null || authContext.isRealmAccessibleByUser(realm.getName());
- return isSuperUser || (isUsersRealm && tenant.isActive(timerService.getCurrentTimeMillis()));
+ return isSuperUser || (isUsersRealm && realm.isActive(timerService.getCurrentTimeMillis()));
}
/**
* @return <code>true</code> if the user is the superuser (admin) or if the user is authenticated
- * in the same tenant and the tenant is active.
+ * in the same realm and the realm is active.
*/
@Override
- public boolean isTenantActiveAndAccessible(AuthContext authContext, String realm) {
- return isTenantActiveAndAccessible(authContext, getTenant(realm));
+ public boolean isRealmActiveAndAccessible(AuthContext authContext, String realm) {
+ return isRealmActiveAndAccessible(authContext, getRealm(realm));
}
@Override
- public boolean tenantExists(String realm) {
- return ManagerIdentityProvider.tenantExistsFromDb(persistenceService, realm);
+ public boolean realmExists(String realm) {
+ return ManagerIdentityProvider.realmExistsFromDb(persistenceService, realm);
}
@Override
@@ -1046,12 +1093,12 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
}
@Override
- public boolean isUserInTenant(String userId, String realm) {
- return ManagerIdentityProvider.userInTenantFromDb(persistenceService, userId, realm);
+ public boolean isUserInRealm(String userId, String realm) {
+ return ManagerIdentityProvider.userInRealmFromDb(persistenceService, userId, realm);
}
@Override
- public boolean canSubscribeWith(AuthContext auth, TenantFilter<?> filter, ClientRole... requiredRoles) {
+ public boolean canSubscribeWith(AuthContext auth, RealmFilter<?> filter, ClientRole... requiredRoles) {
// Superuser can always subscribe
if (auth.isSuperUser())
return true;
@@ -1071,11 +1118,11 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
// Ensure filter matches authenticated realm
if (filter != null) {
- String authenticatedRealm = auth.getAuthenticatedRealm();
+ String authenticatedRealm = auth.getAuthenticatedRealmName();
if (TextUtil.isNullOrEmpty(authenticatedRealm))
return false;
- if (authenticatedRealm.equals(filter.getRealm()))
+ if (authenticatedRealm.equals(filter.getName()))
return true;
}
diff --git a/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/RealmResourceImpl.java
similarity index 68%
rename from manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java
rename to manager/src/main/java/org/openremote/manager/security/RealmResourceImpl.java
index cd177c546..6f83be2ee 100644
--- a/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/security/RealmResourceImpl.java
@@ -24,8 +24,9 @@ import org.openremote.container.timer.TimerService;
import org.openremote.manager.web.ManagerWebResource;
import org.openremote.model.Container;
import org.openremote.model.http.RequestParams;
-import org.openremote.model.security.Tenant;
-import org.openremote.model.security.TenantResource;
+import org.openremote.model.provisioning.ProvisioningConfig;
+import org.openremote.model.security.Realm;
+import org.openremote.model.security.RealmResource;
import javax.ws.rs.ClientErrorException;
import javax.ws.rs.NotAllowedException;
@@ -37,23 +38,23 @@ import java.util.logging.Logger;
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import static org.openremote.model.Constants.MASTER_REALM;
-public class TenantResourceImpl extends ManagerWebResource implements TenantResource {
+public class RealmResourceImpl extends ManagerWebResource implements RealmResource {
- private static final Logger LOG = Logger.getLogger(TenantResourceImpl.class.getName());
+ private static final Logger LOG = Logger.getLogger(RealmResourceImpl.class.getName());
protected Container container;
- public TenantResourceImpl(TimerService timerService, ManagerIdentityService identityService, Container container) {
+ public RealmResourceImpl(TimerService timerService, ManagerIdentityService identityService, Container container) {
super(timerService, identityService);
this.container = container;
}
@Override
- public Tenant[] getAll(RequestParams requestParams) {
+ public Realm[] getAll(RequestParams requestParams) {
if (!isSuperUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
try {
- return identityService.getIdentityProvider().getTenants();
+ return identityService.getIdentityProvider().getRealms();
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
} catch (Exception ex) {
@@ -62,18 +63,18 @@ public class TenantResourceImpl extends ManagerWebResource implements TenantReso
}
@Override
- public Tenant[] getAccessible(RequestParams requestParams) {
+ public Realm[] getAccessible(RequestParams requestParams) {
try {
- Tenant[] tenants;
+ Realm[] realms;
if (isSuperUser()) {
- tenants = identityService.getIdentityProvider().getTenants();
+ realms = identityService.getIdentityProvider().getRealms();
} else {
- tenants = new Tenant[] {
- (isAuthenticated() ? getAuthenticatedTenant() : getRequestTenant())
+ realms = new Realm[] {
+ (isAuthenticated() ? getAuthenticatedRealm() : getRequestRealm())
};
}
- return Arrays.stream(tenants).map(tenant -> new Tenant().setRealm(tenant.getRealm()).setDisplayName(tenant.getDisplayName())).toArray(Tenant[]::new);
+ return Arrays.stream(realms).map(realm -> new Realm().setName(realm.getName()).setDisplayName(realm.getDisplayName())).toArray(Realm[]::new);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
} catch (Exception ex) {
@@ -82,29 +83,27 @@ public class TenantResourceImpl extends ManagerWebResource implements TenantReso
}
@Override
- public Tenant get(RequestParams requestParams, String realm) {
- Tenant tenant = identityService.getIdentityProvider().getTenant(realm);
- if (tenant == null)
+ public Realm get(RequestParams requestParams, String realmName) {
+ Realm realm = identityService.getIdentityProvider().getRealm(realmName);
+ if (realm == null)
throw new WebApplicationException(NOT_FOUND);
- if (!isTenantActiveAndAccessible(tenant)) {
- LOG.info("Forbidden access for user '" + getUsername() + "': " + tenant);
+ if (!isRealmActiveAndAccessible(realm)) {
+ LOG.info("Forbidden access for user '" + getUsername() + "': " + realm);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- return tenant;
+ return realm;
}
@Override
- public void update(RequestParams requestParams, String realm, Tenant tenant) {
+ public void update(RequestParams requestParams, String realmName, Realm realm) {
if (!isSuperUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- throwIfIllegalMasterRealmMutation(realm, tenant);
+ throwIfIllegalMasterRealmMutation(realmName, realm);
try {
- identityService.getIdentityProvider().updateTenant(
- tenant
- );
+ identityService.getIdentityProvider().updateRealm(realm);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
} catch (IllegalArgumentException ex) {
@@ -115,12 +114,12 @@ public class TenantResourceImpl extends ManagerWebResource implements TenantReso
}
@Override
- public void create(RequestParams requestParams, Tenant tenant) {
+ public void create(RequestParams requestParams, Realm realm) {
if (!isSuperUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
try {
- identityService.getIdentityProvider().createTenant(tenant);
+ identityService.getIdentityProvider().createRealm(realm);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
} catch (Exception ex) {
@@ -138,7 +137,7 @@ public class TenantResourceImpl extends ManagerWebResource implements TenantReso
throwIfIllegalMasterRealmDeletion(realm);
try {
- identityService.getIdentityProvider().deleteTenant(
+ identityService.getIdentityProvider().deleteRealm(
realm
);
} catch (ClientErrorException ex) {
@@ -155,16 +154,16 @@ public class TenantResourceImpl extends ManagerWebResource implements TenantReso
throw new NotAllowedException("The master realm cannot be deleted");
}
- protected void throwIfIllegalMasterRealmMutation(String realm, Tenant tenant) throws WebApplicationException {
- if (!realm.equals(MASTER_REALM))
+ protected void throwIfIllegalMasterRealmMutation(String realmName, Realm realm) throws WebApplicationException {
+ if (!realmName.equals(MASTER_REALM))
return;
- if (tenant.getEnabled() == null || !tenant.getEnabled()) {
- throw new NotAllowedException("The master realm cannot be disabled");
+ if (realm.getEnabled() == null || !realm.getEnabled()) {
+ throw new NotAllowedException("The master realmName cannot be disabled");
}
- if (tenant.getRealm() == null || !tenant.getRealm().equals(MASTER_REALM)) {
- throw new NotAllowedException("The master realm identifier cannot be changed");
+ if (realm.getName() == null || !realm.getName().equals(MASTER_REALM)) {
+ throw new NotAllowedException("The master realmName identifier cannot be changed");
}
}
}
diff --git a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
index 8e2ddff9e..455ba1a61 100644
--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
@@ -25,7 +25,7 @@ import org.openremote.manager.web.ManagerWebResource;
import org.openremote.model.Constants;
import org.openremote.model.http.RequestParams;
import org.openremote.model.query.UserQuery;
-import org.openremote.model.query.filter.TenantPredicate;
+import org.openremote.model.query.filter.RealmPredicate;
import org.openremote.model.security.*;
import javax.ws.rs.*;
@@ -64,7 +64,7 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
if (!authContext.isSuperUser()) {
// Force realm to match users
- query.tenant(new TenantPredicate(authContext.getAuthenticatedRealm()));
+ query.realm(new RealmPredicate(authContext.getAuthenticatedRealmName()));
// Hide system service accounts from non super users
if (query.select == null) {
@@ -106,7 +106,7 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
if (!isAuthenticated()) {
throw new ForbiddenException("Must be authenticated");
}
- return get(requestParams, getRequestRealm(), getUserId());
+ return get(requestParams, getRequestRealmName(), getUserId());
}
@Override
@@ -173,7 +173,7 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
throw new ForbiddenException("Must be authenticated");
}
- return getUserClientRoles(requestParams, getRequestRealm(), getUserId(), clientId);
+ return getUserClientRoles(requestParams, getRequestRealmName(), getUserId(), clientId);
}
@Override
@@ -182,7 +182,7 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
throw new ForbiddenException("Must be authenticated");
}
- return getUserRealmRoles(requestParams, getRequestRealm(), getUserId());
+ return getUserRealmRoles(requestParams, getRequestRealmName(), getUserId());
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java
index 5a063b230..814e69e5c 100644
--- a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java
@@ -22,12 +22,11 @@ package org.openremote.manager.setup;
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.admin.client.resource.RoleResource;
import org.keycloak.representations.idm.ClientRepresentation;
-import org.openremote.manager.security.ManagerIdentityProvider;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
import org.openremote.model.Container;
import org.openremote.model.security.ClientRole;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import org.openremote.model.security.User;
import org.openremote.model.setup.Setup;
@@ -71,15 +70,15 @@ public abstract class AbstractKeycloakSetup implements Setup {
return keycloakProvider;
}
- protected Tenant createTenant(String realm, String displayName, boolean rememberMe) {
- Tenant tenant = new Tenant();
- tenant.setRealm(realm);
- tenant.setDisplayName(displayName);
- tenant.setEnabled(true);
- tenant.setDuplicateEmailsAllowed(true);
- tenant.setRememberMe(rememberMe);
- tenant = keycloakProvider.createTenant(tenant);
- return tenant;
+ protected Realm createRealm(String realmName, String displayName, boolean rememberMe) {
+ Realm realm = new Realm();
+ realm.setName(realmName);
+ realm.setDisplayName(displayName);
+ realm.setEnabled(true);
+ realm.setDuplicateEmailsAllowed(true);
+ realm.setRememberMe(rememberMe);
+ realm = keycloakProvider.createRealm(realm);
+ return realm;
}
protected User createUser(String realm, String username, String password, String firstName, String lastName, String email, boolean enabled, ClientRole[] roles) {
diff --git a/manager/src/main/java/org/openremote/manager/setup/KeycloakCleanSetup.java b/manager/src/main/java/org/openremote/manager/setup/KeycloakCleanSetup.java
index bdc4797e1..229fe202e 100644
--- a/manager/src/main/java/org/openremote/manager/setup/KeycloakCleanSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/KeycloakCleanSetup.java
@@ -21,7 +21,7 @@ package org.openremote.manager.setup;
import org.openremote.model.Container;
import org.openremote.model.query.UserQuery;
-import org.openremote.model.query.filter.TenantPredicate;
+import org.openremote.model.query.filter.RealmPredicate;
import java.util.Arrays;
import java.util.logging.Logger;
@@ -50,15 +50,14 @@ public class KeycloakCleanSetup extends AbstractKeycloakSetup {
protected void doClean() throws Exception {
// Delete all realms that are not the master realm
LOG.info("Deleting all non-master realms");
- Arrays.stream(keycloakProvider.getTenants()).forEach(tenant -> {
- if (!tenant.getRealm().equals(MASTER_REALM)) {
- LOG.info("Deleting tenant: " + tenant);
- keycloakProvider.deleteTenant(tenant.getRealm());
+ Arrays.stream(keycloakProvider.getRealms()).forEach(realm -> {
+ if (!realm.getName().equals(MASTER_REALM)) {
+ keycloakProvider.deleteRealm(realm.getName());
}
});
LOG.info("Deleting all non-master admin users");
- Arrays.stream(keycloakProvider.queryUsers(new UserQuery().tenant(new TenantPredicate(MASTER_REALM)))).forEach(user -> {
+ Arrays.stream(keycloakProvider.queryUsers(new UserQuery().realm(new RealmPredicate(MASTER_REALM)))).forEach(user -> {
if (!user.getUsername().equals(MASTER_REALM_ADMIN_USER)) {
LOG.info("Deleting user: " + user);
keycloakProvider.deleteUser(MASTER_REALM, user.getId());
diff --git a/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java b/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java
index 3179e5875..d58bbfc35 100644
--- a/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java
@@ -20,19 +20,13 @@
package org.openremote.manager.setup;
import org.openremote.container.util.UniqueIdentifierGenerator;
-import org.openremote.model.Constants;
import org.openremote.model.Container;
import org.openremote.model.auth.OAuthPasswordGrant;
import org.openremote.model.security.ClientRole;
-import org.openremote.model.security.Role;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import org.openremote.model.security.User;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.Set;
import java.util.logging.Logger;
-import java.util.stream.Collectors;
import static org.openremote.container.security.keycloak.KeycloakIdentityProvider.MANAGER_CLIENT_ID;
import static org.openremote.model.Constants.*;
@@ -52,13 +46,13 @@ public class KeycloakInitSetup extends AbstractKeycloakSetup {
// Update the master realm which is auto created by Keycloak itself
// This will cause the keycloak provider to configure it appropriately
// e.g. Set SMTP server, theme, timeouts, etc.
- Tenant masterRealm = keycloakProvider.getTenant(MASTER_REALM);
+ Realm masterRealm = keycloakProvider.getRealm(MASTER_REALM);
masterRealm.setDisplayName("Master");
masterRealm.setRealmRoles(masterRealm.getNormalisedRealmRoles());
- keycloakProvider.updateTenant(masterRealm);
+ keycloakProvider.updateRealm(masterRealm);
// Create our client application with its default roles in the master realm
- keycloakProvider.createUpdateClient(masterRealm.getRealm(), keycloakProvider.generateOpenRemoteClientRepresentation());
+ keycloakProvider.createUpdateClient(masterRealm.getName(), keycloakProvider.generateOpenRemoteClientRepresentation());
// Update master user name
User adminUser = keycloakProvider.getUserByUsername(MASTER_REALM, MASTER_REALM_ADMIN_USER);
diff --git a/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java b/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java
index 46c1d8f54..5437d498b 100644
--- a/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java
+++ b/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java
@@ -80,7 +80,7 @@ public class SimulatorService extends RouteBuilder implements ContainerService {
if (auth.isSuperUser())
return true;
- // TODO Should realm admins be able to work with simulators in their tenant?
+ // TODO Should realm admins be able to work with simulators in their realm?
return false;
});
@@ -114,7 +114,7 @@ public class SimulatorService extends RouteBuilder implements ContainerService {
if (!authContext.isSuperUser())
return;
- // TODO Should realm admins be able to work with simulators in their tenant?
+ // TODO Should realm admins be able to work with simulators in their realm?
publishSimulatorState(sessionKey, event.getAgentId());
});
}
diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java
index aaae7b010..b78c04899 100644
--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java
+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java
@@ -22,7 +22,7 @@ package org.openremote.manager.web;
import org.openremote.container.timer.TimerService;
import org.openremote.container.web.WebResource;
import org.openremote.manager.security.ManagerIdentityService;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
public class ManagerWebResource extends WebResource {
@@ -38,20 +38,20 @@ public class ManagerWebResource extends WebResource {
return isAuthenticated() && identityService.getIdentityProvider().isRestrictedUser(getAuthContext());
}
- public Tenant getAuthenticatedTenant() {
- return identityService.getIdentityProvider().getTenant(getAuthenticatedRealm());
+ public Realm getAuthenticatedRealm() {
+ return identityService.getIdentityProvider().getRealm(getAuthenticatedRealmName());
}
- public Tenant getRequestTenant() {
- return identityService.getIdentityProvider().getTenant(getRequestRealm());
+ public Realm getRequestRealm() {
+ return identityService.getIdentityProvider().getRealm(getRequestRealmName());
}
- public boolean isTenantActiveAndAccessible(String realm) {
- return identityService.getIdentityProvider().isTenantActiveAndAccessible(this, realm);
+ public boolean isRealmActiveAndAccessible(String realm) {
+ return identityService.getIdentityProvider().isRealmActiveAndAccessible(this, realm);
}
- public boolean isTenantActiveAndAccessible(Tenant tenant) {
- return identityService.getIdentityProvider().isTenantActiveAndAccessible(this, tenant);
+ public boolean isRealmActiveAndAccessible(Realm realm) {
+ return identityService.getIdentityProvider().isRealmActiveAndAccessible(this, realm);
}
}
diff --git a/manager/src/main/resources/org/openremote/manager/setup/database/V20220523_03__RenameTenantRuleset.sql b/manager/src/main/resources/org/openremote/manager/setup/database/V20220523_03__RenameTenantRuleset.sql
new file mode 100644
index 000000000..43a13cd3d
--- /dev/null
+++ b/manager/src/main/resources/org/openremote/manager/setup/database/V20220523_03__RenameTenantRuleset.sql
@@ -0,0 +1,4 @@
+/*
+ ############################# RENAME TENANT_RULESET #############################
+ */
+ALTER TABLE TENANT_RULESET RENAME TO REALM_RULESET;
diff --git a/manager/src/web/shared/locales/ar/or.json b/manager/src/web/shared/locales/ar/or.json
index 9e7d77aeb..5ff986f48 100644
--- a/manager/src/web/shared/locales/ar/or.json
+++ b/manager/src/web/shared/locales/ar/or.json
@@ -194,11 +194,11 @@
"buttonTextConfirm": "نص لزر التفعيل",
"buttonTextDecline": "نص لزر عدم التفعيل",
"custom": "إدخال يدوي",
- "tenant": "نطاق",
- "tenant_plural": "النطاقات",
+ "realm": "نطاق",
+ "realm_plural": "النطاقات",
"displayName":" إسم الظهور ",
"realm management":"إدخال النطاق",
- "deleteTenantConfirm":"هل أنت متأكد بأنك تريد حذف هذا النطاق؟",
+ "deleteRealmConfirm":"هل أنت متأكد بأنك تريد حذف هذا النطاق؟",
"user_plural": "المستخدمين",
"user_role": "دور المستخدم",
"role_plural": "الأدوار",
diff --git a/manager/src/web/shared/locales/cn/or.json b/manager/src/web/shared/locales/cn/or.json
index 407a11c10..1463a377a 100644
--- a/manager/src/web/shared/locales/cn/or.json
+++ b/manager/src/web/shared/locales/cn/or.json
@@ -207,10 +207,10 @@
"buttonTextConfirm": "确认按键文本",
"buttonTextDecline": "拒绝按键文本",
"custom": "自定义参数",
- "tenant": "租户",
- "tenant_plural": "租户",
+ "realm": "租户",
+ "realm_plural": "租户",
"displayName":"昵称",
- "deleteTenantConfirm":"您确定你要删除该产所吗?",
+ "deleteRealmConfirm":"您确定你要删除该产所吗?",
"user_plural": "用户",
"regularUser_plural": "普通用户",
"serviceUser_plural": "服务用户",
diff --git a/manager/src/web/shared/locales/de/or.json b/manager/src/web/shared/locales/de/or.json
index ac0937a7c..24ef6e77b 100644
--- a/manager/src/web/shared/locales/de/or.json
+++ b/manager/src/web/shared/locales/de/or.json
@@ -221,10 +221,10 @@
"buttonTextConfirm": "Text für Aktionsschaltfläche",
"buttonTextDecline": "Text für Ablehnungsschaltfläche",
"custom": "Manuelle Eingabe",
- "tenant": "Tenant",
- "tenant_plural": "Tenants",
+ "realm": "Realm",
+ "realm_plural": "Realms",
"displayName": "Freundlicher Name",
- "deleteTenantConfirm": "Möchten Sie diesen Realm wirklich löschen?",
+ "deleteRealmConfirm": "Möchten Sie diesen Realm wirklich löschen?",
"user_plural": "Benutzer",
"regularUser_plural": "Normale Benutzer",
"serviceUser_plural": "Servicenutzer",
diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.json
index 795581911..090609c22 100644
--- a/manager/src/web/shared/locales/en/or.json
+++ b/manager/src/web/shared/locales/en/or.json
@@ -224,10 +224,10 @@
"buttonTextConfirm": "Text for action button",
"buttonTextDecline": "Text for decline button",
"custom": "Custom attribute",
- "tenant": "Tenant",
- "tenant_plural": "Tenants",
+ "realm": "Realm",
+ "realm_plural": "Realms",
"displayName":"Friendly name",
- "deleteTenantConfirm":"Are you sure you want to delete this Realm?",
+ "deleteRealmConfirm":"Are you sure you want to delete this Realm?",
"user_plural": "Users",
"regularUser_plural": "Regular users",
"serviceUser_plural": "Service users",
@@ -479,5 +479,7 @@
"assetTypeMenuNone": "None",
"attributeLabel": "Attribute",
"attributeValueLabel": "Attribute value"
- }
+ },
+ "realmDeleteConfirm": "Warning! this will delete everything in this realm, type the realm name '{{realmName}}' to confirm.",
+ "realmDeleteFailed": "Failed to delete realm"
}
diff --git a/manager/src/web/shared/locales/es/or.json b/manager/src/web/shared/locales/es/or.json
index edf43816f..82eb064fc 100644
--- a/manager/src/web/shared/locales/es/or.json
+++ b/manager/src/web/shared/locales/es/or.json
@@ -207,10 +207,10 @@
"buttonTextConfirm": "Texto del botón de acción",
"buttonTextDecline": "Texto del botón rechazar",
"custom": "Entrada manual",
- "tenant": "Realm",
- "tenant_plural": "Realms",
+ "realm": "Realm",
+ "realm_plural": "Realms",
"displayName":"Nome amigable",
- "deleteTenantConfirm":"¿Estás seguro de que deseas eliminar este realms?",
+ "deleteRealmConfirm":"¿Estás seguro de que deseas eliminar este realms?",
"user_plural": "Usuarios",
"regularUser_plural": "Usuarios",
"serviceUser_plural": "Usuários do serviço",
diff --git a/manager/src/web/shared/locales/fr/or.json b/manager/src/web/shared/locales/fr/or.json
index 127de4148..d0d0513c6 100644
--- a/manager/src/web/shared/locales/fr/or.json
+++ b/manager/src/web/shared/locales/fr/or.json
@@ -207,10 +207,10 @@
"buttonTextConfirm": "Texte pour le bouton d'action",
"buttonTextDecline": "Texte pour le bouton de refus",
"custom": "Saisie manuelle",
- "tenant": "Locataire",
- "tenant_plural": "Locataires",
+ "realm": "Locataire",
+ "realm_plural": "Locataires",
"displayName":"Nom familier",
- "deleteTenantConfirm":"Êtes-vous sûr de vouloir supprimer ce realm?",
+ "deleteRealmConfirm":"Êtes-vous sûr de vouloir supprimer ce realm?",
"user_plural": "Utilisateurs",
"regularUser_plural": "Utilisateurs",
"serviceUser_plural": "Utilisateurs de services",
diff --git a/manager/src/web/shared/locales/it/or.json b/manager/src/web/shared/locales/it/or.json
index e59cf6618..4d12db268 100644
--- a/manager/src/web/shared/locales/it/or.json
+++ b/manager/src/web/shared/locales/it/or.json
@@ -207,10 +207,10 @@
"buttonTextConfirm": "Testo per il pulsante di azione",
"buttonTextDecline": "Testo per il pulsante di rifiuto",
"custom": "Attributo personalizzato",
- "tenant": "Inquilino",
- "tenant_plural": "Inquilini",
+ "realm": "Inquilino",
+ "realm_plural": "Inquilini",
"displayName":"Nome amico",
- "deleteTenantConfirm":"Sei sicuro di voler cancellare questo Regno??",
+ "deleteRealmConfirm":"Sei sicuro di voler cancellare questo Regno??",
"user_plural": "Utenti",
"regularUser_plural": "Utenti",
"serviceUser_plural": "Utenti del servizio",
diff --git a/manager/src/web/shared/locales/nl/or.json b/manager/src/web/shared/locales/nl/or.json
index f891c3176..1384de96b 100644
--- a/manager/src/web/shared/locales/nl/or.json
+++ b/manager/src/web/shared/locales/nl/or.json
@@ -223,10 +223,10 @@
"buttonTextConfirm": "Tekst voor actie knop",
"buttonTextDecline": "Tekst voor negeerknop",
"custom": "Nieuw attribuut",
- "tenant": "Tenant",
- "tenant_plural": "Tenants",
+ "realm": "Realm",
+ "realm_plural": "Realms",
"displayName":"Vriendelijke naam",
- "deleteTenantConfirm":"Weet je zeker dat je deze realm wil verwijderen?",
+ "deleteRealmConfirm":"Weet je zeker dat je deze realm wil verwijderen?",
"user_plural": "Gebruikers",
"regularUser_plural": "Gebruikers",
"serviceUser_plural": "Service gebruikers",
diff --git a/manager/src/web/shared/locales/pt/or.json b/manager/src/web/shared/locales/pt/or.json
index a31ff0c7e..11c461cff 100644
--- a/manager/src/web/shared/locales/pt/or.json
+++ b/manager/src/web/shared/locales/pt/or.json
@@ -207,10 +207,10 @@
"buttonTextConfirm": "Texto para o botão de ação",
"buttonTextDecline": "Texto para o botão de recusa",
"custom": "Atributo personalizado",
- "tenant": "Reino",
- "tenant_plural": "Reinos",
+ "realm": "Reino",
+ "realm_plural": "Reinos",
"displayName":"Nome amigável",
- "deleteTenantConfirm":"Tem certeza que deseja excluir este Reino?",
+ "deleteRealmConfirm":"Tem certeza que deseja excluir este Reino?",
"user_plural": "Usuários",
"regularUser_plural": "Usuários regulares",
"serviceUser_plural": "Usuários do serviço",
diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.java
index 1b4b5b074..d734f8859 100644
--- a/model/src/main/java/org/openremote/model/asset/Asset.java
+++ b/model/src/main/java/org/openremote/model/asset/Asset.java
@@ -109,9 +109,7 @@ import static org.openremote.model.Constants.*;
* "parentId": "0oI7Gf_kTh6WyRJFUTr8Lg",
* "parentName": "Smart building",
* "parentType": "urn:openremote:asset:building",
- * "realm": "c38a3fdf-9d74-4dac-940c-50d3dce1d248",
- * "tenantRealm": "building",
- * "tenantDisplayName": "Building",
+ * "realm": "building",
* "path": [
* "B0x8ZOqZQHGjq_l0RxAJBA",
* "0oI7Gf_kTh6WyRJFUTr8Lg"
@@ -133,9 +131,7 @@ import static org.openremote.model.Constants.*;
* "parentId": "B0x8ZOqZQHGjq_l0RxAJBA",
* "parentName": "Apartment 1",
* "parentType": "urn:openremote:asset:residence",
- * "realm": "c38a3fdf-9d74-4dac-940c-50d3dce1d248",
- * "tenantRealm": "building",
- * "tenantDisplayName": "Building",
+ * "realm": "building",
* "path": [
* "bzlRiJmSSMCl8HIUt9-lMg",
* "B0x8ZOqZQHGjq_l0RxAJBA",
@@ -158,9 +154,7 @@ import static org.openremote.model.Constants.*;
* "parentId": "bzlRiJmSSMCl8HIUt9-lMg",
* "parentName": "Living Room",
* "parentType": "urn:openremote:asset:room",
- * "realm": "c38a3fdf-9d74-4dac-940c-50d3dce1d248",
- * "tenantRealm": "building",
- * "tenantDisplayName": "Building",
+ * "realm": "building",
* "path": [
* "W7GV_lFeQVyHLlgHgE3dEQ",
* "bzlRiJmSSMCl8HIUt9-lMg",
diff --git a/model/src/main/java/org/openremote/model/event/shared/EventFilter.java b/model/src/main/java/org/openremote/model/event/shared/EventFilter.java
index eb0cdfcab..ac22bed30 100644
--- a/model/src/main/java/org/openremote/model/event/shared/EventFilter.java
+++ b/model/src/main/java/org/openremote/model/event/shared/EventFilter.java
@@ -29,7 +29,7 @@ import org.openremote.model.syslog.SyslogEvent;
* Filters {@link SharedEvent} by arbitrary criteria.
*/
@JsonSubTypes({
- @JsonSubTypes.Type(value = TenantFilter.class, name = TenantFilter.FILTER_TYPE),
+ @JsonSubTypes.Type(value = RealmFilter.class, name = RealmFilter.FILTER_TYPE),
@JsonSubTypes.Type(value = SyslogEvent.LevelCategoryFilter.class, name = SyslogEvent.LevelCategoryFilter.FILTER_TYPE),
@JsonSubTypes.Type(value = AssetFilter.class, name = AssetFilter.FILTER_TYPE)
})
diff --git a/model/src/main/java/org/openremote/model/event/shared/TenantFilter.java b/model/src/main/java/org/openremote/model/event/shared/RealmFilter.java
similarity index 70%
rename from model/src/main/java/org/openremote/model/event/shared/TenantFilter.java
rename to model/src/main/java/org/openremote/model/event/shared/RealmFilter.java
index 19dfda8fc..769864a94 100644
--- a/model/src/main/java/org/openremote/model/event/shared/TenantFilter.java
+++ b/model/src/main/java/org/openremote/model/event/shared/RealmFilter.java
@@ -19,21 +19,21 @@
*/
package org.openremote.model.event.shared;
-public class TenantFilter<T extends TenantScopedEvent> extends EventFilter<T> {
+public class RealmFilter<T extends RealmScopedEvent> extends EventFilter<T> {
- public static final String FILTER_TYPE = "tenant";
+ public static final String FILTER_TYPE = "realm";
- protected String realm;
+ protected String name;
- protected TenantFilter() {
+ protected RealmFilter() {
}
- public TenantFilter(String realm) {
- this.realm = realm;
+ public RealmFilter(String name) {
+ this.name = name;
}
- public String getRealm() {
- return realm;
+ public String getName() {
+ return name;
}
@Override
@@ -42,14 +42,14 @@ public class TenantFilter<T extends TenantScopedEvent> extends EventFilter<T> {
}
@Override
- public boolean apply(TenantScopedEvent event) {
- return getRealm().equals(event.getRealm());
+ public boolean apply(RealmScopedEvent event) {
+ return getName().equals(event.getRealm());
}
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
- "realm='" + realm + '\'' +
+ "realm='" + name + '\'' +
'}';
}
}
diff --git a/model/src/main/java/org/openremote/model/event/shared/TenantScopedEvent.java b/model/src/main/java/org/openremote/model/event/shared/RealmScopedEvent.java
similarity index 84%
rename from model/src/main/java/org/openremote/model/event/shared/TenantScopedEvent.java
rename to model/src/main/java/org/openremote/model/event/shared/RealmScopedEvent.java
index 1b7aeb531..d6970ecfd 100644
--- a/model/src/main/java/org/openremote/model/event/shared/TenantScopedEvent.java
+++ b/model/src/main/java/org/openremote/model/event/shared/RealmScopedEvent.java
@@ -22,20 +22,20 @@ package org.openremote.model.event.shared;
/**
* An event that carries information about the realm it occurred in.
*/
-public abstract class TenantScopedEvent extends SharedEvent {
+public abstract class RealmScopedEvent extends SharedEvent {
public String realm;
- public TenantScopedEvent(long timestamp, String realm) {
+ public RealmScopedEvent(long timestamp, String realm) {
super(timestamp);
this.realm = realm;
}
- public TenantScopedEvent(String realm) {
+ public RealmScopedEvent(String realm) {
this.realm = realm;
}
- protected TenantScopedEvent() {
+ protected RealmScopedEvent() {
}
public String getRealm() {
diff --git a/model/src/main/java/org/openremote/model/gateway/GatewayConnectionStatusEvent.java b/model/src/main/java/org/openremote/model/gateway/GatewayConnectionStatusEvent.java
index 95b7b168a..ba5d6f0ba 100644
--- a/model/src/main/java/org/openremote/model/gateway/GatewayConnectionStatusEvent.java
+++ b/model/src/main/java/org/openremote/model/gateway/GatewayConnectionStatusEvent.java
@@ -20,13 +20,12 @@
package org.openremote.model.gateway;
import org.openremote.model.asset.agent.ConnectionStatus;
-import org.openremote.model.attribute.AttributeRef;
-import org.openremote.model.event.shared.TenantScopedEvent;
+import org.openremote.model.event.shared.RealmScopedEvent;
/**
* Published by the server when a {@link GatewayConnection} status changes.
*/
-public class GatewayConnectionStatusEvent extends TenantScopedEvent {
+public class GatewayConnectionStatusEvent extends RealmScopedEvent {
protected ConnectionStatus connectionStatus;
diff --git a/model/src/main/java/org/openremote/model/notification/Notification.java b/model/src/main/java/org/openremote/model/notification/Notification.java
index 1470fcea6..887d38b42 100644
--- a/model/src/main/java/org/openremote/model/notification/Notification.java
+++ b/model/src/main/java/org/openremote/model/notification/Notification.java
@@ -31,12 +31,12 @@ public class Notification {
INTERNAL,
CLIENT,
GLOBAL_RULESET,
- TENANT_RULESET,
+ REALM_RULESET,
ASSET_RULESET
}
public enum TargetType {
- TENANT,
+ REALM,
USER,
ASSET,
CUSTOM
diff --git a/model/src/main/java/org/openremote/model/notification/NotificationResource.java b/model/src/main/java/org/openremote/model/notification/NotificationResource.java
index ed8aaaabf..507959462 100644
--- a/model/src/main/java/org/openremote/model/notification/NotificationResource.java
+++ b/model/src/main/java/org/openremote/model/notification/NotificationResource.java
@@ -48,7 +48,7 @@ public interface NotificationResource {
@QueryParam("type") String type,
@QueryParam("from") Long fromTimestamp,
@QueryParam("to") Long toTimestamp,
- @QueryParam("tenantId") String tenantId,
+ @QueryParam("realmId") String realmId,
@QueryParam("userId") String userId,
@QueryParam("assetId") String assetId);
// RT: Was using lists here but they don't work with JSAPI because GWT doesn't use JSArrays for lists - another
@@ -58,7 +58,7 @@ public interface NotificationResource {
// @QueryParam("type") List<String> types,
// @QueryParam("from") Long fromTimestamp,
// @QueryParam("to") Long toTimestamp,
-// @QueryParam("tenantId") List<String> tenantIds,
+// @QueryParam("realmId") List<String> realmIds,
// @QueryParam("userId") List<String> userIds,
// @QueryParam("assetId") List<String> assetIds);
@@ -77,7 +77,7 @@ public interface NotificationResource {
@QueryParam("type") String type,
@QueryParam("from") Long fromTimestamp,
@QueryParam("to") Long toTimestamp,
- @QueryParam("tenantId") String tenantId,
+ @QueryParam("realmId") String realmId,
@QueryParam("userId") String userId,
@QueryParam("assetId") String assetId);
// RT: Was using lists here but they don't work with JSAPI because GWT doesn't use JSArrays for lists - another
@@ -87,7 +87,7 @@ public interface NotificationResource {
// @QueryParam("type") List<String> types,
// @QueryParam("from") Long fromTimestamp,
// @QueryParam("to") Long toTimestamp,
-// @QueryParam("tenantId") List<String> tenantIds,
+// @QueryParam("realmId") List<String> realmIds,
// @QueryParam("userId") List<String> userIds,
// @QueryParam("assetId") List<String> assetIds);
diff --git a/model/src/main/java/org/openremote/model/protocol/ProtocolDiscoveryImportRequestEvent.java b/model/src/main/java/org/openremote/model/protocol/ProtocolDiscoveryImportRequestEvent.java
index 05fb91ad5..f6667a01e 100644
--- a/model/src/main/java/org/openremote/model/protocol/ProtocolDiscoveryImportRequestEvent.java
+++ b/model/src/main/java/org/openremote/model/protocol/ProtocolDiscoveryImportRequestEvent.java
@@ -21,14 +21,14 @@ package org.openremote.model.protocol;
import org.openremote.model.asset.Asset;
import org.openremote.model.asset.agent.Agent;
-import org.openremote.model.event.shared.TenantScopedEvent;
+import org.openremote.model.event.shared.RealmScopedEvent;
/**
* Initiates a protocol discovery import (either instance or asset discovery depending on {@link #isAssetDiscovery()});
* for a given client only one discovery process can be running at a time so any already running discovery process will
* be stopped.
*/
-public class ProtocolDiscoveryImportRequestEvent extends TenantScopedEvent {
+public class ProtocolDiscoveryImportRequestEvent extends RealmScopedEvent {
protected String agentDescriptor;
protected String assetId;
diff --git a/model/src/main/java/org/openremote/model/protocol/ProtocolDiscoveryStartRequestEvent.java b/model/src/main/java/org/openremote/model/protocol/ProtocolDiscoveryStartRequestEvent.java
index 3cb09712e..5a67c6a00 100644
--- a/model/src/main/java/org/openremote/model/protocol/ProtocolDiscoveryStartRequestEvent.java
+++ b/model/src/main/java/org/openremote/model/protocol/ProtocolDiscoveryStartRequestEvent.java
@@ -21,14 +21,14 @@ package org.openremote.model.protocol;
import org.openremote.model.asset.Asset;
import org.openremote.model.asset.agent.Agent;
-import org.openremote.model.event.shared.TenantScopedEvent;
+import org.openremote.model.event.shared.RealmScopedEvent;
/**
* Initiates a protocol discovery process (either instance or asset discovery depending on {@link #isAssetDiscovery()});
* for a given client only one discovery process can be running at a time so any already running discovery process will
* be stopped.
*/
-public class ProtocolDiscoveryStartRequestEvent extends TenantScopedEvent {
+public class ProtocolDiscoveryStartRequestEvent extends RealmScopedEvent {
protected String agentDescriptor;
protected String assetId;
diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java
index befa5af4d..7e914387d 100644
--- a/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java
+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java
@@ -19,6 +19,7 @@
*/
package org.openremote.model.provisioning;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.openremote.model.http.RequestParams;
import javax.validation.Valid;
@@ -26,6 +27,7 @@ import javax.ws.rs.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+@Tag(name = "Provisioning")
@Path("provisioning")
public interface ProvisioningResource {
diff --git a/model/src/main/java/org/openremote/model/query/AssetQuery.java b/model/src/main/java/org/openremote/model/query/AssetQuery.java
index 515c3b71f..c8e36de68 100644
--- a/model/src/main/java/org/openremote/model/query/AssetQuery.java
+++ b/model/src/main/java/org/openremote/model/query/AssetQuery.java
@@ -183,7 +183,7 @@ public class AssetQuery implements Serializable {
public StringPredicate[] names;
public ParentPredicate[] parents;
public PathPredicate[] paths;
- public TenantPredicate tenant;
+ public RealmPredicate realm;
public String[] userIds;
@JsonSerialize(contentConverter = AssetClassToStringConverter.class)
@JsonDeserialize(contentConverter = StringToAssetClassConverter.class)
@@ -277,8 +277,8 @@ public class AssetQuery implements Serializable {
return this;
}
- public AssetQuery tenant(TenantPredicate tenantPredicate) {
- this.tenant = tenantPredicate;
+ public AssetQuery realm(RealmPredicate realmPredicate) {
+ this.realm = realmPredicate;
return this;
}
@@ -388,7 +388,7 @@ public class AssetQuery implements Serializable {
", name=" + Arrays.toString(names) +
", parent=" + Arrays.toString(parents) +
", path=" + Arrays.toString(paths) +
- ", tenant=" + tenant +
+ ", realm=" + realm +
", userId='" + Arrays.toString(userIds) + '\'' +
", type=" + Arrays.toString(types) +
", attribute=" + (attributes != null ? attributes.toString() : "null") +
diff --git a/model/src/main/java/org/openremote/model/query/UserQuery.java b/model/src/main/java/org/openremote/model/query/UserQuery.java
index b215c94c0..29329e7d4 100644
--- a/model/src/main/java/org/openremote/model/query/UserQuery.java
+++ b/model/src/main/java/org/openremote/model/query/UserQuery.java
@@ -1,8 +1,8 @@
package org.openremote.model.query;
import org.openremote.model.query.filter.PathPredicate;
+import org.openremote.model.query.filter.RealmPredicate;
import org.openremote.model.query.filter.StringPredicate;
-import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.query.filter.UserAssetPredicate;
import java.util.Arrays;
@@ -91,7 +91,7 @@ public class UserQuery {
}
// Restriction predicates
- public TenantPredicate tenantPredicate;
+ public RealmPredicate realmPredicate;
public UserAssetPredicate assetPredicate;
public PathPredicate pathPredicate;
public String[] ids;
@@ -104,8 +104,8 @@ public class UserQuery {
public UserQuery() {
}
- public UserQuery tenant(TenantPredicate tenantPredicate) {
- this.tenantPredicate = tenantPredicate;
+ public UserQuery realm(RealmPredicate realmPredicate) {
+ this.realmPredicate = realmPredicate;
return this;
}
@@ -152,7 +152,7 @@ public class UserQuery {
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
- "tenantPredicate=" + tenantPredicate +
+ "realmPredicate=" + realmPredicate +
", assetPredicate=" + assetPredicate +
", pathPredicate=" + pathPredicate +
", ids=" + (ids != null ? Arrays.toString(ids) : "null") +
diff --git a/model/src/main/java/org/openremote/model/query/filter/TenantPredicate.java b/model/src/main/java/org/openremote/model/query/filter/RealmPredicate.java
similarity index 85%
rename from model/src/main/java/org/openremote/model/query/filter/TenantPredicate.java
rename to model/src/main/java/org/openremote/model/query/filter/RealmPredicate.java
index 8b2dea63a..693058aef 100644
--- a/model/src/main/java/org/openremote/model/query/filter/TenantPredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/RealmPredicate.java
@@ -22,19 +22,19 @@ package org.openremote.model.query.filter;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
-public class TenantPredicate {
+public class RealmPredicate {
- public String realm;
+ public String name;
@JsonCreator
- public TenantPredicate(@JsonProperty("realm") String realm) {
- this.realm = realm;
+ public RealmPredicate(@JsonProperty("name") String name) {
+ this.name = name;
}
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
- ", realm='" + realm + '\'' +
+ ", name='" + name + '\'' +
'}';
}
}
diff --git a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java b/model/src/main/java/org/openremote/model/rules/RealmRuleset.java
similarity index 74%
rename from model/src/main/java/org/openremote/model/rules/TenantRuleset.java
rename to model/src/main/java/org/openremote/model/rules/RealmRuleset.java
index 2e8c49357..2fcabebac 100644
--- a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java
+++ b/model/src/main/java/org/openremote/model/rules/RealmRuleset.java
@@ -32,10 +32,10 @@ import java.util.Date;
* realm, and can only modify asset data in a particular realm.
*/
@Entity
-@Table(name = "TENANT_RULESET")
-public class TenantRuleset extends Ruleset {
+@Table(name = "REALM_RULESET")
+public class RealmRuleset extends Ruleset {
- public static final String TYPE = "tenant";
+ public static final String TYPE = "realm";
@Column(name = "REALM", nullable = false)
protected String realm;
@@ -43,9 +43,9 @@ public class TenantRuleset extends Ruleset {
@Column(name = "ACCESS_PUBLIC_READ", nullable = false)
protected boolean accessPublicRead;
- public TenantRuleset() {}
+ public RealmRuleset() {}
- public TenantRuleset(String realm, String name, Lang language, String rules) {
+ public RealmRuleset(String realm, String name, Lang language, String rules) {
super(name, language, rules);
this.realm = realm;
}
@@ -54,7 +54,7 @@ public class TenantRuleset extends Ruleset {
return realm;
}
- public TenantRuleset setRealm(String realm) {
+ public RealmRuleset setRealm(String realm) {
this.realm = realm;
return this;
}
@@ -63,91 +63,91 @@ public class TenantRuleset extends Ruleset {
return accessPublicRead;
}
- public TenantRuleset setAccessPublicRead(boolean accessPublicRead) {
+ public RealmRuleset setAccessPublicRead(boolean accessPublicRead) {
this.accessPublicRead = accessPublicRead;
return this;
}
@Override
- public TenantRuleset setId(Long id) {
+ public RealmRuleset setId(Long id) {
super.setId(id);
return this;
}
@Override
- public TenantRuleset setVersion(long version) {
+ public RealmRuleset setVersion(long version) {
super.setVersion(version);
return this;
}
@Override
- public TenantRuleset setCreatedOn(Date createdOn) {
+ public RealmRuleset setCreatedOn(Date createdOn) {
super.setCreatedOn(createdOn);
return this;
}
@Override
- public TenantRuleset setLastModified(Date lastModified) {
+ public RealmRuleset setLastModified(Date lastModified) {
super.setLastModified(lastModified);
return this;
}
@Override
- public TenantRuleset setName(String name) {
+ public RealmRuleset setName(String name) {
super.setName(name);
return this;
}
@Override
- public TenantRuleset setEnabled(boolean enabled) {
+ public RealmRuleset setEnabled(boolean enabled) {
super.setEnabled(enabled);
return this;
}
@Override
- public TenantRuleset setRules(String rules) {
+ public RealmRuleset setRules(String rules) {
super.setRules(rules);
return this;
}
@Override
- public TenantRuleset setLang(Lang lang) {
+ public RealmRuleset setLang(Lang lang) {
super.setLang(lang);
return this;
}
@Override
- public TenantRuleset setMeta(MetaMap meta) {
+ public RealmRuleset setMeta(MetaMap meta) {
super.setMeta(meta);
return this;
}
@Override
- public TenantRuleset setStatus(RulesetStatus status) {
+ public RealmRuleset setStatus(RulesetStatus status) {
super.setStatus(status);
return this;
}
@Override
- public TenantRuleset setError(String error) {
+ public RealmRuleset setError(String error) {
super.setError(error);
return this;
}
@Override
- public TenantRuleset setContinueOnError(boolean continueOnError) {
+ public RealmRuleset setContinueOnError(boolean continueOnError) {
super.setContinueOnError(continueOnError);
return this;
}
@Override
- public TenantRuleset setValidity(CalendarEvent calendarEvent) {
+ public RealmRuleset setValidity(CalendarEvent calendarEvent) {
super.setValidity(calendarEvent);
return this;
}
@Override
- public TenantRuleset setTriggerOnPredictedData(boolean triggerOnPredictedData) {
+ public RealmRuleset setTriggerOnPredictedData(boolean triggerOnPredictedData) {
super.setTriggerOnPredictedData(triggerOnPredictedData);
return this;
}
diff --git a/model/src/main/java/org/openremote/model/rules/RulesResource.java b/model/src/main/java/org/openremote/model/rules/RulesResource.java
index fac77a102..a51d55089 100644
--- a/model/src/main/java/org/openremote/model/rules/RulesResource.java
+++ b/model/src/main/java/org/openremote/model/rules/RulesResource.java
@@ -45,12 +45,12 @@ public interface RulesResource {
RulesEngineInfo getGlobalEngineInfo(@BeanParam RequestParams requestParams);
/**
- * Retrieve information about the specified tenant rules engine (if engine doesn't exist then will return null).
+ * Retrieve information about the specified realm rules engine (if engine doesn't exist then will return null).
*/
@GET
- @Path("info/tenant/{realm}")
+ @Path("info/realm/{realm}")
@RolesAllowed({Constants.READ_RULES_ROLE})
- RulesEngineInfo getTenantEngineInfo(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);
+ RulesEngineInfo getRealmEngineInfo(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);
/**
* Retrieve information about the specified asset rules engine (if engine doesn't exist then will return null).
@@ -70,14 +70,14 @@ public interface RulesResource {
GlobalRuleset[] getGlobalRulesets(@BeanParam RequestParams requestParams, @QueryParam("language") List<Ruleset.Lang> languages, @QueryParam("fullyPopulate") boolean fullyPopulate);
/**
- * Retrieve rules of a tenant. The superuser can retrieve rules of all realms, a 403 status is returned if a regular
+ * Retrieve rules of a realm. The superuser can retrieve rules of all realms, a 403 status is returned if a regular
* user tries to access rulesets outside of its authenticated realm. An empty result will be returned if the realm
* can not be found.
*/
@GET
- @Path("tenant/for/{realm}")
+ @Path("realm/for/{realm}")
@Produces(APPLICATION_JSON)
- TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @QueryParam("language") List<Ruleset.Lang> languages, @QueryParam("fullyPopulate") boolean fullyPopulate);
+ RealmRuleset[] getRealmRulesets(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @QueryParam("language") List<Ruleset.Lang> languages, @QueryParam("fullyPopulate") boolean fullyPopulate);
/**
* Retrieve rules of an asset. The superuser can retrieve rules of all realms and assets, a 403 status is returned
@@ -134,45 +134,45 @@ public interface RulesResource {
/* ################################################################################################# */
/**
- * Create a tenant ruleset. The superuser can create rules in all realms, a 403 status is returned if a regular user
+ * Create a realm ruleset. The superuser can create rules in all realms, a 403 status is returned if a regular user
* tries to access ruleset outside of its authenticated realm, or if the user is restricted.
*/
@POST
- @Path("tenant")
+ @Path("realm")
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
@RolesAllowed({Constants.WRITE_RULES_ROLE})
- long createTenantRuleset(@BeanParam RequestParams requestParams, @Valid TenantRuleset ruleset);
+ long createRealmRuleset(@BeanParam RequestParams requestParams, @Valid RealmRuleset ruleset);
/**
- * Retrieve a tenant ruleset. The superuser can retrieve rules of all realms, a 403 status is returned if a regular
+ * Retrieve a realm ruleset. The superuser can retrieve rules of all realms, a 403 status is returned if a regular
* user tries to access ruleset outside of its authenticated realm, or if the user is restricted.
*/
@GET
- @Path("tenant/{id}")
+ @Path("realm/{id}")
@Produces(APPLICATION_JSON)
@RolesAllowed({Constants.READ_RULES_ROLE})
- TenantRuleset getTenantRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id);
+ RealmRuleset getRealmRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id);
/**
- * Update a tenant ruleset. The superuser can update rules of all realms, a 403 status is returned if a regular user
+ * Update a realm ruleset. The superuser can update rules of all realms, a 403 status is returned if a regular user
* tries to access rulesets outside of its authenticated realm, or if the user is restricted.
*/
@PUT
- @Path("tenant/{id}")
+ @Path("realm/{id}")
@Consumes(APPLICATION_JSON)
@RolesAllowed({Constants.WRITE_RULES_ROLE})
- void updateTenantRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id, @Valid TenantRuleset ruleset);
+ void updateRealmRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id, @Valid RealmRuleset ruleset);
/**
- * Delete a tenant ruleset. The superuser can delete rules of all realms, a 403 status is returned if a regular user
+ * Delete a realm ruleset. The superuser can delete rules of all realms, a 403 status is returned if a regular user
* tries to access rulesets outside of its authenticated realm, or if the user is restricted.
*/
@DELETE
- @Path("tenant/{id}")
+ @Path("realm/{id}")
@Produces(APPLICATION_JSON)
@RolesAllowed({Constants.WRITE_RULES_ROLE})
- void deleteTenantRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id);
+ void deleteRealmRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id);
/* ################################################################################################# */
diff --git a/model/src/main/java/org/openremote/model/rules/Ruleset.java b/model/src/main/java/org/openremote/model/rules/Ruleset.java
index 1ecb43d24..2ba4f0409 100644
--- a/model/src/main/java/org/openremote/model/rules/Ruleset.java
+++ b/model/src/main/java/org/openremote/model/rules/Ruleset.java
@@ -46,7 +46,7 @@ import static org.openremote.model.Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR;
)
@JsonSubTypes({
@JsonSubTypes.Type(value = AssetRuleset.class, name = AssetRuleset.TYPE),
- @JsonSubTypes.Type(value = TenantRuleset.class, name = TenantRuleset.TYPE),
+ @JsonSubTypes.Type(value = RealmRuleset.class, name = RealmRuleset.TYPE),
@JsonSubTypes.Type(value = GlobalRuleset.class, name = GlobalRuleset.TYPE)
})
public abstract class Ruleset {
diff --git a/model/src/main/java/org/openremote/model/security/ClientRole.java b/model/src/main/java/org/openremote/model/security/ClientRole.java
index c99eafeb0..42a4ffd9c 100644
--- a/model/src/main/java/org/openremote/model/security/ClientRole.java
+++ b/model/src/main/java/org/openremote/model/security/ClientRole.java
@@ -33,7 +33,7 @@ import java.util.Set;
*/
public enum ClientRole {
- READ_ADMIN(Constants.READ_ADMIN_ROLE, "Read system settings, tenants, and users"),
+ READ_ADMIN(Constants.READ_ADMIN_ROLE, "Read system settings, realms, and users"),
READ_LOGS(Constants.READ_LOGS_ROLE, "Read logs and log settings"),
READ_USERS(Constants.READ_USERS_ROLE, "Read limited set of user details for use in rules etc."),
READ_MAP(Constants.READ_MAP_ROLE, "View map"),
@@ -41,7 +41,7 @@ public enum ClientRole {
READ_RULES(Constants.READ_RULES_ROLE, "Read rulesets"),
WRITE_USER(Constants.WRITE_USER_ROLE, "Write data of the authenticated user"),
- WRITE_ADMIN(Constants.WRITE_ADMIN_ROLE, "Write system settings, tenants, and users"),
+ WRITE_ADMIN(Constants.WRITE_ADMIN_ROLE, "Write system settings, realms, and users"),
WRITE_LOGS(Constants.WRITE_LOGS_ROLE, "Write log settings"),
WRITE_ASSETS(Constants.WRITE_ASSETS_ROLE, "Write asset data"),
WRITE_ATTRIBUTES(Constants.WRITE_ATTRIBUTES_ROLE, "Write attribute data"),
diff --git a/model/src/main/java/org/openremote/model/security/Tenant.java b/model/src/main/java/org/openremote/model/security/Realm.java
similarity index 83%
rename from model/src/main/java/org/openremote/model/security/Tenant.java
rename to model/src/main/java/org/openremote/model/security/Realm.java
index 565143975..990c050b7 100644
--- a/model/src/main/java/org/openremote/model/security/Tenant.java
+++ b/model/src/main/java/org/openremote/model/security/Realm.java
@@ -38,7 +38,7 @@ import static org.openremote.model.Constants.RESTRICTED_USER_REALM_ROLE;
*/
@Entity
@Subselect("select * from PUBLIC.REALM") // Map this immutable to an SQL view, don't use/create table
-public class Tenant {
+public class Realm {
protected static Field[] propertyFields;
@@ -46,7 +46,7 @@ public class Tenant {
protected String id;
@Column(name = "NAME")
- protected String realm;
+ protected String name;
@Formula("(select ra.VALUE from PUBLIC.REALM_ATTRIBUTE ra where ra.REALM_ID = ID and ra.name = 'displayName')")
protected String displayName;
@@ -97,12 +97,12 @@ public class Tenant {
@JoinColumn(name = "REALM_ID")
protected Set<RealmRole> realmRoles;
- public Tenant() {
+ public Realm() {
}
- public Tenant(String id, String realm, String displayName, Boolean enabled) {
+ public Realm(String id, String name, String displayName, Boolean enabled) {
this.id = id;
- this.realm = realm;
+ this.name = name;
this.displayName = displayName;
this.enabled = enabled;
}
@@ -115,25 +115,25 @@ public class Tenant {
this.id = id;
}
- @NotNull(message = "{Tenant.realm.NotNull}")
- @Size(min = 3, max = 255, message = "{Tenant.realm.Size}")
- @Pattern(regexp = "[a-zA-Z0-9\\-_]+", message = "{Tenant.realm.Pattern}")
- public String getRealm() {
- return realm;
+ @NotNull(message = "{Realm.realm.NotNull}")
+ @Size(min = 3, max = 255, message = "{Realm.realm.Size}")
+ @Pattern(regexp = "[a-zA-Z0-9\\-_]+", message = "{Realm.realm.Pattern}")
+ public String getName() {
+ return name;
}
- public Tenant setRealm(String realm) {
- this.realm = realm;
+ public Realm setName(String name) {
+ this.name = name;
return this;
}
- @NotNull(message = "{Tenant.displayName.NotNull}")
- @Size(min = 3, max = 255, message = "{Tenant.displayName.Size}")
+ @NotNull(message = "{Realm.displayName.NotNull}")
+ @Size(min = 3, max = 255, message = "{Realm.displayName.Size}")
public String getDisplayName() {
return displayName;
}
- public Tenant setDisplayName(String displayName) {
+ public Realm setDisplayName(String displayName) {
this.displayName = displayName;
return this;
}
@@ -142,7 +142,7 @@ public class Tenant {
return enabled;
}
- public Tenant setEnabled(Boolean enabled) {
+ public Realm setEnabled(Boolean enabled) {
this.enabled = enabled;
return this;
}
@@ -151,7 +151,7 @@ public class Tenant {
return notBefore;
}
- public Tenant setNotBefore(Double notBefore) {
+ public Realm setNotBefore(Double notBefore) {
this.notBefore = notBefore;
return this;
}
@@ -161,7 +161,7 @@ public class Tenant {
return resetPasswordAllowed != null ? resetPasswordAllowed : true;
}
- public Tenant setResetPasswordAllowed(Boolean resetPasswordAllowed) {
+ public Realm setResetPasswordAllowed(Boolean resetPasswordAllowed) {
this.resetPasswordAllowed = resetPasswordAllowed;
return this;
}
@@ -170,7 +170,7 @@ public class Tenant {
return duplicateEmailsAllowed != null && duplicateEmailsAllowed;
}
- public Tenant setDuplicateEmailsAllowed(Boolean duplicateEmailsAllowed) {
+ public Realm setDuplicateEmailsAllowed(Boolean duplicateEmailsAllowed) {
this.duplicateEmailsAllowed = duplicateEmailsAllowed;
return this;
}
@@ -179,7 +179,7 @@ public class Tenant {
return verifyEmail != null && verifyEmail;
}
- public Tenant setVerifyEmail(Boolean verifyEmail) {
+ public Realm setVerifyEmail(Boolean verifyEmail) {
this.verifyEmail = verifyEmail;
return this;
}
@@ -188,7 +188,7 @@ public class Tenant {
return loginWithEmail != null && loginWithEmail;
}
- public Tenant setLoginWithEmail(Boolean loginWithEmail) {
+ public Realm setLoginWithEmail(Boolean loginWithEmail) {
this.loginWithEmail = loginWithEmail;
return this;
}
@@ -197,7 +197,7 @@ public class Tenant {
return accessTokenLifespan;
}
- public Tenant setAccessTokenLifespan(Integer accessTokenLifespan) {
+ public Realm setAccessTokenLifespan(Integer accessTokenLifespan) {
this.accessTokenLifespan = accessTokenLifespan;
return this;
}
@@ -206,7 +206,7 @@ public class Tenant {
return rememberMe != null && rememberMe;
}
- public Tenant setRememberMe(Boolean rememberMe) {
+ public Realm setRememberMe(Boolean rememberMe) {
this.rememberMe = rememberMe;
return this;
}
@@ -215,7 +215,7 @@ public class Tenant {
return registrationAllowed != null && registrationAllowed;
}
- public Tenant setRegistrationAllowed(Boolean registrationAllowed) {
+ public Realm setRegistrationAllowed(Boolean registrationAllowed) {
this.registrationAllowed = registrationAllowed;
return this;
}
@@ -224,7 +224,7 @@ public class Tenant {
return registrationEmailAsUsername != null && registrationEmailAsUsername;
}
- public Tenant setRegistrationEmailAsUsername(Boolean registrationEmailAsUsername) {
+ public Realm setRegistrationEmailAsUsername(Boolean registrationEmailAsUsername) {
this.registrationEmailAsUsername = registrationEmailAsUsername;
return this;
}
@@ -238,7 +238,7 @@ public class Tenant {
return loginTheme;
}
- public Tenant setLoginTheme(String loginTheme) {
+ public Realm setLoginTheme(String loginTheme) {
this.loginTheme = loginTheme;
return this;
}
@@ -247,7 +247,7 @@ public class Tenant {
return accountTheme;
}
- public Tenant setAccountTheme(String accountTheme) {
+ public Realm setAccountTheme(String accountTheme) {
this.accountTheme = accountTheme;
return this;
}
@@ -256,7 +256,7 @@ public class Tenant {
return adminTheme;
}
- public Tenant setAdminTheme(String adminTheme) {
+ public Realm setAdminTheme(String adminTheme) {
this.adminTheme = adminTheme;
return this;
}
@@ -265,7 +265,7 @@ public class Tenant {
return emailTheme;
}
- public Tenant setEmailTheme(String emailTheme) {
+ public Realm setEmailTheme(String emailTheme) {
this.emailTheme = emailTheme;
return this;
}
@@ -276,21 +276,21 @@ public class Tenant {
@JsonIgnore
public Set<RealmRole> getNormalisedRealmRoles() {
- Set<RealmRole> tempSet = new LinkedHashSet<>(getDefaultRealmRoles(getRealm()));
+ Set<RealmRole> tempSet = new LinkedHashSet<>(getDefaultRealmRoles(getName()));
if (realmRoles != null) {
tempSet.addAll(realmRoles);
}
return tempSet;
}
- public Tenant setRealmRoles(Set<RealmRole> realmRoles) {
+ public Realm setRealmRoles(Set<RealmRole> realmRoles) {
this.realmRoles = realmRoles;
return this;
}
public static Field[] getPropertyFields() {
if (propertyFields == null) {
- propertyFields = Arrays.stream(Tenant.class.getDeclaredFields())
+ propertyFields = Arrays.stream(Realm.class.getDeclaredFields())
.filter(field -> field.isAnnotationPresent(Column.class) || field.isAnnotationPresent(JoinColumn.class) || field.isAnnotationPresent(Formula.class))
.toArray(Field[]::new);
}
@@ -321,7 +321,7 @@ public class Tenant {
public String toString() {
return getClass().getSimpleName() + "{" +
"id='" + id + '\'' +
- ", realm='" + realm + '\'' +
+ ", realm='" + name + '\'' +
", displayName='" + displayName + '\'' +
", enabled=" + enabled +
", notBefore=" + notBefore +
diff --git a/model/src/main/java/org/openremote/model/security/TenantResource.java b/model/src/main/java/org/openremote/model/security/RealmResource.java
similarity index 81%
rename from model/src/main/java/org/openremote/model/security/TenantResource.java
rename to model/src/main/java/org/openremote/model/security/RealmResource.java
index cc5bb1eed..5317a39a7 100644
--- a/model/src/main/java/org/openremote/model/security/TenantResource.java
+++ b/model/src/main/java/org/openremote/model/security/RealmResource.java
@@ -36,13 +36,13 @@ import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
* <p>
* TODO Relax permissions to allow regular users to maintain their own realm
*/
-@Tag(name = "Tenant")
-@Path("tenant")
-public interface TenantResource {
+@Tag(name = "Realm")
+@Path("realm")
+public interface RealmResource {
@GET
@Produces(APPLICATION_JSON)
- Tenant[] getAll(@BeanParam RequestParams requestParams);
+ Realm[] getAll(@BeanParam RequestParams requestParams);
/**
* Will return realm and display names for accessible realms by authenticated user
@@ -50,32 +50,32 @@ public interface TenantResource {
@GET
@Path("accessible")
@Produces(APPLICATION_JSON)
- Tenant[] getAccessible(@BeanParam RequestParams requestParams);
+ Realm[] getAccessible(@BeanParam RequestParams requestParams);
/**
* Regular users can call this, but only to obtain details about their currently authenticated and active realm.
*/
@GET
- @Path("{realm}")
+ @Path("{name}")
@Produces(APPLICATION_JSON)
- Tenant get(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);
+ Realm get(@BeanParam RequestParams requestParams, @PathParam("name") String realm);
@PUT
- @Path("{realm}")
+ @Path("{name}")
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
- void update(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @Valid Tenant tenant);
+ void update(@BeanParam RequestParams requestParams, @PathParam("name") String realmName, @Valid Realm realm);
@POST
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
- void create(@BeanParam RequestParams requestParams, @Valid Tenant tenant);
+ void create(@BeanParam RequestParams requestParams, @Valid Realm realm);
@DELETE
- @Path("{realm}")
+ @Path("{name}")
@Produces(APPLICATION_JSON)
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
- void delete(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);
+ void delete(@BeanParam RequestParams requestParams, @PathParam("name") String realm);
}
diff --git a/model/src/main/resources/ValidationMessages.properties b/model/src/main/resources/ValidationMessages.properties
index 1ee7fcd8e..07a1ed79f 100644
--- a/model/src/main/resources/ValidationMessages.properties
+++ b/model/src/main/resources/ValidationMessages.properties
@@ -1,11 +1,11 @@
-Tenant.displayName.NotNull = Tenant name can not be empty.
-Tenant.displayName.Size = Tenant name must be at least {min} and not more than {max} characters long.
-Tenant.realm.NotNull = Tenant realm can not be empty.
-Tenant.realm.Size = Tenant realm must be at least {min} and not more than {max} characters long.
-Tenant.realm.Pattern = Tenant realm must be all lowercase characters and/or numbers.
-Tenant.masterDeleted = The master realm can not be deleted.
-Tenant.masterDisabled = The master realm can not be disabled.
-Tenant.masterRealmChanged = The master realm identifier can not be changed.
+Realm.displayName.NotNull = Realm name can not be empty.
+Realm.displayName.Size = Realm name must be at least {min} and not more than {max} characters long.
+Realm.realm.NotNull = Realm realm can not be empty.
+Realm.realm.Size = Realm realm must be at least {min} and not more than {max} characters long.
+Realm.realm.Pattern = Realm realm must be all lowercase characters and/or numbers.
+Realm.masterDeleted = The master realm can not be deleted.
+Realm.masterDisabled = The master realm can not be disabled.
+Realm.masterRealmChanged = The master realm identifier can not be changed.
User.username.NotNull = Username can not be empty.
User.username.Size = Username must be at least {min} and not more than {max} characters long.
diff --git a/setup/src/main/java/org/openremote/setup/demo/KeycloakDemoSetup.java b/setup/src/main/java/org/openremote/setup/demo/KeycloakDemoSetup.java
index 724059972..521fd1522 100644
--- a/setup/src/main/java/org/openremote/setup/demo/KeycloakDemoSetup.java
+++ b/setup/src/main/java/org/openremote/setup/demo/KeycloakDemoSetup.java
@@ -23,7 +23,7 @@ import org.openremote.manager.setup.AbstractKeycloakSetup;
import org.openremote.model.Constants;
import org.openremote.model.Container;
import org.openremote.model.security.ClientRole;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import org.openremote.model.security.User;
import java.util.Arrays;
@@ -42,8 +42,8 @@ public class KeycloakDemoSetup extends AbstractKeycloakSetup {
private static final Logger LOG = Logger.getLogger(KeycloakDemoSetup.class.getName());
public String smartCityUserId;
- public Tenant masterTenant;
- public Tenant tenantCity;
+ public Realm realmMaster;
+ public Realm realmCity;
public KeycloakDemoSetup(Container container) {
super(container);
@@ -53,9 +53,9 @@ public class KeycloakDemoSetup extends AbstractKeycloakSetup {
public void onStart() throws Exception {
super.onStart();
- // Tenants
- masterTenant = identityService.getIdentityProvider().getTenant(Constants.MASTER_REALM);
- tenantCity = createTenant("smartcity", "Smart City", true);
+ // Realms
+ realmMaster = identityService.getIdentityProvider().getRealm(Constants.MASTER_REALM);
+ realmCity = createRealm("smartcity", "Smart City", true);
removeManageAccount("smartcity");
// Don't allow demo users to write assets
@@ -64,8 +64,8 @@ public class KeycloakDemoSetup extends AbstractKeycloakSetup {
.toArray(ClientRole[]::new);
// Users
- User smartCityUser = createUser(tenantCity.getRealm(), "smartcity", "smartcity", "Smart", "City", null, true, demoUserRoles);
+ User smartCityUser = createUser(realmCity.getName(), "smartcity", "smartcity", "Smart", "City", null, true, demoUserRoles);
this.smartCityUserId = smartCityUser.getId();
- keycloakProvider.updateUserRoles(tenantCity.getRealm(), smartCityUserId, "account"); // Remove all roles for account client
+ keycloakProvider.updateUserRoles(realmCity.getName(), smartCityUserId, "account"); // Remove all roles for account client
}
}
diff --git a/setup/src/main/java/org/openremote/setup/demo/ManagerDemoAgentSetup.java b/setup/src/main/java/org/openremote/setup/demo/ManagerDemoAgentSetup.java
index cac69d5ee..11a102625 100644
--- a/setup/src/main/java/org/openremote/setup/demo/ManagerDemoAgentSetup.java
+++ b/setup/src/main/java/org/openremote/setup/demo/ManagerDemoAgentSetup.java
@@ -24,7 +24,7 @@ import org.openremote.agent.protocol.velbus.VelbusTCPAgent;
import org.openremote.container.util.MapAccess;
import org.openremote.manager.setup.ManagerSetup;
import org.openremote.model.Container;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import java.util.logging.Logger;
@@ -40,7 +40,7 @@ public class ManagerDemoAgentSetup extends ManagerSetup {
public static final String OR_SETUP_IMPORT_DEMO_AGENT_VELBUS_HOST = "OR_SETUP_IMPORT_DEMO_AGENT_VELBUS_HOST";
public static final String OR_SETUP_IMPORT_DEMO_AGENT_VELBUS_PORT = "OR_SETUP_IMPORT_DEMO_AGENT_VELBUS_PORT";
- public String masterRealm;
+ public String realmMasterName;
final protected boolean knx;
final protected String knxGatewayIp;
@@ -67,14 +67,14 @@ public class ManagerDemoAgentSetup extends ManagerSetup {
super.onStart();
KeycloakDemoSetup keycloakDemoSetup = setupService.getTaskOfType(KeycloakDemoSetup.class);
- Tenant masterTenant = keycloakDemoSetup.masterTenant;
- masterRealm = masterTenant.getRealm();
+ Realm realmMaster = keycloakDemoSetup.realmMaster;
+ realmMasterName = realmMaster.getName();
if (knx) {
LOG.info("Enable KNX demo agent, gateway/local IP: " + knxGatewayIp + "/" + knxLocalIp);
KNXAgent agent = new KNXAgent("Demo KNX agent")
- .setRealm(masterRealm)
+ .setRealm(realmMasterName)
.setHost(knxGatewayIp)
.setBindHost(knxLocalIp);
@@ -85,7 +85,7 @@ public class ManagerDemoAgentSetup extends ManagerSetup {
LOG.info("Enable Velbus demo agent, host/port: " + velbusHost + "/" + velbusPort);
VelbusTCPAgent agent = new VelbusTCPAgent("Demo VELBUS agent")
- .setRealm(masterRealm)
+ .setRealm(realmMasterName)
.setHost(velbusHost)
.setPort(velbusPort);
diff --git a/setup/src/main/java/org/openremote/setup/demo/ManagerDemoSetup.java b/setup/src/main/java/org/openremote/setup/demo/ManagerDemoSetup.java
index 90efcdc03..a5c9187e4 100644
--- a/setup/src/main/java/org/openremote/setup/demo/ManagerDemoSetup.java
+++ b/setup/src/main/java/org/openremote/setup/demo/ManagerDemoSetup.java
@@ -34,7 +34,7 @@ import org.openremote.model.attribute.AttributeLink;
import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.attribute.MetaItem;
import org.openremote.model.geo.GeoJSONPoint;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import org.openremote.model.simulator.SimulatorReplayDatapoint;
import org.openremote.model.value.*;
@@ -49,8 +49,8 @@ import static org.openremote.model.value.ValueType.MultivaluedStringMap;
public class ManagerDemoSetup extends ManagerSetup {
public static GeoJSONPoint STATIONSPLEIN_LOCATION = new GeoJSONPoint(4.470175, 51.923464);
- public String masterRealm;
- public String realmCityTenant;
+ public String realmMasterName;
+ public String realmCityName;
public String area1Id;
public String smartcitySimulatorAgentId;
public String energyManagementId;
@@ -75,10 +75,10 @@ public class ManagerDemoSetup extends ManagerSetup {
super.onStart();
KeycloakDemoSetup keycloakDemoSetup = setupService.getTaskOfType(KeycloakDemoSetup.class);
- Tenant masterTenant = keycloakDemoSetup.masterTenant;
- Tenant tenantCity = keycloakDemoSetup.tenantCity;
- masterRealm = masterTenant.getRealm();
- this.realmCityTenant = tenantCity.getRealm();
+ Realm realmMaster = keycloakDemoSetup.realmMaster;
+ Realm realmCity = keycloakDemoSetup.realmCity;
+ realmMasterName = realmMaster.getName();
+ this.realmCityName = realmCity.getName();
// ################################ Demo assets for 'master' realm ###################################
@@ -92,7 +92,7 @@ public class ManagerDemoSetup extends ManagerSetup {
// ################################ Realm smartcity ###################################
SimulatorAgent smartcitySimulatorAgent = new SimulatorAgent("Simulator agent");
- smartcitySimulatorAgent.setRealm(this.realmCityTenant);
+ smartcitySimulatorAgent.setRealm(this.realmCityName);
smartcitySimulatorAgent = assetStorageService.merge(smartcitySimulatorAgent);
smartcitySimulatorAgentId = smartcitySimulatorAgent.getId();
@@ -102,7 +102,7 @@ public class ManagerDemoSetup extends ManagerSetup {
// ################################ Realm smartcity - Energy Management ###################################
ThingAsset energyManagement = new ThingAsset("Energy management");
- energyManagement.setRealm(this.realmCityTenant);
+ energyManagement.setRealm(this.realmCityName);
energyManagement.getAttributes().addOrReplace(
new Attribute<>("powerTotalProducers", ValueType.NUMBER)
.addOrReplaceMeta(
@@ -789,7 +789,7 @@ public class ManagerDemoSetup extends ManagerSetup {
// ################################ Realm smartcity - Environment monitor ###################################
Asset<?> environmentMonitor = new ThingAsset("Environment monitor");
- environmentMonitor.setRealm(this.realmCityTenant);
+ environmentMonitor.setRealm(this.realmCityName);
environmentMonitor.setId(UniqueIdentifierGenerator.generateId(environmentMonitor.getName()));
environmentMonitor = assetStorageService.merge(environmentMonitor);
@@ -930,7 +930,7 @@ public class ManagerDemoSetup extends ManagerSetup {
// ################################ Realm smartcity - Mobility and Safety ###################################
Asset<?> mobilityAndSafety = new ThingAsset("Mobility and safety");
- mobilityAndSafety.setRealm(this.realmCityTenant);
+ mobilityAndSafety.setRealm(this.realmCityName);
mobilityAndSafety.setId(UniqueIdentifierGenerator.generateId(mobilityAndSafety.getName()));
mobilityAndSafety = assetStorageService.merge(mobilityAndSafety);
diff --git a/setup/src/main/java/org/openremote/setup/demo/RulesDemoSetup.java b/setup/src/main/java/org/openremote/setup/demo/RulesDemoSetup.java
index 267b04d4c..970df468d 100644
--- a/setup/src/main/java/org/openremote/setup/demo/RulesDemoSetup.java
+++ b/setup/src/main/java/org/openremote/setup/demo/RulesDemoSetup.java
@@ -24,7 +24,7 @@ import org.openremote.manager.setup.ManagerSetup;
import org.openremote.model.Container;
import org.openremote.model.attribute.MetaItem;
import org.openremote.model.rules.Ruleset;
-import org.openremote.model.rules.TenantRuleset;
+import org.openremote.model.rules.RealmRuleset;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
@@ -40,7 +40,7 @@ public class RulesDemoSetup extends ManagerSetup {
super(container);
}
- public Long tenantSmartCityRulesetId;
+ public Long realmSmartCityRulesetId;
@Override
public void onStart() throws Exception {
@@ -55,128 +55,128 @@ public class RulesDemoSetup extends ManagerSetup {
// SmartCity geofences
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/DeKuip.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "De Kuip", Ruleset.Lang.JSON, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "De Kuip", Ruleset.Lang.JSON, rules
).setAccessPublicRead(true);
ruleset.getMeta().addOrReplace(
new MetaItem<>(SHOW_ON_LIST));
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/Euromast.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Euromast", Ruleset.Lang.JSON, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Euromast", Ruleset.Lang.JSON, rules
).setAccessPublicRead(true);
ruleset.getMeta().addOrReplace(
new MetaItem<>(SHOW_ON_LIST));
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/Markthal.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Markthal", Ruleset.Lang.JSON, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Markthal", Ruleset.Lang.JSON, rules
).setAccessPublicRead(true);
ruleset.getMeta().addOrReplace(
new MetaItem<>(SHOW_ON_LIST));
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/MarkthalChargersInUse.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Markthal: All chargers in use", Ruleset.Lang.JSON, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Markthal: All chargers in use", Ruleset.Lang.JSON, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/OnsParkBrightStrongWinds.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Ons Park: Brighten lights", Ruleset.Lang.JSON, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Ons Park: Brighten lights", Ruleset.Lang.JSON, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/OnsParkDimLightWinds.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Ons Park: Dim lights", Ruleset.Lang.JSON, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Ons Park: Dim lights", Ruleset.Lang.JSON, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/StationCrowded.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Station: Crowded square", Ruleset.Lang.JSON, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Station: Crowded square", Ruleset.Lang.JSON, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/EnvironmentAlerts.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Environment monitoring: Alerts", Ruleset.Lang.JSON, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Environment monitoring: Alerts", Ruleset.Lang.JSON, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/TotalPowerConsumption.flow")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Total power consumption", Ruleset.Lang.FLOW, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Total power consumption", Ruleset.Lang.FLOW, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/TotalSolarProduction.flow")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Total power production", Ruleset.Lang.FLOW, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Total power production", Ruleset.Lang.FLOW, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/RotterdamPowerBalance.flow")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "De Rotterdam: Power balance", Ruleset.Lang.FLOW, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "De Rotterdam: Power balance", Ruleset.Lang.FLOW, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/ParkingOccupiedPercentage.flow")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Parking: Occupied spaces", Ruleset.Lang.FLOW, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Parking: Occupied spaces", Ruleset.Lang.FLOW, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/ParkingFull.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Parking: Almost full", Ruleset.Lang.JSON, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Parking: Almost full", Ruleset.Lang.JSON, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/RotterdamBatteryUse.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "De Rotterdam: Battery use", Ruleset.Lang.JSON, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "De Rotterdam: Battery use", Ruleset.Lang.JSON, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/LightGroupOnOff.flow")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- Ruleset ruleset = new TenantRuleset(
- keycloakDemoSetup.tenantCity.getRealm(), "Light group: On/Off", Ruleset.Lang.FLOW, rules
+ Ruleset ruleset = new RealmRuleset(
+ keycloakDemoSetup.realmCity.getName(), "Light group: On/Off", Ruleset.Lang.FLOW, rules
);
- tenantSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
+ realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();
}
}
}
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy
index e46d043c8..fa66c12a6 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy
@@ -43,13 +43,13 @@ class AssetIntegrityTest extends Specification implements ManagerContainerTrait
when: "an asset is created in the authenticated realm"
RoomAsset testAsset = new RoomAsset("Test Room")
- .setRealm(keycloakTestSetup.masterTenant.realm)
+ .setRealm(keycloakTestSetup.realmMaster.name)
testAsset = assetResource.create(null, testAsset)
then: "the asset should exist"
testAsset.name == "Test Room"
testAsset.type == RoomAsset.DESCRIPTOR.getName()
- testAsset.realm == keycloakTestSetup.masterTenant.realm
+ testAsset.realm == keycloakTestSetup.realmMaster.name
testAsset.parentId == null
when: "an asset is stored with an illegal attribute name"
@@ -109,7 +109,7 @@ class AssetIntegrityTest extends Specification implements ManagerContainerTrait
ex.response.status == 403
when: "an asset is updated with a new realm"
- testAsset.setRealm(keycloakTestSetup.tenantBuilding.realm)
+ testAsset.setRealm(keycloakTestSetup.realmBuilding.name)
assetResource.update(null, testAsset.id, testAsset)
then: "the request should be forbidden"
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
index d812b416e..b50c16f7c 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
@@ -14,7 +14,7 @@ import org.openremote.model.attribute.MetaItem
import org.openremote.model.attribute.MetaMap
import org.openremote.model.query.AssetQuery
import org.openremote.model.query.filter.ParentPredicate
-import org.openremote.model.query.filter.TenantPredicate
+import org.openremote.model.query.filter.RealmPredicate
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -62,7 +62,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "the root assets of the authenticated realm are retrieved"
assets = assetResource.queryAssets(null,
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.parents(new ParentPredicate(null))
)
@@ -83,7 +83,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "the root assets of the authenticated realm are retrieved"
assets = assetResource.queryAssets(null,
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.parents(new ParentPredicate(null))
)
@@ -94,7 +94,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "the root assets of the given realm are retrieved"
assets = assetResource.queryAssets(null,
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmBuilding.name))
.parents(new ParentPredicate(null))
)
@@ -131,7 +131,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "an asset is created in the authenticated realm"
def testAsset = new RoomAsset("Test Room")
- .setRealm(keycloakTestSetup.masterTenant.realm)
+ .setRealm(keycloakTestSetup.realmMaster.name)
testAsset = assetResource.create(null, testAsset)
testAsset = assetResource.get(null, testAsset.getId())
@@ -139,7 +139,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
then: "the asset should exist"
testAsset.name == "Test Room"
testAsset.type == RoomAsset.DESCRIPTOR.getName()
- testAsset.realm == keycloakTestSetup.masterTenant.realm
+ testAsset.realm == keycloakTestSetup.realmMaster.name
testAsset.parentId == null
when: "an asset is made public"
@@ -251,7 +251,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "the root assets of the authenticated realm are retrieved"
assets = assetResource.queryAssets(null,
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.parents(new ParentPredicate(null))
)
@@ -278,12 +278,12 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
then: "result should match"
assets.length == 1
assets[0].id == managerTestSetup.smartOfficeId
- assets[0].realm == keycloakTestSetup.masterTenant.realm
+ assets[0].realm == keycloakTestSetup.realmMaster.name
when: "the root assets of a foreign realm are retrieved"
assets = assetResource.queryAssets(null,
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmBuilding.name))
.parents(new ParentPredicate(null))
)
@@ -323,7 +323,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
then: "the asset should exist"
testAsset.name == "Test Room"
testAsset.type == RoomAsset.DESCRIPTOR.getName()
- testAsset.realm == keycloakTestSetup.masterTenant.realm
+ testAsset.realm == keycloakTestSetup.realmMaster.name
testAsset.parentId == null
when: "an asset is updated with a new parent in the authenticated realm"
@@ -335,7 +335,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
testAsset.parentId == managerTestSetup.groundFloorId
when: "an asset is moved to a foreign realm and made a root asset"
- testAsset.setRealm(keycloakTestSetup.tenantBuilding.realm)
+ testAsset.setRealm(keycloakTestSetup.realmBuilding.name)
testAsset.setParentId(null)
assetResource.update(null, testAsset.id, testAsset)
@@ -391,14 +391,14 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
and: "an authenticated test user"
def accessToken = authenticate(
container,
- keycloakTestSetup.tenantBuilding.realm,
+ keycloakTestSetup.realmBuilding.name,
KEYCLOAK_CLIENT_ID,
"testuser2",
"testuser2"
).token
and: "the asset resource"
- def assetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm, accessToken).proxy(AssetResource.class)
+ def assetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name, accessToken).proxy(AssetResource.class)
/* ############################################## READ ####################################### */
@@ -415,7 +415,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "the root assets of a foreign realm are retrieved"
assets = assetResource.queryAssets(null,
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.parents(new ParentPredicate(null))
)
@@ -431,12 +431,12 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
then: "result should match"
assets.length == 1
assets[0].id == managerTestSetup.smartBuildingId
- assets[0].realm == keycloakTestSetup.tenantBuilding.realm
+ assets[0].realm == keycloakTestSetup.realmBuilding.name
when: "the root assets of a foreign realm are retrieved"
assets = assetResource.queryAssets(null,
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.tenantCity.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmCity.name))
.parents(new ParentPredicate(null))
)
@@ -469,7 +469,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "an asset is created in a foreign realm"
def testAsset = new RoomAsset("Test Room")
- .setRealm(keycloakTestSetup.masterTenant.realm)
+ .setRealm(keycloakTestSetup.realmMaster.name)
assetResource.create(null, testAsset)
then: "access should be forbidden"
@@ -487,7 +487,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "an asset is created in the authenticated realm"
testAsset = new RoomAsset("Test Room")
- .setRealm(keycloakTestSetup.tenantBuilding.realm)
+ .setRealm(keycloakTestSetup.realmBuilding.name)
assetResource.create(null, testAsset)
then: "access should be forbidden"
@@ -531,14 +531,14 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
and: "an authenticated test user"
def accessToken = authenticate(
container,
- keycloakTestSetup.tenantBuilding.realm,
+ keycloakTestSetup.realmBuilding.name,
KEYCLOAK_CLIENT_ID,
"testuser3",
"testuser3"
).token
and: "the asset resource"
- def assetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm, accessToken).proxy(AssetResource.class)
+ def assetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name, accessToken).proxy(AssetResource.class)
/* ############################################## READ ####################################### */
@@ -551,7 +551,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
apartment1.id == managerTestSetup.apartment1Id
apartment1.name == "Apartment 1"
apartment1.createdOn.getTime() < System.currentTimeMillis()
- apartment1.realm == keycloakTestSetup.tenantBuilding.realm
+ apartment1.realm == keycloakTestSetup.realmBuilding.name
apartment1.type == BuildingAsset.DESCRIPTOR.getName()
apartment1.parentId == managerTestSetup.smartBuildingId
apartment1.path[0] == managerTestSetup.smartBuildingId
@@ -581,7 +581,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "the root assets of a foreign realm are retrieved"
assets = assetResource.queryAssets(null,
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.parents(new ParentPredicate(null))
)
@@ -600,7 +600,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "the root assets of a foreign realm are retrieved"
assets = assetResource.queryAssets(null,
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.tenantCity.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmCity.name))
.parents(new ParentPredicate(null))
)
@@ -679,7 +679,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "an asset is created in a foreign realm"
def testAsset = new RoomAsset("Test Room")
- .setRealm(keycloakTestSetup.masterTenant.realm)
+ .setRealm(keycloakTestSetup.realmMaster.name)
assetResource.create(null, testAsset)
then: "access should be forbidden"
@@ -724,7 +724,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
when: "an asset is created in the authenticated realm"
testAsset = new RoomAsset("Test Room")
- .setRealm(keycloakTestSetup.tenantBuilding.realm)
+ .setRealm(keycloakTestSetup.realmBuilding.name)
assetResource.create(null, testAsset)
then: "access should be forbidden"
@@ -840,11 +840,11 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
def keycloakTestSetup = container.getService(SetupService.class).getTaskOfType(KeycloakTestSetup.class)
and: "the asset resource"
- def assetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm).proxy(AssetResource.class)
+ def assetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name).proxy(AssetResource.class)
when: "the public assets are retrieved"
def assets = assetResource.queryAssets(null, new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm)))
+ .realm(new RealmPredicate(keycloakTestSetup.realmBuilding.name)))
then: "the public assets should be retrieved"
assert assets.size() == 2
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovy
index 1f8fad519..f6a98a9a7 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovy
@@ -99,7 +99,7 @@ class AssetProcessingTest extends Specification implements ManagerContainerTrait
when: "a mock agent that uses the mock protocol is created"
def mockAgent = new MockAgent("Mock agent")
- .setRealm(keycloakTestSetup.masterTenant.realm)
+ .setRealm(keycloakTestSetup.realmMaster.name)
.setRequired(true)
mockAgent = assetStorageService.merge(mockAgent)
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
index 4bece9e55..5ceb44309 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
@@ -73,7 +73,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
def assets = assetStorageService.findAll(
new AssetQuery()
.types(Agent.class)
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
)
then: "agent assets should be retrieved"
@@ -83,7 +83,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
assets[0].name == "Demo Agent"
assets[0].type == SimulatorAgent.DESCRIPTOR.name
assets[0].parentId == managerTestSetup.lobbyId
- assets[0].realm == managerTestSetup.masterRealm
+ assets[0].realm == managerTestSetup.realmMasterName
when: "a user filtering query is executed"
assets = assetStorageService.findAll(
@@ -162,7 +162,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
apartment1.type == BuildingAsset.DESCRIPTOR.getName()
apartment1.createdOn != null
apartment1.parentId == managerTestSetup.smartBuildingId
- apartment1.realm == managerTestSetup.realmBuildingTenant
+ apartment1.realm == managerTestSetup.realmBuildingName
apartment1.getAttributes().size() == 7
apartment1.getAttribute("ventilationAuto").isPresent()
apartment1.getAttribute("ventilationLevel").isPresent()
@@ -197,7 +197,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
asset.name == "Smart office"
asset.type == BuildingAsset.DESCRIPTOR.getName()
asset.parentId == null
- asset.realm == keycloakTestSetup.masterTenant.realm
+ asset.realm == keycloakTestSetup.realmMaster.name
asset.attributes.size() == 0
when: "a query is executed"
@@ -212,7 +212,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
asset.name == "Smart office"
asset.type == BuildingAsset.DESCRIPTOR.getName()
asset.parentId == null
- asset.realm == keycloakTestSetup.masterTenant.realm
+ asset.realm == keycloakTestSetup.realmMaster.name
asset.path.length == 1
asset.path[0] == managerTestSetup.smartOfficeId
asset.getAttribute(BuildingAsset.STREET).flatMap{it.value}.orElse("") == "Torenallee 20"
@@ -222,7 +222,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(new Select().excludeAttributes())
.parents(new ParentPredicate(null))
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
)
then: "result should match"
@@ -232,14 +232,14 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
assets.get(0).name == "Smart office"
assets.get(0).type == BuildingAsset.DESCRIPTOR.getName()
assets.get(0).parentId == null
- assets.get(0).realm == keycloakTestSetup.masterTenant.realm
+ assets.get(0).realm == keycloakTestSetup.realmMaster.name
assets.get(0).attributes.size() == 0
when: "a query is executed"
assets = assetStorageService.findAll(
new AssetQuery()
.parents(new ParentPredicate(null))
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
)
then: "result should match"
@@ -249,7 +249,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
assets.get(0).name == "Smart office"
assets.get(0).type == BuildingAsset.DESCRIPTOR.getName()
assets.get(0).parentId == null
- assets.get(0).realm == keycloakTestSetup.masterTenant.realm
+ assets.get(0).realm == keycloakTestSetup.realmMaster.name
assets.get(0).path.length == 1
assets.get(0).path[0] == managerTestSetup.smartOfficeId
((BuildingAsset)assets.get(0)).getStreet().orElse("") == "Torenallee 20"
@@ -268,7 +268,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
assets.get(0).name == "Apartment 1"
assets.get(0).type == BuildingAsset.DESCRIPTOR.getName()
assets.get(0).parentId == managerTestSetup.smartBuildingId
- assets.get(0).realm == keycloakTestSetup.tenantBuilding.realm
+ assets.get(0).realm == keycloakTestSetup.realmBuilding.name
assets.get(0).attributes.size() == 0
assets.get(1).id == managerTestSetup.apartment2Id
assets.get(2).id == managerTestSetup.apartment3Id
@@ -278,7 +278,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(new Select().excludeAttributes())
.parents(new ParentPredicate(managerTestSetup.smartBuildingId))
- .tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmBuilding.name))
)
then: "result should match"
@@ -292,7 +292,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(new Select().excludeAttributes())
.parents(new ParentPredicate(managerTestSetup.smartBuildingId))
- .tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmBuilding.name))
.orderBy(new OrderBy(NAME, true))
)
@@ -307,7 +307,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(new Select().excludeAttributes())
.parents(new ParentPredicate(managerTestSetup.smartBuildingId))
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
)
then: "result should match"
@@ -435,7 +435,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
assets = assetStorageService.findAll(
new AssetQuery()
.select(new Select().excludeAttributes())
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributes(
new AttributePredicate().meta(
new NameValuePredicate(READ_ONLY, new BooleanPredicate(true))
@@ -525,7 +525,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(new Select().excludeAttributes())
.attributes(new AttributePredicate().meta(new NameValuePredicate(AGENT_LINK, new StringPredicate(managerTestSetup.agentId), false, new NameValuePredicate.Path("id"))))
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
)
then: "result should match"
@@ -546,7 +546,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
asset.name == "Living Room 1"
asset.type == RoomAsset.DESCRIPTOR.getName()
asset.parentId != null
- asset.realm == keycloakTestSetup.tenantBuilding.realm
+ asset.realm == keycloakTestSetup.realmBuilding.name
asset.path != null
asset.getAttributes().size() == 3
asset.getAttribute("co2Level").isPresent()
@@ -570,7 +570,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
asset.name == "Living Room 1"
asset.type == RoomAsset.DESCRIPTOR.getName()
asset.parentId == managerTestSetup.apartment1Id
- asset.realm == keycloakTestSetup.tenantBuilding.realm
+ asset.realm == keycloakTestSetup.realmBuilding.name
asset.path != null
asset.getAttributes().size() == 1
asset.getAttribute("co2Level").isPresent()
@@ -718,7 +718,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(new Select().excludeAttributes())
.attributes(new LocationAttributePredicate(new RadialGeofencePredicate(10, 51.44541688237109d, 5.460315214821094d)))
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.orderBy(new OrderBy(NAME))
)
@@ -745,7 +745,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(new Select().excludeAttributes())
.attributes(new LocationAttributePredicate(new RadialGeofencePredicate(10, 51.44541688237109d, 5.460315214821094d)))
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.orderBy(new OrderBy(NAME))
)
@@ -758,7 +758,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(new Select().excludeAttributes())
.attributes(new LocationAttributePredicate(new RectangularGeofencePredicate(51.44540d, 5.46031d, 51.44594d, 5.46110d)))
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.orderBy(new OrderBy(NAME))
)
@@ -775,7 +775,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(new Select().excludeAttributes())
.attributes(new LocationAttributePredicate(new RectangularGeofencePredicate(51.44542d, 5.46032d, 51.44590d, 5.46100d)))
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.orderBy(new OrderBy(NAME))
)
@@ -787,7 +787,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(new Select().excludeAttributes())
.attributes(new LocationAttributePredicate(new RectangularGeofencePredicate(51.44542d, 5.46032d, 51.44590d, 5.46100d).negate()))
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.orderBy(new OrderBy(NAME))
)
@@ -841,7 +841,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
when: "a calendar event filtering query is executed for the correct date and time of the event"
def assets = assetStorageService.findAll(
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517155200000)))) // 28/01/2018 @ 4:00pm (UTC)
.orderBy(new OrderBy(NAME))
)
@@ -858,7 +858,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
when: "a calendar event filtering query is executed for future event on a correct day but wrong time"
assets = assetStorageService.findAll(
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517335200000)))) // 30/01/2018 @ 6:00pm (UTC)
.orderBy(new OrderBy(NAME))
)
@@ -869,7 +869,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
when: "a calendar event filtering query is executed for a future event on a wrong day but correct time"
assets = assetStorageService.findAll(
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517238600000)))) // 29/01/2018 @ 3:10pm (UTC)
.orderBy(new OrderBy(NAME))
)
@@ -880,7 +880,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
when: "a calendar event filtering query is executed inside a valid future event date and time"
assets = assetStorageService.findAll(
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517503800000)))) // 01/02/2018 @ 4:50pm (UTC))
.orderBy(new OrderBy(NAME))
)
@@ -895,7 +895,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
when: "a calendar event filtering query is executed inside a valid future event date and time of the lobby asset"
assets = assetStorageService.findAll(
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517849400000)))) // 05/02/2018 @ 4:50pm (UTC))
.orderBy(new OrderBy(NAME))
)
@@ -908,7 +908,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
when: "a calendar event filtering query is executed for some time after the last occurrence"
assets = assetStorageService.findAll(
new AssetQuery()
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1518017520000)))) // 02/07/2018 @ 3:32pm (UTC)
.orderBy(new OrderBy(NAME))
)
@@ -931,7 +931,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
def assets = assetStorageService.findAll(
new AssetQuery()
.select(new Select().excludeAttributes())
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributeValue(
"openingDate",
new DateTimePredicate(rangeStart.format(ISO_ZONED_DATE_TIME), rangeEnd.format(ISO_ZONED_DATE_TIME))
@@ -947,7 +947,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
assets = assetStorageService.findAll(
new AssetQuery()
.select(new Select().excludeAttributes())
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributeValue(
"openingDate",
new DateTimePredicate(Operator.GREATER_THAN, rangeStart.format(ISO_ZONED_DATE_TIME)))
@@ -962,7 +962,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
assets = assetStorageService.findAll(
new AssetQuery()
.select(new Select().excludeAttributes())
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributeValue(
"openingDate",
new DateTimePredicate(Operator.LESS_THAN, rangeEnd.format(ISO_ZONED_DATE_TIME)))
@@ -979,7 +979,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
assets = assetStorageService.findAll(
new AssetQuery()
.select(new Select().excludeAttributes())
- .tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))
+ .realm(new RealmPredicate(keycloakTestSetup.realmMaster.name))
.attributeValue(
"openingDate",
new DateTimePredicate(Operator.EQUALS, rangeStart.format(ISO_ZONED_DATE_TIME)))
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
index 439db03ce..026cfc2d8 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
@@ -47,13 +47,13 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
def accessToken = AdapterTokenVerifier.verifyToken(testUserAccessToken, keycloakTestSetup.getKeycloakProvider().getKeycloakDeployment(MASTER_REALM, KEYCLOAK_CLIENT_ID))
def testUser1Token = new AccessTokenAuthContext(MASTER_REALM, accessToken)
- testUserAccessToken = authenticate(container, keycloakTestSetup.tenantBuilding.realm, KEYCLOAK_CLIENT_ID, "testuser2", "testuser2").token
- accessToken = AdapterTokenVerifier.verifyToken(testUserAccessToken, keycloakTestSetup.getKeycloakProvider().getKeycloakDeployment(keycloakTestSetup.tenantBuilding.realm, KEYCLOAK_CLIENT_ID))
- def testUser2Token = new AccessTokenAuthContext(keycloakTestSetup.tenantBuilding.realm, accessToken)
+ testUserAccessToken = authenticate(container, keycloakTestSetup.realmBuilding.name, KEYCLOAK_CLIENT_ID, "testuser2", "testuser2").token
+ accessToken = AdapterTokenVerifier.verifyToken(testUserAccessToken, keycloakTestSetup.getKeycloakProvider().getKeycloakDeployment(keycloakTestSetup.realmBuilding.name, KEYCLOAK_CLIENT_ID))
+ def testUser2Token = new AccessTokenAuthContext(keycloakTestSetup.realmBuilding.name, accessToken)
- testUserAccessToken = authenticate(container, keycloakTestSetup.tenantBuilding.realm, KEYCLOAK_CLIENT_ID, "testuser3", "testuser3").token
- accessToken = AdapterTokenVerifier.verifyToken(testUserAccessToken, keycloakTestSetup.getKeycloakProvider().getKeycloakDeployment(keycloakTestSetup.tenantBuilding.realm, KEYCLOAK_CLIENT_ID))
- def testUser3Token = new AccessTokenAuthContext(keycloakTestSetup.tenantBuilding.realm, accessToken)
+ testUserAccessToken = authenticate(container, keycloakTestSetup.realmBuilding.name, KEYCLOAK_CLIENT_ID, "testuser3", "testuser3").token
+ accessToken = AdapterTokenVerifier.verifyToken(testUserAccessToken, keycloakTestSetup.getKeycloakProvider().getKeycloakDeployment(keycloakTestSetup.realmBuilding.name, KEYCLOAK_CLIENT_ID))
+ def testUser3Token = new AccessTokenAuthContext(keycloakTestSetup.realmBuilding.name, accessToken)
expect: "some users to be restricted"
!identityService.getIdentityProvider().isRestrictedUser(testUser1Token)
@@ -61,12 +61,12 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
identityService.getIdentityProvider().isRestrictedUser(testUser3Token)
when: "all user assets are retrieved of a realm"
- def userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantBuilding.realm, null, null)
+ def userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.realmBuilding.name, null, null)
then: "result should match"
userAssetLinks.length == 9
userAssetLinks.any {
- it.id.realm == keycloakTestSetup.tenantBuilding.realm &&
+ it.id.realm == keycloakTestSetup.realmBuilding.name &&
it.id.userId == keycloakTestSetup.testuser3Id &&
it.id.assetId == managerTestSetup.apartment1Id &&
it.assetName == "Apartment 1" &&
@@ -74,7 +74,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
it.userFullName == "testuser3 (DemoA3 DemoLast)"
}
userAssetLinks.any {
- it.id.realm == keycloakTestSetup.tenantBuilding.realm &&
+ it.id.realm == keycloakTestSetup.realmBuilding.name &&
it.id.userId == keycloakTestSetup.testuser3Id &&
it.id.assetId == managerTestSetup.apartment1LivingroomId &&
it.assetName == "Living Room 1" &&
@@ -82,7 +82,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
it.userFullName == "testuser3 (DemoA3 DemoLast)"
}
userAssetLinks.any {
- it.id.realm == keycloakTestSetup.tenantBuilding.realm &&
+ it.id.realm == keycloakTestSetup.realmBuilding.name &&
it.id.userId == keycloakTestSetup.testuser3Id &&
it.id.assetId == managerTestSetup.apartment1KitchenId &&
it.assetName == "Kitchen 1" &&
@@ -90,7 +90,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
it.userFullName == "testuser3 (DemoA3 DemoLast)"
}
userAssetLinks.any {
- it.id.realm == keycloakTestSetup.tenantBuilding.realm &&
+ it.id.realm == keycloakTestSetup.realmBuilding.name &&
it.id.userId == keycloakTestSetup.testuser3Id &&
it.id.assetId == managerTestSetup.apartment1HallwayId &&
it.assetName == "Hallway 1" &&
@@ -98,7 +98,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
it.userFullName == "testuser3 (DemoA3 DemoLast)"
}
userAssetLinks.any {
- it.id.realm == keycloakTestSetup.tenantBuilding.realm &&
+ it.id.realm == keycloakTestSetup.realmBuilding.name &&
it.id.userId == keycloakTestSetup.testuser3Id &&
it.id.assetId == managerTestSetup.apartment1Bedroom1Id &&
it.assetName == "Bedroom 1" &&
@@ -106,7 +106,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
it.userFullName == "testuser3 (DemoA3 DemoLast)"
}
userAssetLinks.any {
- it.id.realm == keycloakTestSetup.tenantBuilding.realm &&
+ it.id.realm == keycloakTestSetup.realmBuilding.name &&
it.id.userId == keycloakTestSetup.testuser3Id &&
it.id.assetId == managerTestSetup.apartment1BathroomId &&
it.assetName == "Bathroom 1" &&
@@ -115,13 +115,13 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
}
when: "all user assets are retrieved of a realm and user"
- userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser3Id, null)
+ userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.realmBuilding.name, keycloakTestSetup.testuser3Id, null)
then: "result should match"
userAssetLinks.length == 6
when: "the realm and user don't match"
- assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantCity.realm, keycloakTestSetup.testuser3Id, null)
+ assetResource.getUserAssetLinks(null, keycloakTestSetup.realmCity.name, keycloakTestSetup.testuser3Id, null)
then: "an error response should be returned"
WebApplicationException ex = thrown()
@@ -135,12 +135,12 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
ex.response.status == 400
when: "all user assets are retrieved of a realm and user"
- userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantBuilding.realm, null, managerTestSetup.apartment1Id)
+ userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.realmBuilding.name, null, managerTestSetup.apartment1Id)
then: "result should match"
userAssetLinks.length == 1
userAssetLinks.any {
- it.id.realm == keycloakTestSetup.tenantBuilding.realm &&
+ it.id.realm == keycloakTestSetup.realmBuilding.name &&
it.id.userId == keycloakTestSetup.testuser3Id &&
it.id.assetId == managerTestSetup.apartment1Id &&
it.assetName == "Apartment 1" &&
@@ -149,12 +149,12 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
}
when: "all user assets are retrieved of a realm and user and asset"
- userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser3Id, managerTestSetup.apartment1Id)
+ userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.realmBuilding.name, keycloakTestSetup.testuser3Id, managerTestSetup.apartment1Id)
then: "result should match"
userAssetLinks.length == 1
userAssetLinks.any {
- it.id.realm == keycloakTestSetup.tenantBuilding.realm &&
+ it.id.realm == keycloakTestSetup.realmBuilding.name &&
it.id.userId == keycloakTestSetup.testuser3Id &&
it.id.assetId == managerTestSetup.apartment1Id &&
it.assetName == "Apartment 1" &&
@@ -163,7 +163,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
}
when: "all user assets are retrieved of a realm and user and asset"
- userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, managerTestSetup.apartment1Id)
+ userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.realmBuilding.name, keycloakTestSetup.testuser2Id, managerTestSetup.apartment1Id)
then: "result should match"
userAssetLinks.length == 0
@@ -171,14 +171,14 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
/* ############################################## WRITE ####################################### */
when: "an asset is linked to a user"
- UserAssetLink userAssetLink = new UserAssetLink(keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, managerTestSetup.apartment2Id)
+ UserAssetLink userAssetLink = new UserAssetLink(keycloakTestSetup.realmBuilding.name, keycloakTestSetup.testuser2Id, managerTestSetup.apartment2Id)
assetResource.createUserAssetLinks(null, [userAssetLink])
- userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, null)
+ userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.realmBuilding.name, keycloakTestSetup.testuser2Id, null)
then: "result should match"
userAssetLinks.length == 1
userAssetLinks.any {
- it.id.realm == keycloakTestSetup.tenantBuilding.realm &&
+ it.id.realm == keycloakTestSetup.realmBuilding.name &&
it.id.userId == keycloakTestSetup.testuser2Id &&
it.id.assetId == managerTestSetup.apartment2Id &&
it.assetName == "Apartment 2" &&
@@ -188,8 +188,8 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
}
when: "an asset link is deleted"
- assetResource.deleteUserAssetLink(null, keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, managerTestSetup.apartment2Id)
- userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, null)
+ assetResource.deleteUserAssetLink(null, keycloakTestSetup.realmBuilding.name, keycloakTestSetup.testuser2Id, managerTestSetup.apartment2Id)
+ userAssetLinks = assetResource.getUserAssetLinks(null, keycloakTestSetup.realmBuilding.name, keycloakTestSetup.testuser2Id, null)
then: "result should match"
userAssetLinks.length == 0
diff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
index 94f0b243c..b71872f3c 100644
--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
@@ -30,7 +30,7 @@ import org.openremote.model.query.filter.RadialGeofencePredicate
import org.openremote.model.rules.AssetRuleset
import org.openremote.model.rules.RulesResource
import org.openremote.model.rules.Ruleset
-import org.openremote.model.rules.TenantRuleset
+import org.openremote.model.rules.RealmRuleset
import org.openremote.model.value.MetaItemType
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
@@ -97,37 +97,37 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {
Asset testUser3Console1, testUser3Console2, anonymousConsole1
and: "the demo location predicate console rules are loaded"
- Ruleset ruleset = new TenantRuleset(
- keycloakTestSetup.tenantBuilding.realm,
- "Demo Tenant Building - Console Location",
+ Ruleset ruleset = new RealmRuleset(
+ keycloakTestSetup.realmBuilding.name,
+ "Demo Realm Building - Console Location",
Ruleset.Lang.GROOVY,
getClass().getResource("/org/openremote/test/rules/ConsoleLocation.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engine to become available and be running"
conditions.eventually {
- def tenantBuildingEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm)
- assert tenantBuildingEngine != null
- assert tenantBuildingEngine.isRunning()
- assert tenantBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING
+ def realmBuildingEngine = rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name)
+ assert realmBuildingEngine != null
+ assert realmBuildingEngine.isRunning()
+ assert realmBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING
}
and: "an authenticated user"
def accessToken = authenticate(
container,
- keycloakTestSetup.tenantBuilding.realm,
+ keycloakTestSetup.realmBuilding.name,
KEYCLOAK_CLIENT_ID,
"testuser3",
"testuser3"
).token
and: "authenticated and anonymous console, rules and asset resources"
- def authenticatedConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm, accessToken).proxy(ConsoleResource.class)
- def authenticatedRulesResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm, accessToken).proxy(RulesResource.class)
- def authenticatedAssetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm, accessToken).proxy(AssetResource.class)
- def anonymousConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm).proxy(ConsoleResource.class)
- def anonymousRulesResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm).proxy(RulesResource.class)
- def anonymousAssetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm).proxy(AssetResource.class)
+ def authenticatedConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name, accessToken).proxy(ConsoleResource.class)
+ def authenticatedRulesResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name, accessToken).proxy(RulesResource.class)
+ def authenticatedAssetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name, accessToken).proxy(AssetResource.class)
+ def anonymousConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name).proxy(ConsoleResource.class)
+ def anonymousRulesResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name).proxy(RulesResource.class)
+ def anonymousAssetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name).proxy(AssetResource.class)
when: "a console registers with an authenticated user"
def consoleRegistration = new ConsoleRegistration(null,
@@ -183,7 +183,7 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {
assert consolePushProvider.data.get("token").asText() == "23123213ad2313b0897efd"
and: "the console should have been linked to the authenticated user"
- def userAssets = assetStorageService.findUserAssetLinks(keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser3Id, consoleId)
+ def userAssets = assetStorageService.findUserAssetLinks(keycloakTestSetup.realmBuilding.name, keycloakTestSetup.testuser3Id, consoleId)
assert userAssets.size() == 1
assert userAssets.get(0).assetName == "Test Console"
@@ -400,16 +400,16 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {
and: "a console's location is updated to be null"
authenticatedAssetResource.writeAttributeValue(null, testUser3Console2.id, Asset.LOCATION.name, null)
- then: "no more alerts should have been sent and the welcome reset rule should have fired on the tenant rule engine"
+ then: "no more alerts should have been sent and the welcome reset rule should have fired on the realm rule engine"
conditions.eventually {
def asset = assetStorageService.find(testUser3Console2.id, true)
assert asset != null
assert asset.getAttribute(Asset.LOCATION.name).flatMap { it.timestamp }.orElse(Long.MIN_VALUE) > timestamp
assert notificationIds.size() == 1
- def tenantBuildingEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm)
- assert tenantBuildingEngine != null
- assert tenantBuildingEngine.isRunning()
- assert !tenantBuildingEngine.facts.getOptional("welcomeHome_${testUser3Console2.id}").isPresent()
+ def realmBuildingEngine = rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name)
+ assert realmBuildingEngine != null
+ assert realmBuildingEngine.isRunning()
+ assert !realmBuildingEngine.facts.getOptional("welcomeHome_${testUser3Console2.id}").isPresent()
}
when: "time advances"
@@ -563,7 +563,7 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {
newRuleset = rulesetStorageService.merge(newRuleset)
newLocationPredicate = new RadialGeofencePredicate(150, 10, 40)
- then: "a push notification should have been sent to the two remaining consoles telling them to refresh their geofences (from the tenant engine and asset engine)"
+ then: "a push notification should have been sent to the two remaining consoles telling them to refresh their geofences (from the realm engine and asset engine)"
conditions.eventually {
assert messages.stream()
.filter({ it instanceof PushNotificationMessage })
diff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy b/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy
index 87a3d2bda..80f3691ed 100644
--- a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy
@@ -157,14 +157,14 @@ class ForecastSolarServiceTest extends Specification implements ManagerContainer
when: "an asset is added with includeForecastSolarService set to true"
def newSolarAsset = new ElectricityProducerSolarAsset("SolarAsset")
newSolarAsset.setParentId(managerTestSetup.electricityOptimisationAssetId)
- newSolarAsset.setRealm(managerTestSetup.realmEnergyTenant)
- newSolarAsset.setPanelAzimuth(0);
- newSolarAsset.setPanelPitch(30);
- newSolarAsset.setEfficiencyExport(100);
- newSolarAsset.setPowerExportMax(2.5);
- newSolarAsset.setLocation(new GeoJSONPoint(9.195295, 48.787418));
- newSolarAsset.setSetActualSolarValueWithForecast(true);
- newSolarAsset.setIncludeForecastSolarService(true);
+ newSolarAsset.setRealm(managerTestSetup.realmEnergyName)
+ newSolarAsset.setPanelAzimuth(0)
+ newSolarAsset.setPanelPitch(30)
+ newSolarAsset.setEfficiencyExport(100)
+ newSolarAsset.setPowerExportMax(2.5)
+ newSolarAsset.setLocation(new GeoJSONPoint(9.195295, 48.787418))
+ newSolarAsset.setSetActualSolarValueWithForecast(true)
+ newSolarAsset.setIncludeForecastSolarService(true)
newSolarAsset = assetStorageService.merge(newSolarAsset)
then: "the assetId should be present in the calculationFutures"
@@ -180,7 +180,7 @@ class ForecastSolarServiceTest extends Specification implements ManagerContainer
when: "an asset is added with includeForecastSolarService set to false"
def newSolarAsset2 = new ElectricityProducerSolarAsset("SolarAsset2")
newSolarAsset2.setParentId(managerTestSetup.electricityOptimisationAssetId)
- newSolarAsset2.setRealm(managerTestSetup.realmEnergyTenant)
+ newSolarAsset2.setRealm(managerTestSetup.realmEnergyName)
newSolarAsset2.setPanelAzimuth(0);
newSolarAsset2.setPanelPitch(30);
newSolarAsset2.setEfficiencyExport(100);
diff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy b/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy
index a54d75d68..be524202d 100644
--- a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy
@@ -667,7 +667,7 @@ class ForecastWindServiceTest extends Specification implements ManagerContainerT
when: "an asset is added with includeForecastWindService set to true"
def newWindAsset = new ElectricityProducerWindAsset("WindAsset")
newWindAsset.setParentId(managerTestSetup.electricityOptimisationAssetId)
- newWindAsset.setRealm(managerTestSetup.realmEnergyTenant)
+ newWindAsset.setRealm(managerTestSetup.realmEnergyName)
newWindAsset.setWindSpeedMax(18d);
newWindAsset.setWindSpeedMin(2d);
newWindAsset.setWindSpeedReference(12d);
@@ -691,7 +691,7 @@ class ForecastWindServiceTest extends Specification implements ManagerContainerT
when: "an asset is added with includeForecastWindService set to false"
def newWindAsset2 = new ElectricityProducerWindAsset("WindAsset2")
newWindAsset2.setParentId(managerTestSetup.electricityOptimisationAssetId)
- newWindAsset2.setRealm(managerTestSetup.realmEnergyTenant)
+ newWindAsset2.setRealm(managerTestSetup.realmEnergyName)
newWindAsset2.setWindSpeedMax(18d);
newWindAsset2.setWindSpeedMin(2d);
newWindAsset2.setWindSpeedReference(12d);
@@ -740,7 +740,7 @@ class ForecastWindServiceTest extends Specification implements ManagerContainerT
when: "an asset is added with includeForecastWindService set to true but no location"
def newWindAsset3 = new ElectricityProducerWindAsset("WindAsset3")
newWindAsset3.setParentId(managerTestSetup.electricityOptimisationAssetId)
- newWindAsset3.setRealm(managerTestSetup.realmEnergyTenant)
+ newWindAsset3.setRealm(managerTestSetup.realmEnergyName)
newWindAsset3.setWindSpeedMax(18d);
newWindAsset3.setWindSpeedMin(2d);
newWindAsset3.setWindSpeedReference(12d);
diff --git a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
index bd5cb0516..292adfa7c 100644
--- a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
@@ -38,7 +38,7 @@ import org.openremote.model.gateway.GatewayClientResource
import org.openremote.model.gateway.GatewayConnection
import org.openremote.model.geo.GeoJSONPoint
import org.openremote.model.query.AssetQuery
-import org.openremote.model.query.filter.TenantPredicate
+import org.openremote.model.query.filter.RealmPredicate
import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
@@ -83,11 +83,11 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
when: "a gateway is provisioned in this manager"
GatewayAsset gateway = assetStorageService.merge(new GatewayAsset("Test gateway")
- .setRealm(managerTestSetup.realmBuildingTenant))
+ .setRealm(managerTestSetup.realmBuildingName))
then: "a keycloak client should have been created for this gateway"
conditions.eventually {
- def client = identityProvider.getClient(managerTestSetup.realmBuildingTenant, getGatewayClientId(gateway.getId()))
+ def client = identityProvider.getClient(managerTestSetup.realmBuildingName, getGatewayClientId(gateway.getId()))
assert client != null
}
@@ -107,9 +107,9 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
when: "the Gateway client is created"
def gatewayClient = new WebsocketIOClient<String>(
- new URIBuilder("ws://127.0.0.1:$serverPort/websocket/events?Realm=$managerTestSetup.realmBuildingTenant").build(),
+ new URIBuilder("ws://127.0.0.1:$serverPort/websocket/events?Realm=$managerTestSetup.realmBuildingName").build(),
null,
- new OAuthClientCredentialsGrant("http://127.0.0.1:$serverPort/auth/realms/$managerTestSetup.realmBuildingTenant/protocol/openid-connect/token",
+ new OAuthClientCredentialsGrant("http://127.0.0.1:$serverPort/auth/realms/$managerTestSetup.realmBuildingName/protocol/openid-connect/token",
gateway.getClientId().orElse(""),
gateway.getClientSecret().orElse(""),
null).setBasicAuthHeader(true))
@@ -268,35 +268,35 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
assert syncedAssets.stream().filter{syncedAsset -> sendAssets.stream().anyMatch{mapAssetId(gateway.getId(), it.id, false) == syncedAsset.id}}.count() == sendAssets.size()
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == agentAssetIds[0]}.getName() == "Test Agent 1"
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == agentAssetIds[0]}.getType() == HTTPAgent.DESCRIPTOR.name
- assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == agentAssetIds[0]}.getRealm() == managerTestSetup.realmBuildingTenant
+ assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == agentAssetIds[0]}.getRealm() == managerTestSetup.realmBuildingName
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == agentAssetIds[0]}.getParentId() == gateway.getId()
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == agentAssetIds[4]}.getName() == "Test Agent 5"
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == agentAssetIds[4]}.getType() == HTTPAgent.DESCRIPTOR.name
- assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == agentAssetIds[4]}.getRealm() == managerTestSetup.realmBuildingTenant
+ assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == agentAssetIds[4]}.getRealm() == managerTestSetup.realmBuildingName
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == agentAssetIds[4]}.getParentId() == gateway.getId()
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[0]}.getName() == "Test Building 1"
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[0]}.getType() == BuildingAsset.DESCRIPTOR.name
- assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[0]}.getRealm() == managerTestSetup.realmBuildingTenant
+ assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[0]}.getRealm() == managerTestSetup.realmBuildingName
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[0]}.getParentId() == gateway.getId()
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[0]}.getLocation().get().x == 10
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[0]}.getLocation().get().y == 11
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[0]}.getAttribute(Asset.LOCATION).flatMap{it.getMetaItem(ACCESS_PUBLIC_READ)}.isPresent()
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[1]}.getName() == "Test Building 1 Room 1"
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[1]}.getType() == RoomAsset.DESCRIPTOR.getName()
- assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[1]}.getRealm() == managerTestSetup.realmBuildingTenant
+ assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[1]}.getRealm() == managerTestSetup.realmBuildingName
assert mapAssetId(gateway.getId(), syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[1]}.getParentId(), true) == assetIds[0]
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[1]}.getAttribute("temp").map{it.hasMeta(AGENT_LINK)}.orElse(false)
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[1]}.getAttribute("tempSetpoint").map{it.hasMeta(AGENT_LINK)}.orElse(false)
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[5]}.getName() == "Test Building 2"
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[5]}.getType() == BuildingAsset.DESCRIPTOR.getName()
- assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[5]}.getRealm() == managerTestSetup.realmBuildingTenant
+ assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[5]}.getRealm() == managerTestSetup.realmBuildingName
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[5]}.getParentId() == gateway.getId()
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[5]}.getLocation().get().x == 10
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[5]}.getLocation().get().y == 11
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[5]}.getAttribute(Asset.LOCATION).flatMap{it.getMetaItem(ACCESS_PUBLIC_READ)}.isPresent()
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[6]}.getName() == "Test Building 2 Room 1"
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[6]}.getType() == RoomAsset.DESCRIPTOR.getName()
- assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[6]}.getRealm() == managerTestSetup.realmBuildingTenant
+ assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[6]}.getRealm() == managerTestSetup.realmBuildingName
assert mapAssetId(gateway.getId(), syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[6]}.getParentId(), true) == assetIds[5]
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[6]}.getAttribute("temp").map{it.hasMeta(AGENT_LINK)}.orElse(false)
assert syncedAssets.find {mapAssetId(gateway.getId(), it.id, true) == assetIds[6]}.getAttribute("tempSetpoint").map{it.hasMeta(AGENT_LINK)}.orElse(false)
@@ -402,7 +402,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
assert localBuilding1Room5Asset != null
assert localBuilding1Room5Asset.getName() == "Test Building 1 Room 5"
assert localBuilding1Room5Asset.getType() == RoomAsset.DESCRIPTOR.getName()
- assert localBuilding1Room5Asset.getRealm() == managerTestSetup.realmBuildingTenant
+ assert localBuilding1Room5Asset.getRealm() == managerTestSetup.realmBuildingName
assert localBuilding1Room5Asset.getParentId() == mapAssetId(gateway.id, assetIds[0], false)
assert localBuilding1Room5Asset.getAttributes().size() == 6
}
@@ -426,7 +426,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
assert localBuilding1Room5Asset.getVersion() == 1
assert localBuilding1Room5Asset.getName() == "Test Building 1 Room 5 Updated"
assert localBuilding1Room5Asset.getType() == RoomAsset.DESCRIPTOR.getName()
- assert localBuilding1Room5Asset.getRealm() == managerTestSetup.realmBuildingTenant
+ assert localBuilding1Room5Asset.getRealm() == managerTestSetup.realmBuildingName
assert localBuilding1Room5Asset.getParentId() == mapAssetId(gateway.id, assetIds[0], false)
assert localBuilding1Room5Asset.getAttributes().size() == 7
assert localBuilding1Room5Asset.getAttribute("co2Level", Integer.class).flatMap{it.getValue()}.orElse(0i) == 500i
@@ -488,7 +488,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
assert localBuilding1Room5Asset.getVersion() == 2
assert localBuilding1Room5Asset.getName() == "Test Building 1 Room 5"
assert localBuilding1Room5Asset.getType() == RoomAsset.DESCRIPTOR.getName()
- assert localBuilding1Room5Asset.getRealm() == managerTestSetup.realmBuildingTenant
+ assert localBuilding1Room5Asset.getRealm() == managerTestSetup.realmBuildingName
assert localBuilding1Room5Asset.getParentId() == mapAssetId(gateway.id, assetIds[0], false)
assert localBuilding1Room5Asset.getAttributes().size() == 6
assert localBuilding1Room5Asset.version == version
@@ -546,7 +546,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
.setId(UniqueIdentifierGenerator.generateId("Failed asset"))
.setCreatedOn(Date.from(timerService.getNow()))
.setParentId(gateway.id)
- .setRealm(managerTestSetup.realmBuildingTenant)
+ .setRealm(managerTestSetup.realmBuildingName)
failedAsset.path = (String[])[UniqueIdentifierGenerator.generateId("Failed asset")].toArray(new String[0])
failedAsset.addOrReplaceAttributes(
new Attribute<>(Asset.LOCATION, new GeoJSONPoint(10,11)).addMeta(
@@ -593,9 +593,9 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
when: "the gateway client reconnects with the new secret"
gatewayClient = new WebsocketIOClient<String>(
- new URIBuilder("ws://127.0.0.1:$serverPort/websocket/events?Realm=$managerTestSetup.realmBuildingTenant").build(),
+ new URIBuilder("ws://127.0.0.1:$serverPort/websocket/events?Realm=$managerTestSetup.realmBuildingName").build(),
null,
- new OAuthClientCredentialsGrant("http://127.0.0.1:$serverPort/auth/realms/$managerTestSetup.realmBuildingTenant/protocol/openid-connect/token",
+ new OAuthClientCredentialsGrant("http://127.0.0.1:$serverPort/auth/realms/$managerTestSetup.realmBuildingName/protocol/openid-connect/token",
gateway.getClientId().orElse(""),
gateway.getClientSecret().orElse(""),
null).setBasicAuthHeader(true))
@@ -736,7 +736,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
then: "the keycloak client should also be removed"
assert deleted
conditions.eventually {
- assert identityProvider.getClient(managerTestSetup.realmBuildingTenant, getGatewayClientId(gateway.getId())) == null
+ assert identityProvider.getClient(managerTestSetup.realmBuildingName, getGatewayClientId(gateway.getId())) == null
}
cleanup: "cleanup the gateway client"
@@ -778,7 +778,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
}
when: "a gateway is provisioned in this manager in the building realm"
- GatewayAsset gateway = assetStorageService.merge(new GatewayAsset("Test gateway").setRealm(managerTestSetup.realmBuildingTenant))
+ GatewayAsset gateway = assetStorageService.merge(new GatewayAsset("Test gateway").setRealm(managerTestSetup.realmBuildingName))
then: "a set of credentials should have been created for this gateway and be stored against the gateway for easy reference"
conditions.eventually {
@@ -797,17 +797,17 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
def gatewayConnection = new GatewayConnection(
"127.0.0.1",
serverPort,
- managerTestSetup.realmBuildingTenant,
+ managerTestSetup.realmBuildingName,
gateway.getAttribute("clientId", String.class).flatMap{it.getValue()}.orElse(""),
gateway.getAttribute("clientSecret", String.class).flatMap{it.getValue()}.orElse(""),
false,
false
)
- gatewayClientResource.setConnection(null, managerTestSetup.realmCityTenant, gatewayConnection)
+ gatewayClientResource.setConnection(null, managerTestSetup.realmCityName, gatewayConnection)
then: "the gateway client should become connected"
conditions.eventually {
- assert gatewayClientService.clientRealmMap.get(managerTestSetup.realmCityTenant) != null
+ assert gatewayClientService.clientRealmMap.get(managerTestSetup.realmCityName) != null
}
and: "the gateway asset connection status should become CONNECTED"
@@ -819,7 +819,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
and: "the assets should have been created under the gateway asset"
conditions.eventually {
def gatewayAssets = assetStorageService.findAll(new AssetQuery().parents(gateway.id).recursive(true))
- def cityAssets = assetStorageService.findAll(new AssetQuery().tenant(new TenantPredicate(managerTestSetup.realmCityTenant)))
+ def cityAssets = assetStorageService.findAll(new AssetQuery().realm(new RealmPredicate(managerTestSetup.realmCityName)))
assert gatewayAssets.size() == cityAssets.size()
}
@@ -842,7 +842,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
when: "a gateway client asset is added"
MicrophoneAsset microphone2 = new MicrophoneAsset("Microphone 2")
- .setRealm(managerTestSetup.realmCityTenant)
+ .setRealm(managerTestSetup.realmCityName)
.setParentId(managerTestSetup.area1Id)
.addAttributes(
new Attribute<>("test", TEXT, "testValue")
@@ -862,7 +862,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
def microphone3 = ValueUtil.clone(microphone1)
.setName("Microphone 3")
.setId(null)
- .setRealm(managerTestSetup.realmBuildingTenant)
+ .setRealm(managerTestSetup.realmBuildingName)
.setParentId(mapAssetId(gateway.id, managerTestSetup.area1Id, false))
microphone3 = assetStorageService.merge(microphone3)
diff --git a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy
index 273fe3270..5309deedf 100644
--- a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy
@@ -51,7 +51,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
def clientEventService = container.getService(ClientEventService.class)
def agentService = container.getService(AgentService.class)
def mqttClientId = UniqueIdentifierGenerator.generateId()
- def username = keycloakTestSetup.tenantBuilding.realm + ":" + keycloakTestSetup.serviceUser.username // realm and OAuth client id
+ def username = keycloakTestSetup.realmBuilding.name + ":" + keycloakTestSetup.serviceUser.username // realm and OAuth client id
def password = keycloakTestSetup.serviceUser.secret
def mqttHost = getString(container.getConfig(), MQTT_SERVER_LISTEN_HOST, BrokerConstants.HOST)
@@ -80,7 +80,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
}
when: "a mqtt client subscribes to an asset in another realm"
- def topic = "${keycloakTestSetup.tenantCity.realm}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.thingId".toString()
+ def topic = "${keycloakTestSetup.realmCity.name}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.thingId".toString()
client.addMessageConsumer(topic, {msg -> })
then: "No subscription should exist"
@@ -90,7 +90,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
}
when: "a mqtt client subscribes with clientId missing"
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.apartment1HallwayId".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.apartment1HallwayId".toString()
client.addMessageConsumer(topic, {msg ->})
then: "No subscription should exist"
@@ -101,7 +101,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
when: "a mqtt client subscribes with different clientId"
def newClientId = UniqueIdentifierGenerator.generateId()
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$newClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.apartment1HallwayId".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$newClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.apartment1HallwayId".toString()
client.addMessageConsumer(topic, {msg ->})
then: "No subscription should exist"
@@ -112,7 +112,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
}
when: "a mqtt client subscribes to all attributes of an asset"
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.apartment1HallwayId".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.apartment1HallwayId".toString()
Consumer<MQTTMessage<String>> eventConsumer = { msg ->
def event = ValueUtil.parse(msg.payload, SharedEvent.class)
receivedEvents.add(event.get())
@@ -157,7 +157,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
receivedEvents.clear()
when: "a mqtt client publishes to an asset attribute which is readonly"
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_WRITE_TOPIC".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_WRITE_TOPIC".toString()
def payload = ValueUtil.asJSON(new AttributeEvent(managerTestSetup.apartment1HallwayId, "motionSensor", 70)).get()
client.sendMessage(new MQTTMessage<String>(topic, payload))
@@ -190,7 +190,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
receivedEvents.clear()
when: "a mqtt client publishes to an asset attribute value which is not readonly"
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_VALUE_WRITE_TOPIC/lights/$managerTestSetup.apartment1HallwayId".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_VALUE_WRITE_TOPIC/lights/$managerTestSetup.apartment1HallwayId".toString()
payload = ValueUtil.asJSON(true).orElse(null)
client.sendMessage(new MQTTMessage<String>(topic, payload))
@@ -207,7 +207,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
receivedEvents.clear()
when: "a mqtt client unsubscribes from an asset"
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.apartment1HallwayId".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.apartment1HallwayId".toString()
client.removeMessageConsumer(topic, eventConsumer)
then: "No subscription should exist"
@@ -226,7 +226,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
}
when: "a mqtt client subscribes to a specific asset attribute"
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/motionSensor/$managerTestSetup.apartment1HallwayId".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/motionSensor/$managerTestSetup.apartment1HallwayId".toString()
client.addMessageConsumer(topic, eventConsumer)
then: "the subscription should be created"
@@ -270,7 +270,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
}
when: "a mqtt client subscribes to attributes for descendants of an asset"
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.apartment1HallwayId/$MQTTHandler.TOKEN_MULTI_LEVEL_WILDCARD".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD/$managerTestSetup.apartment1HallwayId/$MQTTHandler.TOKEN_MULTI_LEVEL_WILDCARD".toString()
client.addMessageConsumer(topic, eventConsumer)
then: "a subscription should exist"
@@ -296,7 +296,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
receivedEvents.clear()
when: "a mqtt client subscribes to an asset attribute value"
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_VALUE_TOPIC/motionSensor/$managerTestSetup.apartment1HallwayId".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$mqttClientId/$DefaultMQTTHandler.ATTRIBUTE_VALUE_TOPIC/motionSensor/$managerTestSetup.apartment1HallwayId".toString()
Consumer<MQTTMessage<String>> valueConsumer = { msg ->
receivedValues.add(msg.payload)
}
@@ -372,7 +372,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
}
when: "a mqtt client subscribes to assets that are direct children of the realm"
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$mqttClientId/$DefaultMQTTHandler.ASSET_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$mqttClientId/$DefaultMQTTHandler.ASSET_TOPIC/$MQTTHandler.TOKEN_SINGLE_LEVEL_WILDCARD".toString()
client.addMessageConsumer(topic, eventConsumer)
then: "A subscription should exist"
@@ -397,7 +397,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
receivedEvents.clear()
when: "the client subscribes to descendant assets of a specific asset"
- topic = "${keycloakTestSetup.tenantBuilding.realm}/$mqttClientId/$DefaultMQTTHandler.ASSET_TOPIC/$managerTestSetup.apartment1Id/$MQTTHandler.TOKEN_MULTI_LEVEL_WILDCARD".toString()
+ topic = "${keycloakTestSetup.realmBuilding.name}/$mqttClientId/$DefaultMQTTHandler.ASSET_TOPIC/$managerTestSetup.apartment1Id/$MQTTHandler.TOKEN_MULTI_LEVEL_WILDCARD".toString()
client.addMessageConsumer(topic, eventConsumer)
then: "the subscription should exist"
@@ -410,7 +410,7 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
when: "an asset is added as a descendant to the subscribed asset"
def childAsset = new ThingAsset("child")
.setParentId(managerTestSetup.apartment1LivingroomId)
- .setRealm(managerTestSetup.realmBuildingTenant);
+ .setRealm(managerTestSetup.realmBuildingName);
childAsset = assetStorageService.merge(childAsset);
then: "another event should be sent"
diff --git a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
index ce4939c86..e8e1f16b8 100644
--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
@@ -19,7 +19,7 @@ import org.openremote.model.console.ConsoleRegistration
import org.openremote.model.console.ConsoleResource
import org.openremote.model.notification.*
import org.openremote.model.query.UserQuery
-import org.openremote.model.query.filter.TenantPredicate
+import org.openremote.model.query.filter.RealmPredicate
import org.openremote.model.util.TextUtil
import org.openremote.test.ManagerContainerTrait
import org.openremote.test.setup.KeycloakTestSetup
@@ -79,7 +79,7 @@ class NotificationTest extends Specification implements ManagerContainerTrait {
notificationService.notificationHandlerMap.put(pushNotificationHandler.getTypeName(), mockPushNotificationHandler)
and: "an authenticated test user"
- def realm = keycloakTestSetup.tenantBuilding.realm
+ def realm = keycloakTestSetup.realmBuilding.name
def testuser1AccessToken = authenticate(
container,
MASTER_REALM,
@@ -126,7 +126,7 @@ class NotificationTest extends Specification implements ManagerContainerTrait {
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), keycloakTestSetup.tenantBuilding.realm).proxy(NotificationResource.class)
+ def anonymousNotificationResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name).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)
@@ -177,7 +177,7 @@ class NotificationTest extends Specification implements ManagerContainerTrait {
anonymousConsole.id != null
when: "the admin user sends a push notification to an entire realm"
- notification.targets = [new Notification.Target(Notification.TargetType.TENANT, keycloakTestSetup.tenantBuilding.realm)]
+ notification.targets = [new Notification.Target(Notification.TargetType.REALM, keycloakTestSetup.realmBuilding.name)]
adminNotificationResource.sendNotification(null, notification)
then: "all consoles in that realm should have been sent a notification (excluding testuser2 as they have disabled push notifications)"
@@ -576,19 +576,19 @@ class NotificationTest extends Specification implements ManagerContainerTrait {
expect: "the demo users to be created"
conditions.eventually {
- def users = identityService.getIdentityProvider().queryUsers(new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm)).select(new UserQuery.Select().excludeServiceUsers(true)))
+ def users = identityService.getIdentityProvider().queryUsers(new UserQuery().realm(new RealmPredicate(keycloakTestSetup.realmBuilding.name)).select(new UserQuery.Select().excludeServiceUsers(true)))
assert users.size() == 3
assert users.count { !TextUtil.isNullOrEmpty(it.email)} == 3
}
- when: "an email notification is sent to a tenant through same mechanism as rules"
+ when: "an email notification is sent to a realm through same mechanism as rules"
def notification = new Notification(
"Test",
new EmailNotificationMessage().setSubject("Test").setText("Hello world!"),
- Collections.singletonList(new Notification.Target(Notification.TargetType.TENANT, managerTestSetup.realmBuildingTenant)), null, null)
- notificationService.sendNotification(notification, Notification.Source.TENANT_RULESET, managerTestSetup.realmBuildingTenant)
+ Collections.singletonList(new Notification.Target(Notification.TargetType.REALM, managerTestSetup.realmBuildingName)), null, null)
+ notificationService.sendNotification(notification, Notification.Source.REALM_RULESET, managerTestSetup.realmBuildingName)
- then: "the email should have been sent to the tenant users"
+ then: "the email should have been sent to the realm users"
conditions.eventually {
assert sentEmails.size() == 2
assert sentEmails.every {it.getPlainText() == "Hello world!"}
diff --git a/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy
index ead055e62..9e95c5cf7 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy
@@ -78,7 +78,7 @@ class MQTTClientProtocolTest extends Specification implements ManagerContainerTr
.setClientId(clientId)
.setHost(mqttHost)
.setPort(mqttPort)
- .setUsernamePassword(new UsernamePassword(keycloakTestSetup.tenantBuilding.realm + ":" + keycloakTestSetup.serviceUser.username, keycloakTestSetup.serviceUser.secret))
+ .setUsernamePassword(new UsernamePassword(keycloakTestSetup.realmBuilding.name + ":" + keycloakTestSetup.serviceUser.username, keycloakTestSetup.serviceUser.secret))
and: "the agent is added to the asset service"
agent = assetStorageService.merge(agent)
@@ -97,8 +97,8 @@ class MQTTClientProtocolTest extends Specification implements ManagerContainerTr
new Attribute<>("readWriteTargetTemp", NUMBER)
.addMeta(
new MetaItem<>(AGENT_LINK, new MQTTAgentLink(agent.id)
- .setSubscriptionTopic("${keycloakTestSetup.tenantBuilding.realm}/$clientId/attributevalue/targetTemperature/${managerTestSetup.apartment1LivingroomId}")
- .setPublishTopic("${keycloakTestSetup.tenantBuilding.realm}/$clientId/attributevalue/targetTemperature/${managerTestSetup.apartment1LivingroomId}")
+ .setSubscriptionTopic("${keycloakTestSetup.realmBuilding.name}/$clientId/attributevalue/targetTemperature/${managerTestSetup.apartment1LivingroomId}")
+ .setPublishTopic("${keycloakTestSetup.realmBuilding.name}/$clientId/attributevalue/targetTemperature/${managerTestSetup.apartment1LivingroomId}")
.setWriteValue("${Protocol.DYNAMIC_VALUE_PLACEHOLDER}")
))
)
diff --git a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy
index dbdf94932..bc9cb0585 100644
--- a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy
@@ -49,7 +49,7 @@ import org.openremote.model.attribute.MetaItem
import org.openremote.model.event.shared.SharedEvent
import org.openremote.model.provisioning.*
import org.openremote.model.security.ClientRole
-import org.openremote.model.security.Tenant
+import org.openremote.model.security.Realm
import org.openremote.model.security.User
import org.openremote.model.util.ValueUtil
import org.openremote.model.value.MetaItemType
@@ -90,15 +90,15 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta
def mqttPort = getInteger(container.getConfig(), MQTT_SERVER_LISTEN_PORT, BrokerConstants.PORT)
and: "a realm is created with some custom realm roles"
- def tenant = new Tenant()
- tenant.setRealm("test")
- tenant.setDisplayName("Test")
- tenant.setEnabled(true);
- tenant.setDuplicateEmailsAllowed(true);
- tenant.setRememberMe(true)
- tenant = identityService.getIdentityProvider().createTenant(tenant)
+ def realm = new Realm()
+ realm.setName("test")
+ realm.setDisplayName("Test")
+ realm.setEnabled(true);
+ realm.setDuplicateEmailsAllowed(true);
+ realm.setRememberMe(true)
+ realm = identityService.getIdentityProvider().createRealm(realm)
(identityService.getIdentityProvider() as KeycloakIdentityProvider).getRealms(realmsResource -> {
- RealmResource realmResource = realmsResource.realm(tenant.getRealm())
+ RealmResource realmResource = realmsResource.realm(realm.getName())
realmResource.roles().create(new RoleRepresentation("installer", "Installer", false))
realmResource.roles().create(new RoleRepresentation("home-owner", "Home owner", false))
})
@@ -189,7 +189,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta
conditions.eventually {
assert device1Responses.size() == 1
assert device1Responses.get(0) instanceof SuccessResponseMessage
- assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingTenant
+ assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingName
def weatherAsset = ((SuccessResponseMessage)device1Responses.get(0)).asset
assert weatherAsset != null
assert weatherAsset instanceof WeatherAsset
@@ -226,7 +226,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta
conditions.eventually {
assert device1Responses.size() == 1
assert device1Responses.get(0) instanceof SuccessResponseMessage
- assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingTenant
+ assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingName
def weatherAsset = ((SuccessResponseMessage)device1Responses.get(0)).asset
assert weatherAsset != null
assert weatherAsset instanceof WeatherAsset
@@ -351,7 +351,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta
conditions.eventually {
assert device1Responses.size() == 1
assert device1Responses.get(0) instanceof SuccessResponseMessage
- assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingTenant
+ assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingName
asset = ((SuccessResponseMessage)device1Responses.get(0)).asset
assert asset != null
assert asset instanceof WeatherAsset
@@ -513,7 +513,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta
conditions.eventually {
assert deviceNResponses.size() == 1
assert deviceNResponses.get(0) instanceof SuccessResponseMessage
- assert ((SuccessResponseMessage)deviceNResponses.get(0)).realm == managerTestSetup.realmBuildingTenant
+ assert ((SuccessResponseMessage)deviceNResponses.get(0)).realm == managerTestSetup.realmBuildingName
asset = ((SuccessResponseMessage)deviceNResponses.get(0)).asset
assert asset != null
assert asset instanceof WeatherAsset
@@ -622,7 +622,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta
conditions.eventually {
assert device1Responses.size() == 1
assert device1Responses.get(0) instanceof SuccessResponseMessage
- assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingTenant
+ assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingName
asset = ((SuccessResponseMessage)device1Responses.get(0)).asset
assert asset != null
assert asset instanceof WeatherAsset
@@ -631,12 +631,12 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta
when: "a connected device user is disabled and an un-connected device user is disabled"
existingConnection = mqttBrokerService.clientIdConnectionMap.get(mqttDevice1ClientId)
- def device1User = identityService.getIdentityProvider().getUserByUsername(managerTestSetup.realmBuildingTenant, User.SERVICE_ACCOUNT_PREFIX + PROVISIONING_USER_PREFIX + device1UniqueId)
- def deviceNUser = identityService.getIdentityProvider().getUserByUsername(managerTestSetup.realmBuildingTenant, User.SERVICE_ACCOUNT_PREFIX + PROVISIONING_USER_PREFIX + deviceNUniqueId)
+ def device1User = identityService.getIdentityProvider().getUserByUsername(managerTestSetup.realmBuildingName, User.SERVICE_ACCOUNT_PREFIX + PROVISIONING_USER_PREFIX + device1UniqueId)
+ def deviceNUser = identityService.getIdentityProvider().getUserByUsername(managerTestSetup.realmBuildingName, User.SERVICE_ACCOUNT_PREFIX + PROVISIONING_USER_PREFIX + deviceNUniqueId)
device1User.setEnabled(false)
deviceNUser.setEnabled(false)
- device1User = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingTenant, device1User, null)
- deviceNUser = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingTenant, deviceNUser, null)
+ device1User = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingName, device1User, null)
+ deviceNUser = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingName, deviceNUser, null)
then: "already connected client that was authenticated should be disconnected, then reconnect"
conditions.eventually {
@@ -698,7 +698,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta
existingConnection = mqttBrokerService.clientIdConnectionMap.get(mqttDevice1ClientId)
def existingNConnection = mqttBrokerService.clientIdConnectionMap.get(mqttDeviceNClientId)
device1User.setEnabled(true)
- device1User = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingTenant, device1User, null)
+ device1User = identityService.getIdentityProvider().createUpdateUser(managerTestSetup.realmBuildingName, device1User, null)
and: "the re-enabled client device publishes its' valid client certificate"
device1Responses.clear()
@@ -712,7 +712,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta
conditions.eventually {
assert device1Responses.size() == 1
assert device1Responses.get(0) instanceof SuccessResponseMessage
- assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingTenant
+ assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingName
asset = ((SuccessResponseMessage)device1Responses.get(0)).asset
assert asset != null
assert asset instanceof WeatherAsset
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
index a7c1908d1..396ed17e8 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
@@ -12,7 +12,7 @@ import org.openremote.model.attribute.MetaItem
import org.openremote.model.rules.AssetRuleset
import org.openremote.model.rules.GlobalRuleset
import org.openremote.model.rules.Ruleset
-import org.openremote.model.rules.TenantRuleset
+import org.openremote.model.rules.RealmRuleset
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -73,71 +73,71 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
assert rulesService.globalEngine.deployments.values().any({ it.name == "Some more global rules" && it.status == DEPLOYED})
}
- when: "a new tenant rule definition is added to Building"
- ruleset = new TenantRuleset(
- keycloakTestSetup.tenantBuilding.realm,
- "Some more building tenant rules",
+ when: "a new realm rule definition is added to Building"
+ ruleset = new RealmRuleset(
+ keycloakTestSetup.realmBuilding.name,
+ "Some more building realm rules",
GROOVY,
getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy").text)
rulesetStorageService.merge(ruleset)
then: "Building rules engine should load this definition and restart successfully"
conditions.eventually {
- def tenantBuildingEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm)
- assert tenantBuildingEngine != null
- assert tenantBuildingEngine.isRunning()
- assert tenantBuildingEngine.deployments.size() == 2
- assert tenantBuildingEngine.deployments.values().any({ it.name == "Some building tenant demo rules" && it.status == DEPLOYED})
- assert tenantBuildingEngine.deployments.values().any({ it.name == "Some more building tenant rules" && it.status == DEPLOYED})
+ def realmBuildingEngine = rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name)
+ assert realmBuildingEngine != null
+ assert realmBuildingEngine.isRunning()
+ assert realmBuildingEngine.deployments.size() == 2
+ assert realmBuildingEngine.deployments.values().any({ it.name == "Some building realm demo rules" && it.status == DEPLOYED})
+ assert realmBuildingEngine.deployments.values().any({ it.name == "Some more building realm rules" && it.status == DEPLOYED})
}
- when: "a new tenant rule definition is added to City"
- ruleset = new TenantRuleset(
- keycloakTestSetup.tenantCity.realm,
- "Some more smartcity tenant rules",
+ when: "a new realm rule definition is added to City"
+ ruleset = new RealmRuleset(
+ keycloakTestSetup.realmCity.name,
+ "Some more smartcity realm rules",
GROOVY,
getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy").text)
rulesetStorageService.merge(ruleset)
- then: "a tenant rules engine should be created for City and load this definition and start successfully"
+ then: "a realm rules engine should be created for City and load this definition and start successfully"
conditions.eventually {
- def tenantCity = rulesService.tenantEngines.get(keycloakTestSetup.tenantCity.realm)
- assert rulesService.tenantEngines.size() == 3
- assert tenantCity != null
- assert tenantCity.isRunning()
- assert tenantCity.deployments.size() == 1
- assert tenantCity.deployments.values().any({ it.name == "Some more smartcity tenant rules" && it.status == DEPLOYED})
+ def realmCity = rulesService.realmEngines.get(keycloakTestSetup.realmCity.name)
+ assert rulesService.realmEngines.size() == 3
+ assert realmCity != null
+ assert realmCity.isRunning()
+ assert realmCity.deployments.size() == 1
+ assert realmCity.deployments.values().any({ it.name == "Some more smartcity realm rules" && it.status == DEPLOYED})
}
- when: "the disabled rule definition for Tenant B is enabled"
- ruleset = rulesetStorageService.find(TenantRuleset.class, rulesImport.tenantCityRulesetId)
+ when: "the disabled rule definition for Realm B is enabled"
+ ruleset = rulesetStorageService.find(RealmRuleset.class, rulesImport.realmCityRulesetId)
ruleset.setEnabled(true)
rulesetStorageService.merge(ruleset)
then: "City rule engine should load this definition and restart successfully"
conditions.eventually {
- def tenantCity = rulesService.tenantEngines.get(keycloakTestSetup.tenantCity.realm)
- assert rulesService.tenantEngines.size() == 3
- assert tenantCity != null
- assert tenantCity.isRunning()
- assert tenantCity.deployments.size() == 2
- assert tenantCity.deployments.values().any({ it.name == "Some more smartcity tenant rules" && it.status == DEPLOYED})
- assert tenantCity.deployments.values().any({ it.name == "Some smartcity tenant demo rules" && it.status == DEPLOYED})
+ def realmCity = rulesService.realmEngines.get(keycloakTestSetup.realmCity.name)
+ assert rulesService.realmEngines.size() == 3
+ assert realmCity != null
+ assert realmCity.isRunning()
+ assert realmCity.deployments.size() == 2
+ assert realmCity.deployments.values().any({ it.name == "Some more smartcity realm rules" && it.status == DEPLOYED})
+ assert realmCity.deployments.values().any({ it.name == "Some smartcity realm demo rules" && it.status == DEPLOYED})
}
when: "the enabled rule definition for City is disabled"
// TODO: Stop instances of rule definitions being passed around as rules engine nulls the rules property
- ruleset = rulesetStorageService.find(TenantRuleset.class, rulesImport.tenantCityRulesetId)
+ ruleset = rulesetStorageService.find(RealmRuleset.class, rulesImport.realmCityRulesetId)
ruleset.setEnabled(false)
rulesetStorageService.merge(ruleset)
then: "City rule engine should remove it again"
conditions.eventually {
- def tenantCity = rulesService.tenantEngines.get(keycloakTestSetup.tenantCity.realm)
- assert tenantCity != null
- assert tenantCity.isRunning()
- assert tenantCity.deployments.size() == 1
- assert tenantCity.deployments.values().any({ it.name == "Some more smartcity tenant rules" && it.status == DEPLOYED})
+ def realmCity = rulesService.realmEngines.get(keycloakTestSetup.realmCity.name)
+ assert realmCity != null
+ assert realmCity.isRunning()
+ assert realmCity.deployments.size() == 1
+ assert realmCity.deployments.values().any({ it.name == "Some more smartcity realm rules" && it.status == DEPLOYED})
}
when: "the asset rule definition for apartment 2 is deleted"
@@ -183,18 +183,18 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
assert rulesService.globalEngine.deployments.values().any({ it.name == "Some more global rules" && it.status == DEPLOYED })
}
- when: "a tenant is disabled"
- def tenantBuildingEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm)
+ when: "a realm is disabled"
+ def realmBuildingEngine = rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name)
def apartment3Engine = rulesService.assetEngines.get(managerTestSetup.apartment3Id)
- def tenantBuildingTenant = keycloakTestSetup.tenantBuilding
- tenantBuildingTenant.setEnabled(false)
- identityService.getIdentityProvider().updateTenant(tenantBuildingTenant)
+ def realmBuilding = keycloakTestSetup.realmBuilding
+ realmBuilding.setEnabled(false)
+ identityService.getIdentityProvider().updateRealm(realmBuilding)
- then: "the tenants rule engine should stop and all asset rule engines in this realm should also stop"
+ then: "the realms rule engine should stop and all asset rule engines in this realm should also stop"
conditions.eventually {
- assert !tenantBuildingEngine.isRunning()
- assert tenantBuildingEngine.deployments.size() == 2
- assert rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm) == null
+ assert !realmBuildingEngine.isRunning()
+ assert realmBuildingEngine.deployments.size() == 2
+ assert rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name) == null
assert !apartment3Engine.isRunning()
assert apartment3Engine.deployments.size() == 1
assert rulesService.assetEngines.get(managerTestSetup.apartment3Id) == null
@@ -202,85 +202,85 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
and: "other rule engines should be unaffected"
conditions.eventually {
- assert rulesService.tenantEngines.size() == 2
+ assert rulesService.realmEngines.size() == 2
assert rulesService.assetEngines.size() == 0
- def masterEngine = rulesService.tenantEngines.get(keycloakTestSetup.masterTenant.realm)
- def cityEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantCity.realm)
+ def masterEngine = rulesService.realmEngines.get(keycloakTestSetup.realmMaster.name)
+ def cityEngine = rulesService.realmEngines.get(keycloakTestSetup.realmCity.name)
assert masterEngine != null
assert masterEngine.isRunning()
assert cityEngine != null
assert cityEngine.isRunning()
}
- when: "the disabled tenant is re-enabled"
- tenantBuildingTenant.setEnabled(true)
- identityService.getIdentityProvider().updateTenant(tenantBuildingTenant)
+ when: "the disabled realm is re-enabled"
+ realmBuilding.setEnabled(true)
+ identityService.getIdentityProvider().updateRealm(realmBuilding)
- then: "the tenants rule engine should start and all asset rule engines from this realm should also start"
+ then: "the realms rule engine should start and all asset rule engines from this realm should also start"
conditions.eventually {
- tenantBuildingEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm)
+ realmBuildingEngine = rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name)
apartment3Engine = rulesService.assetEngines.get(managerTestSetup.apartment3Id)
- assert rulesService.tenantEngines.size() == 3
+ assert rulesService.realmEngines.size() == 3
assert rulesService.assetEngines.size() == 1
- assert tenantBuildingEngine != null
- assert tenantBuildingEngine.isRunning()
- assert tenantBuildingEngine.deployments.size() == 2
- assert tenantBuildingEngine.deployments.values().any({ it.name == "Some building tenant demo rules" && it.status == DEPLOYED})
- assert tenantBuildingEngine.deployments.values().any({ it.name == "Some more building tenant rules" && it.status == DEPLOYED})
+ assert realmBuildingEngine != null
+ assert realmBuildingEngine.isRunning()
+ assert realmBuildingEngine.deployments.size() == 2
+ assert realmBuildingEngine.deployments.values().any({ it.name == "Some building realm demo rules" && it.status == DEPLOYED})
+ assert realmBuildingEngine.deployments.values().any({ it.name == "Some more building realm rules" && it.status == DEPLOYED})
assert apartment3Engine.deployments.size() == 1
assert apartment3Engine.deployments.values().any({ it.name == "Some apartment 3 demo rules" && it.status == DEPLOYED})
}
- when: "a new tenant rule definition is added to Building"
- ruleset = new TenantRuleset(
- keycloakTestSetup.tenantBuilding.realm,
+ when: "a new realm rule definition is added to Building"
+ ruleset = new RealmRuleset(
+ keycloakTestSetup.realmBuilding.name,
"Throw Failure Exception",
GROOVY,
getClass().getResource("/org/openremote/test/failure/RulesFailureActionThrowsException.groovy").text)
ruleset.getMeta().add(new MetaItem<>(Ruleset.CONTINUE_ON_ERROR, true))
ruleset = rulesetStorageService.merge(ruleset)
- then: "the tenants A rule engine should run with one deployment as error"
+ then: "the realms A rule engine should run with one deployment as error"
conditions.eventually {
- tenantBuildingEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm)
- assert tenantBuildingEngine != null
- assert tenantBuildingEngine.isRunning()
- assert tenantBuildingEngine.deployments.size() == 3
- assert tenantBuildingEngine.deployments[ruleset.id].status == EXECUTION_ERROR
- assert !tenantBuildingEngine.isError()
+ realmBuildingEngine = rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name)
+ assert realmBuildingEngine != null
+ assert realmBuildingEngine.isRunning()
+ assert realmBuildingEngine.deployments.size() == 3
+ assert realmBuildingEngine.deployments[ruleset.id].status == EXECUTION_ERROR
+ assert !realmBuildingEngine.isError()
}
- when: "a new tenant rule definition is added to Building"
- ruleset = new TenantRuleset(
- keycloakTestSetup.tenantBuilding.realm,
+ when: "a new realm rule definition is added to Building"
+ ruleset = new RealmRuleset(
+ keycloakTestSetup.realmBuilding.name,
"Looping error",
GROOVY,
getClass().getResource("/org/openremote/test/failure/RulesFailureLoop.groovy").text)
ruleset.getMeta().add(new MetaItem<>(Ruleset.CONTINUE_ON_ERROR, true))
ruleset = rulesetStorageService.merge(ruleset)
- then: "the tenants A rule engine should have an error"
+ then: "the realms A rule engine should have an error"
conditions.eventually {
- tenantBuildingEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm)
- assert tenantBuildingEngine != null
- assert !tenantBuildingEngine.isRunning()
- assert tenantBuildingEngine.deployments.size() == 4
- assert tenantBuildingEngine.deployments[ruleset.id].status == LOOP_ERROR
- assert tenantBuildingEngine.deployments[ruleset.id].error instanceof RulesLoopException
- assert tenantBuildingEngine.deployments[ruleset.id].error.message == "Possible rules loop detected, exceeded max trigger count of " + RulesFacts.MAX_RULES_TRIGGERED_PER_EXECUTION + " for rule: Condition loops"
- assert tenantBuildingEngine.isError()
- assert tenantBuildingEngine.getError() instanceof RuntimeException
+ realmBuildingEngine = rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name)
+ assert realmBuildingEngine != null
+ assert !realmBuildingEngine.isRunning()
+ assert realmBuildingEngine.deployments.size() == 4
+ assert realmBuildingEngine.deployments[ruleset.id].status == LOOP_ERROR
+ assert realmBuildingEngine.deployments[ruleset.id].error instanceof RulesLoopException
+ assert realmBuildingEngine.deployments[ruleset.id].error.message == "Possible rules loop detected, exceeded max trigger count of " + RulesFacts.MAX_RULES_TRIGGERED_PER_EXECUTION + " for rule: Condition loops"
+ assert realmBuildingEngine.isError()
+ assert realmBuildingEngine.getError() instanceof RuntimeException
}
-//TODO: Reinstate the tenant delete test once tenant delete mechanism is finalised
-// when: "a tenant is deleted"
-// identityService.deleteTenant(accessToken, tenantBuildingTenant.getRealm())
+//TODO: Reinstate the realm delete test once realm delete mechanism is finalised
+// when: "a realm is deleted"
+// identityService.deleteRealm(accessToken, realmBuilding.getName())
//
-// then: "the tenants rule engine should stop and all asset rule engines in this realm should also stop"
+// then: "the realms rule engine should stop and all asset rule engines in this realm should also stop"
// conditions.eventually {
-// assert tenantBuildingEngine.isRunning() == false
-// assert tenantBuildingEngine.allRulesets.length == 0
-// assert rulesService.tenantEngines.get(keycloakTestSetup.tenantBuildingTenant.id) == null
+// assert realmBuildingEngine.isRunning() == false
+// assert realmBuildingEngine.allRulesets.length == 0
+// assert rulesService.realmEngines.get(keycloakTestSetup.realmBuildingRealm.id) == null
// assert smartHomeEngine.isRunning() == false
// assert smartHomeEngine.allRulesets.length == 0
// assert rulesService.assetEngines.get(managerTestSetup.smartBuildingId) == null
@@ -291,14 +291,14 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
//
// and: "other rule engines should be unaffected"
// conditions.eventually {
-// assert rulesService.tenantEngines.size() == 2
+// assert rulesService.realmEngines.size() == 2
// assert rulesService.assetEngines.size() == 0
-// def masterEngine = rulesService.tenantEngines.get(Constants.MASTER_REALM)
-// def tenantCity = rulesService.tenantEngines.get(keycloakTestSetup.tenantBTenant.id)
+// def masterEngine = rulesService.realmEngines.get(Constants.MASTER_REALM)
+// def realmCity = rulesService.realmEngines.get(keycloakTestSetup.realmBRealm.id)
// assert masterEngine != null
// assert masterEngine.isRunning()
-// assert tenantCity != null
-// assert tenantCity.isRunning()
+// assert realmCity != null
+// assert realmCity.isRunning()
// }
}
}
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy
index 268242d0c..04a901e88 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy
@@ -10,7 +10,7 @@ import org.openremote.model.attribute.MetaMap
import org.openremote.model.rules.AssetRuleset
import org.openremote.model.rules.GlobalRuleset
import org.openremote.model.rules.Ruleset
-import org.openremote.model.rules.TenantRuleset
+import org.openremote.model.rules.RealmRuleset
import static org.openremote.model.rules.Ruleset.Lang.GROOVY
import static org.openremote.model.rules.Ruleset.SHOW_ON_LIST
@@ -21,15 +21,15 @@ class BasicRulesImport {
final Long globalRulesetId
final Long globalRuleset2Id
final Long masterRulesetId
- final Long tenantBuildingRulesetId
- final Long tenantCityRulesetId
+ final Long realmBuildingRulesetId
+ final Long realmCityRulesetId
final Long apartment1RulesetId
final Long apartment2RulesetId
final Long apartment3RulesetId
RulesEngine globalEngine
RulesEngine masterEngine
- RulesEngine tenantBuildingEngine
+ RulesEngine realmBuildingEngine
RulesEngine apartment1Engine
RulesEngine apartment2Engine
RulesEngine apartment3Engine
@@ -49,27 +49,27 @@ class BasicRulesImport {
ruleset.setEnabled(false)
globalRuleset2Id = rulesetStorageService.merge(ruleset).id
- ruleset = new TenantRuleset(
- keycloakTestSetup.masterTenant.realm,
- "Some master tenant demo rules",
+ ruleset = new RealmRuleset(
+ keycloakTestSetup.realmMaster.name,
+ "Some master realm demo rules",
GROOVY,
getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
masterRulesetId = rulesetStorageService.merge(ruleset).id
- ruleset = new TenantRuleset(
- keycloakTestSetup.tenantBuilding.realm,
- "Some building tenant demo rules",
+ ruleset = new RealmRuleset(
+ keycloakTestSetup.realmBuilding.name,
+ "Some building realm demo rules",
GROOVY,
getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
- tenantBuildingRulesetId = rulesetStorageService.merge(ruleset).id
+ realmBuildingRulesetId = rulesetStorageService.merge(ruleset).id
- ruleset = new TenantRuleset(
- keycloakTestSetup.tenantCity.realm,
- "Some smartcity tenant demo rules",
+ ruleset = new RealmRuleset(
+ keycloakTestSetup.realmCity.name,
+ "Some smartcity realm demo rules",
GROOVY,
getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
ruleset.setEnabled(false)
- tenantCityRulesetId = rulesetStorageService.merge(ruleset).id
+ realmCityRulesetId = rulesetStorageService.merge(ruleset).id
ruleset = new AssetRuleset(
managerTestSetup.apartment1Id,
@@ -107,23 +107,23 @@ class BasicRulesImport {
assert globalEngine.deployments.size() == 1
assert globalEngine.deployments.values().any { it -> it.name == "Some global demo rules" && it.status == DEPLOYED }
- assert rulesService.tenantEngines.size() == 2
- masterEngine = rulesService.tenantEngines.get(keycloakTestSetup.masterTenant.realm)
+ assert rulesService.realmEngines.size() == 2
+ masterEngine = rulesService.realmEngines.get(keycloakTestSetup.realmMaster.name)
masterEngine.disableTemporaryFactExpiration = true
assert masterEngine != null
assert masterEngine.isRunning()
assert masterEngine.deployments.size() == 1
- assert masterEngine.deployments.values().iterator().next().name == "Some master tenant demo rules"
+ assert masterEngine.deployments.values().iterator().next().name == "Some master realm demo rules"
assert masterEngine.deployments.values().iterator().next().status == DEPLOYED
- tenantBuildingEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm)
- assert tenantBuildingEngine != null
- tenantBuildingEngine.disableTemporaryFactExpiration = true
- assert tenantBuildingEngine.isRunning()
- assert tenantBuildingEngine.deployments.size() == 1
- assert tenantBuildingEngine.deployments.values().iterator().next().name == "Some building tenant demo rules"
- assert tenantBuildingEngine.deployments.values().iterator().next().status == DEPLOYED
- def tenantCityEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantCity.realm)
- assert tenantCityEngine == null
+ realmBuildingEngine = rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name)
+ assert realmBuildingEngine != null
+ realmBuildingEngine.disableTemporaryFactExpiration = true
+ assert realmBuildingEngine.isRunning()
+ assert realmBuildingEngine.deployments.size() == 1
+ assert realmBuildingEngine.deployments.values().iterator().next().name == "Some building realm demo rules"
+ assert realmBuildingEngine.deployments.values().iterator().next().status == DEPLOYED
+ def realmCityEngine = rulesService.realmEngines.get(keycloakTestSetup.realmCity.name)
+ assert realmCityEngine == null
assert rulesService.assetEngines.size() == 2
apartment1Engine = rulesService.assetEngines.get(managerTestSetup.apartment1Id)
@@ -148,7 +148,7 @@ class BasicRulesImport {
void resetRulesFired(RulesEngine... engine) {
// Remove all named facts (those are the only ones inserted by basic test rules)
- Collection<RulesEngine> engines = [globalEngine, masterEngine, tenantBuildingEngine, apartment2Engine, apartment3Engine]
+ Collection<RulesEngine> engines = [globalEngine, masterEngine, realmBuildingEngine, apartment2Engine, apartment3Engine]
engines.addAll(engine)
engines.forEach({ e ->
e.facts.namedFacts.keySet().forEach({ factName ->
@@ -158,7 +158,7 @@ class BasicRulesImport {
}
void assertNoRulesFired(RulesEngine... engine) {
- Collection<RulesEngine> engines = [globalEngine, masterEngine, tenantBuildingEngine, apartment2Engine, apartment3Engine]
+ Collection<RulesEngine> engines = [globalEngine, masterEngine, realmBuildingEngine, apartment2Engine, apartment3Engine]
engines.addAll(engine)
engines.forEach({ e ->
assert e.facts.namedFacts.size() == 0
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy
index 5cd6ae713..b57789680 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy
@@ -15,7 +15,7 @@ import org.openremote.model.attribute.MetaItem
import org.openremote.model.rules.AssetRuleset
import org.openremote.model.rules.Ruleset
import org.openremote.model.rules.TemporaryFact
-import org.openremote.model.rules.TenantRuleset
+import org.openremote.model.rules.RealmRuleset
import org.openremote.model.value.MetaItemType
import org.openremote.model.value.ValueType
import org.openremote.test.ManagerContainerTrait
@@ -78,8 +78,8 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
assert smartHomeEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING
assertRulesFired(rulesImport.globalEngine, 1)
assertRulesFired(rulesImport.globalEngine, ["All"])
- assertRulesFired(rulesImport.tenantBuildingEngine, 1)
- assertRulesFired(rulesImport.tenantBuildingEngine, ["All"])
+ assertRulesFired(rulesImport.realmBuildingEngine, 1)
+ assertRulesFired(rulesImport.realmBuildingEngine, ["All"])
assertRulesFired(rulesImport.apartment2Engine, 1)
assertRulesFired(rulesImport.apartment2Engine, ["All"])
assertRulesFired(rulesImport.apartment3Engine, 0)
@@ -98,8 +98,8 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
conditions.eventually {
assertRulesFired(rulesImport.globalEngine, 1)
assertRulesFired(rulesImport.globalEngine, ["All"])
- assertRulesFired(rulesImport.tenantBuildingEngine, 1)
- assertRulesFired(rulesImport.tenantBuildingEngine, ["All"])
+ assertRulesFired(rulesImport.realmBuildingEngine, 1)
+ assertRulesFired(rulesImport.realmBuildingEngine, ["All"])
assertRulesFired(rulesImport.apartment2Engine, 1)
assertRulesFired(rulesImport.apartment2Engine, ["All"])
assertRulesFired(rulesImport.apartment3Engine, 0)
@@ -151,7 +151,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
conditions.eventually {
assert rulesImport.globalEngine.lastFireTimestamp > 0
assert rulesImport.masterEngine.lastFireTimestamp > 0
- assert rulesImport.tenantBuildingEngine.lastFireTimestamp > 0
+ assert rulesImport.realmBuildingEngine.lastFireTimestamp > 0
assert rulesImport.apartment2Engine.lastFireTimestamp > 0
assert rulesImport.apartment3Engine.lastFireTimestamp > 0
}
@@ -161,15 +161,15 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
assert rulesService.assetStates.size() == DEMO_RULE_STATES_GLOBAL + 1
assert rulesImport.globalEngine.assetStates.size() == DEMO_RULE_STATES_GLOBAL + 1
assert rulesImport.masterEngine.assetStates.size() == DEMO_RULE_STATES_SMART_OFFICE
- assert rulesImport.tenantBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING + 1
+ assert rulesImport.realmBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING + 1
assert rulesImport.apartment2Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_2 + 1
assert rulesImport.apartment3Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_3
assertRulesFired(rulesImport.globalEngine, 1)
assertRulesFired(rulesImport.globalEngine, ["All"])
assertRulesFired(rulesImport.masterEngine, 1)
assertRulesFired(rulesImport.masterEngine, ["All"])
- assertRulesFired(rulesImport.tenantBuildingEngine, 1)
- assertRulesFired(rulesImport.tenantBuildingEngine, ["All"])
+ assertRulesFired(rulesImport.realmBuildingEngine, 1)
+ assertRulesFired(rulesImport.realmBuildingEngine, ["All"])
assertRulesFired(rulesImport.apartment2Engine, 1)
assertRulesFired(rulesImport.apartment2Engine, ["All"])
assertRulesFired(rulesImport.apartment3Engine, 0)
@@ -186,7 +186,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
and: "an attribute event is pushed into the system for an attribute with no RULE_STATE meta"
def globalLastFireTimestamp = rulesImport.globalEngine.lastFireTimestamp
def masterLastFireTimestamp = rulesImport.masterEngine.lastFireTimestamp
- def tenantALastFireTimestamp = rulesImport.tenantBuildingEngine.lastFireTimestamp
+ def realmALastFireTimestamp = rulesImport.realmBuildingEngine.lastFireTimestamp
def apartment2LastFireTimestamp = rulesImport.apartment2Engine.lastFireTimestamp
def apartment3LastFireTimestamp = rulesImport.apartment3Engine.lastFireTimestamp
def apartment2LivingRoomWindowOpenChange = new AttributeEvent(
@@ -204,7 +204,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
conditions.eventually {
assert rulesImport.globalEngine.lastFireTimestamp == globalLastFireTimestamp
assert rulesImport.masterEngine.lastFireTimestamp == masterLastFireTimestamp
- assert rulesImport.tenantBuildingEngine.lastFireTimestamp == tenantALastFireTimestamp
+ assert rulesImport.realmBuildingEngine.lastFireTimestamp == realmALastFireTimestamp
assert rulesImport.apartment2Engine.lastFireTimestamp == apartment2LastFireTimestamp
assert rulesImport.apartment3Engine.lastFireTimestamp == apartment3LastFireTimestamp
}
@@ -215,7 +215,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
and: "the Kitchen room asset is modified to add a new attribute but RULE_STATE = true meta is not changed"
globalLastFireTimestamp = rulesImport.globalEngine.lastFireTimestamp
masterLastFireTimestamp = rulesImport.masterEngine.lastFireTimestamp
- tenantALastFireTimestamp = rulesImport.tenantBuildingEngine.lastFireTimestamp
+ realmALastFireTimestamp = rulesImport.realmBuildingEngine.lastFireTimestamp
apartment2LastFireTimestamp = rulesImport.apartment2Engine.lastFireTimestamp
apartment3LastFireTimestamp = rulesImport.apartment3Engine.lastFireTimestamp
asset.addOrReplaceAttributes(
@@ -231,7 +231,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
conditions.eventually {
assert rulesImport.globalEngine.lastFireTimestamp > globalLastFireTimestamp
assert rulesImport.masterEngine.lastFireTimestamp == masterLastFireTimestamp
- assert rulesImport.tenantBuildingEngine.lastFireTimestamp > tenantALastFireTimestamp
+ assert rulesImport.realmBuildingEngine.lastFireTimestamp > realmALastFireTimestamp
assert rulesImport.apartment2Engine.lastFireTimestamp > apartment2LastFireTimestamp
assert rulesImport.apartment3Engine.lastFireTimestamp == apartment3LastFireTimestamp
}
@@ -241,12 +241,12 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
assert rulesService.assetStates.size() == DEMO_RULE_STATES_GLOBAL + 1
assert rulesImport.globalEngine.assetStates.size() == DEMO_RULE_STATES_GLOBAL + 1
assert rulesImport.masterEngine.assetStates.size() == DEMO_RULE_STATES_SMART_OFFICE
- assert rulesImport.tenantBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING + 1
+ assert rulesImport.realmBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING + 1
assert rulesImport.apartment2Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_2 + 1
assert rulesImport.apartment3Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_3
assertRulesFired(rulesImport.globalEngine, 1)
assertRulesFired(rulesImport.masterEngine, 1)
- assertRulesFired(rulesImport.tenantBuildingEngine, 1)
+ assertRulesFired(rulesImport.realmBuildingEngine, 1)
assertRulesFired(rulesImport.apartment2Engine, 1)
assertRulesFired(rulesImport.apartment3Engine, 0)
}
@@ -267,13 +267,13 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
assert rulesService.assetStates.size() == DEMO_RULE_STATES_GLOBAL
assert rulesImport.globalEngine.assetStates.size() == DEMO_RULE_STATES_GLOBAL
assert rulesImport.masterEngine.assetStates.size() == DEMO_RULE_STATES_SMART_OFFICE
- assert rulesImport.tenantBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING
+ assert rulesImport.realmBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING
assert rulesImport.apartment2Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_2
assert rulesImport.apartment3Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_3
assertRulesFired(rulesImport.globalEngine, 1)
assertRulesFired(rulesImport.globalEngine, ["All"])
- assertRulesFired(rulesImport.tenantBuildingEngine, 1)
- assertRulesFired(rulesImport.tenantBuildingEngine, ["All"])
+ assertRulesFired(rulesImport.realmBuildingEngine, 1)
+ assertRulesFired(rulesImport.realmBuildingEngine, ["All"])
assertRulesFired(rulesImport.apartment2Engine, 1)
assertRulesFired(rulesImport.apartment2Engine, ["All"])
assertRulesFired(rulesImport.apartment3Engine, 0)
@@ -298,13 +298,13 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
assert rulesService.assetStates.size() == DEMO_RULE_STATES_GLOBAL + 2
assert rulesImport.globalEngine.assetStates.size() == DEMO_RULE_STATES_GLOBAL + 2
assert rulesImport.masterEngine.assetStates.size() == DEMO_RULE_STATES_SMART_OFFICE
- assert rulesImport.tenantBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING + 2
+ assert rulesImport.realmBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING + 2
assert rulesImport.apartment2Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_2 + 2
assert rulesImport.apartment3Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_3
assertRulesFired(rulesImport.globalEngine, 1)
assertRulesFired(rulesImport.globalEngine, ["All"])
- assertRulesFired(rulesImport.tenantBuildingEngine, 1)
- assertRulesFired(rulesImport.tenantBuildingEngine, ["All"])
+ assertRulesFired(rulesImport.realmBuildingEngine, 1)
+ assertRulesFired(rulesImport.realmBuildingEngine, ["All"])
assertRulesFired(rulesImport.apartment2Engine, 1)
assertRulesFired(rulesImport.apartment2Engine, ["All"])
assertRulesFired(rulesImport.apartment3Engine, 0)
@@ -319,13 +319,13 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
assert rulesService.assetStates.size() == DEMO_RULE_STATES_GLOBAL
assert rulesImport.globalEngine.assetStates.size() == DEMO_RULE_STATES_GLOBAL
assert rulesImport.masterEngine.assetStates.size() == DEMO_RULE_STATES_SMART_OFFICE
- assert rulesImport.tenantBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING
+ assert rulesImport.realmBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING
assert rulesImport.apartment2Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_2
assert rulesImport.apartment3Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_3
assertRulesFired(rulesImport.globalEngine, 1)
assertRulesFired(rulesImport.globalEngine, ["All"])
- assertRulesFired(rulesImport.tenantBuildingEngine, 1)
- assertRulesFired(rulesImport.tenantBuildingEngine, ["All"])
+ assertRulesFired(rulesImport.realmBuildingEngine, 1)
+ assertRulesFired(rulesImport.realmBuildingEngine, ["All"])
assertRulesFired(rulesImport.apartment2Engine, 1)
assertRulesFired(rulesImport.apartment2Engine, ["All"])
assertRulesFired(rulesImport.apartment3Engine, 0)
@@ -359,8 +359,8 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
}
when: "a broken RHS rule is loaded into the building engine"
- def ruleset = new TenantRuleset(
- keycloakTestSetup.tenantBuilding.realm,
+ def ruleset = new RealmRuleset(
+ keycloakTestSetup.realmBuilding.name,
"Some broken test rules",
Ruleset.Lang.GROOVY,
getClass().getResource("/org/openremote/test/rules/BasicBrokenRules.groovy").text)
@@ -368,12 +368,12 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
then: "the building engine should not run and the rule engine status should indicate the issue"
conditions.eventually {
- assert rulesImport.tenantBuildingEngine.deployments.size() == 2
- assert !rulesImport.tenantBuildingEngine.running
- assert rulesImport.tenantBuildingEngine.deployments.values().any({
- it.name == "Some building tenant demo rules" && it.status == READY
+ assert rulesImport.realmBuildingEngine.deployments.size() == 2
+ assert !rulesImport.realmBuildingEngine.running
+ assert rulesImport.realmBuildingEngine.deployments.values().any({
+ it.name == "Some building realm demo rules" && it.status == READY
})
- assert rulesImport.tenantBuildingEngine.deployments.values().any({
+ assert rulesImport.realmBuildingEngine.deployments.values().any({
it.name == "Some broken test rules" && it.status == COMPILATION_ERROR && it.error instanceof RuntimeException
})
}
@@ -386,7 +386,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
when: "an attribute event occurs"
def globalLastFireTimestamp = rulesImport.globalEngine.lastFireTimestamp
def masterLastFireTimestamp = rulesImport.masterEngine.lastFireTimestamp
- def tenantALastFireTimestamp = rulesImport.tenantBuildingEngine.lastFireTimestamp
+ def realmALastFireTimestamp = rulesImport.realmBuildingEngine.lastFireTimestamp
def apartment2LastFireTimestamp = rulesImport.apartment2Engine.lastFireTimestamp
def apartment3LastFireTimestamp = rulesImport.apartment3Engine.lastFireTimestamp
def apartment2LivingRoomPresenceDetectedChange = new AttributeEvent(
@@ -398,7 +398,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
conditions.eventually {
assert rulesImport.globalEngine.lastFireTimestamp > globalLastFireTimestamp
assert rulesImport.masterEngine.lastFireTimestamp == masterLastFireTimestamp
- assert rulesImport.tenantBuildingEngine.lastFireTimestamp == tenantALastFireTimestamp
+ assert rulesImport.realmBuildingEngine.lastFireTimestamp == realmALastFireTimestamp
assert rulesImport.apartment2Engine.lastFireTimestamp > apartment2LastFireTimestamp
assert rulesImport.apartment3Engine.lastFireTimestamp == apartment3LastFireTimestamp
}
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
index a9beedfbe..8d131f9f1 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
@@ -65,20 +65,20 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ruleDefinitions[0].lang == GROOVY
ruleDefinitions[0].rules == null // Don't retrieve the (large) rules data when getting a list of rule definitions
- when: "some tenant rules are retrieved"
- ruleDefinitions = rulesetResource.getTenantRulesets(null, keycloakTestSetup.masterTenant.realm, null, false)
+ when: "some realm rules are retrieved"
+ ruleDefinitions = rulesetResource.getRealmRulesets(null, keycloakTestSetup.realmMaster.name, null, false)
then: "result should match"
ruleDefinitions.length == 1
- ruleDefinitions[0].name == "Some master tenant demo rules"
+ ruleDefinitions[0].name == "Some master realm demo rules"
ruleDefinitions[0].lang == GROOVY
- when: "some tenant rules in a non-authenticated realm are retrieved"
- ruleDefinitions = rulesetResource.getTenantRulesets(null, keycloakTestSetup.tenantBuilding.realm, null, false)
+ when: "some realm rules in a non-authenticated realm are retrieved"
+ ruleDefinitions = rulesetResource.getRealmRulesets(null, keycloakTestSetup.realmBuilding.name, null, false)
then: "result should match"
ruleDefinitions.length == 1
- ruleDefinitions[0].name == "Some building tenant demo rules"
+ ruleDefinitions[0].name == "Some building realm demo rules"
ruleDefinitions[0].enabled
when: "some asset rules are retrieved"
@@ -157,78 +157,78 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex = thrown()
ex.response.status == 404
- when: "a tenant ruleset is created in the authenticated realm"
- def tenantRuleset = new TenantRuleset(MASTER_REALM, "Test tenant definition", GROOVY, "SomeRulesCode")
- rulesetResource.createTenantRuleset(null, tenantRuleset)
- rulesetId = rulesetResource.getTenantRulesets(null, MASTER_REALM, null, false)[1].id
- tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
- lastModified = tenantRuleset.lastModified
+ when: "a realm ruleset is created in the authenticated realm"
+ def realmRuleset = new RealmRuleset(MASTER_REALM, "Test realm definition", GROOVY, "SomeRulesCode")
+ rulesetResource.createRealmRuleset(null, realmRuleset)
+ rulesetId = rulesetResource.getRealmRulesets(null, MASTER_REALM, null, false)[1].id
+ realmRuleset = rulesetResource.getRealmRuleset(null, rulesetId)
+ lastModified = realmRuleset.lastModified
then: "result should match"
- tenantRuleset.id == rulesetId
- tenantRuleset.version == 0
- tenantRuleset.createdOn.time < System.currentTimeMillis()
+ realmRuleset.id == rulesetId
+ realmRuleset.version == 0
+ realmRuleset.createdOn.time < System.currentTimeMillis()
lastModified.time < System.currentTimeMillis()
- tenantRuleset.name == "Test tenant definition"
- tenantRuleset.rules == "SomeRulesCode"
- tenantRuleset.realm == keycloakTestSetup.masterTenant.realm
+ realmRuleset.name == "Test realm definition"
+ realmRuleset.rules == "SomeRulesCode"
+ realmRuleset.realm == keycloakTestSetup.realmMaster.name
and: "the ruleset should reach the engine"
conditions.eventually {
- def deployment = rulesService.tenantEngines.get(MASTER_REALM).deployments.get(rulesetId)
+ def deployment = rulesService.realmEngines.get(MASTER_REALM).deployments.get(rulesetId)
assert deployment != null
- assert deployment.ruleset.version == tenantRuleset.version
+ assert deployment.ruleset.version == realmRuleset.version
}
- when: "a tenant ruleset is updated"
- tenantRuleset.name = "Renamed test tenant definition"
- tenantRuleset.rules = "SomeRulesCodeModified"
- rulesetResource.updateTenantRuleset(null, rulesetId, tenantRuleset)
- tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
+ when: "a realm ruleset is updated"
+ realmRuleset.name = "Renamed test realm definition"
+ realmRuleset.rules = "SomeRulesCodeModified"
+ rulesetResource.updateRealmRuleset(null, rulesetId, realmRuleset)
+ realmRuleset = rulesetResource.getRealmRuleset(null, rulesetId)
then: "result should match"
- tenantRuleset.id == rulesetId
- tenantRuleset.version == 1
- tenantRuleset.createdOn.time < System.currentTimeMillis()
+ realmRuleset.id == rulesetId
+ realmRuleset.version == 1
+ realmRuleset.createdOn.time < System.currentTimeMillis()
lastModified.time < System.currentTimeMillis()
- tenantRuleset.name == "Renamed test tenant definition"
- tenantRuleset.rules == "SomeRulesCodeModified"
- tenantRuleset.realm == keycloakTestSetup.masterTenant.realm
+ realmRuleset.name == "Renamed test realm definition"
+ realmRuleset.rules == "SomeRulesCodeModified"
+ realmRuleset.realm == keycloakTestSetup.realmMaster.name
and: "the ruleset should reach the engine"
conditions.eventually {
- def deployment = rulesService.tenantEngines.get(MASTER_REALM).deployments.get(rulesetId)
+ def deployment = rulesService.realmEngines.get(MASTER_REALM).deployments.get(rulesetId)
assert deployment != null
- assert deployment.ruleset.version == tenantRuleset.version
+ assert deployment.ruleset.version == realmRuleset.version
}
- when: "a tenant ruleset is updated with an invalid realm"
- tenantRuleset.realm = "thisdoesnotexist"
- rulesetResource.updateTenantRuleset(null, rulesetId, tenantRuleset)
+ when: "a realm ruleset is updated with an invalid realm"
+ realmRuleset.realm = "thisdoesnotexist"
+ rulesetResource.updateRealmRuleset(null, rulesetId, realmRuleset)
then: "the request should be bad"
ex = thrown()
ex.response.status == 400
- when: "a tenant ruleset is updated with an invalid id"
- tenantRuleset.realm = MASTER_REALM
- tenantRuleset.id = 1234567890l
- rulesetResource.updateTenantRuleset(null, rulesetId, tenantRuleset)
+ when: "a realm ruleset is updated with an invalid id"
+ realmRuleset.realm = MASTER_REALM
+ realmRuleset.id = 1234567890l
+ rulesetResource.updateRealmRuleset(null, rulesetId, realmRuleset)
then: "the request should be bad"
ex = thrown()
ex.response.status == 400
- when: "a non-existent tenant ruleset is updated"
- rulesetResource.updateTenantRuleset(null, 1234567890l, tenantRuleset)
+ when: "a non-existent realm ruleset is updated"
+ rulesetResource.updateRealmRuleset(null, 1234567890l, realmRuleset)
then: "the result should be not found"
ex = thrown()
ex.response.status == 404
- when: "a tenant ruleset is deleted"
- rulesetResource.deleteTenantRuleset(null, rulesetId)
- rulesetResource.getTenantRuleset(null, rulesetId)
+ when: "a realm ruleset is deleted"
+ rulesetResource.deleteRealmRuleset(null, rulesetId)
+ rulesetResource.getRealmRuleset(null, rulesetId)
then: "the result should be not found"
ex = thrown()
@@ -236,31 +236,31 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
and: "the ruleset should be removed from the engine"
conditions.eventually {
- def deployment = rulesService.tenantEngines.get(MASTER_REALM).deployments.get(rulesetId)
+ def deployment = rulesService.realmEngines.get(MASTER_REALM).deployments.get(rulesetId)
assert deployment == null
}
- when: "a tenant ruleset is created in a non-authenticated realm"
- tenantRuleset = new TenantRuleset(keycloakTestSetup.tenantBuilding.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
- rulesetResource.createTenantRuleset(null, tenantRuleset)
- rulesetId = rulesetResource.getTenantRulesets(null, keycloakTestSetup.tenantBuilding.realm, null, false)[1].id
- tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
- lastModified = tenantRuleset.lastModified
+ when: "a realm ruleset is created in a non-authenticated realm"
+ realmRuleset = new RealmRuleset(keycloakTestSetup.realmBuilding.name, "Test realm definition", GROOVY, "SomeRulesCode")
+ rulesetResource.createRealmRuleset(null, realmRuleset)
+ rulesetId = rulesetResource.getRealmRulesets(null, keycloakTestSetup.realmBuilding.name, null, false)[1].id
+ realmRuleset = rulesetResource.getRealmRuleset(null, rulesetId)
+ lastModified = realmRuleset.lastModified
then: "result should match"
- tenantRuleset.id == rulesetId
- tenantRuleset.version == 0
- tenantRuleset.createdOn.time < System.currentTimeMillis()
+ realmRuleset.id == rulesetId
+ realmRuleset.version == 0
+ realmRuleset.createdOn.time < System.currentTimeMillis()
lastModified.time < System.currentTimeMillis()
- tenantRuleset.name == "Test tenant definition"
- tenantRuleset.rules == "SomeRulesCode"
- tenantRuleset.realm == keycloakTestSetup.tenantBuilding.realm
+ realmRuleset.name == "Test realm definition"
+ realmRuleset.rules == "SomeRulesCode"
+ realmRuleset.realm == keycloakTestSetup.realmBuilding.name
and: "the ruleset should reach the engine"
conditions.eventually {
- def deployment = rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm).deployments.get(rulesetId)
+ def deployment = rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name).deployments.get(rulesetId)
assert deployment != null
- assert deployment.ruleset.version == tenantRuleset.version
+ assert deployment.ruleset.version == realmRuleset.version
}
when: "an asset ruleset is created in the authenticated realm"
@@ -413,15 +413,15 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
WebApplicationException ex = thrown()
ex.response.status == 403
- when: "some tenant rules are retrieved"
- def ruleDefinitions = rulesetResource.getTenantRulesets(null, keycloakTestSetup.masterTenant.realm, null, false)
+ when: "some realm rules are retrieved"
+ def ruleDefinitions = rulesetResource.getRealmRulesets(null, keycloakTestSetup.realmMaster.name, null, false)
then: "result should match"
ruleDefinitions.length == 1
- ruleDefinitions[0].name == "Some master tenant demo rules"
+ ruleDefinitions[0].name == "Some master realm demo rules"
- when: "some tenant rules in a non-authenticated realm are retrieved"
- rulesetResource.getTenantRulesets(null, keycloakTestSetup.tenantBuilding.realm, null, false)
+ when: "some realm rules in a non-authenticated realm are retrieved"
+ rulesetResource.getRealmRulesets(null, keycloakTestSetup.realmBuilding.name, null, false)
then: "access should be forbidden"
ex = thrown()
@@ -458,78 +458,78 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is created in the authenticated realm"
- def tenantRuleset = new TenantRuleset(MASTER_REALM, "Test tenant definition", GROOVY, "SomeRulesCode")
- rulesetResource.createTenantRuleset(null, tenantRuleset)
- def rulesetId = rulesetResource.getTenantRulesets(null, MASTER_REALM, null, false)[1].id
- tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
- def lastModified = tenantRuleset.lastModified
+ when: "a realm ruleset is created in the authenticated realm"
+ def realmRuleset = new RealmRuleset(MASTER_REALM, "Test realm definition", GROOVY, "SomeRulesCode")
+ rulesetResource.createRealmRuleset(null, realmRuleset)
+ def rulesetId = rulesetResource.getRealmRulesets(null, MASTER_REALM, null, false)[1].id
+ realmRuleset = rulesetResource.getRealmRuleset(null, rulesetId)
+ def lastModified = realmRuleset.lastModified
then: "result should match"
- tenantRuleset.id == rulesetId
- tenantRuleset.version == 0
- tenantRuleset.createdOn.time < System.currentTimeMillis()
+ realmRuleset.id == rulesetId
+ realmRuleset.version == 0
+ realmRuleset.createdOn.time < System.currentTimeMillis()
lastModified.time < System.currentTimeMillis()
- tenantRuleset.name == "Test tenant definition"
- tenantRuleset.rules == "SomeRulesCode"
- tenantRuleset.realm == MASTER_REALM
+ realmRuleset.name == "Test realm definition"
+ realmRuleset.rules == "SomeRulesCode"
+ realmRuleset.realm == MASTER_REALM
and: "the ruleset should reach the engine"
conditions.eventually {
- def deployment = rulesService.tenantEngines.get(MASTER_REALM).deployments.get(rulesetId)
+ def deployment = rulesService.realmEngines.get(MASTER_REALM).deployments.get(rulesetId)
assert deployment != null
- assert deployment.ruleset.version == tenantRuleset.version
+ assert deployment.ruleset.version == realmRuleset.version
}
- when: "a tenant ruleset is updated"
- tenantRuleset.name = "Renamed test tenant definition"
- tenantRuleset.rules = "SomeRulesCodeModified"
- rulesetResource.updateTenantRuleset(null, rulesetId, tenantRuleset)
- tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
+ when: "a realm ruleset is updated"
+ realmRuleset.name = "Renamed test realm definition"
+ realmRuleset.rules = "SomeRulesCodeModified"
+ rulesetResource.updateRealmRuleset(null, rulesetId, realmRuleset)
+ realmRuleset = rulesetResource.getRealmRuleset(null, rulesetId)
then: "result should match"
- tenantRuleset.id == rulesetId
- tenantRuleset.version == 1
- tenantRuleset.createdOn.time < System.currentTimeMillis()
+ realmRuleset.id == rulesetId
+ realmRuleset.version == 1
+ realmRuleset.createdOn.time < System.currentTimeMillis()
lastModified.time < System.currentTimeMillis()
- tenantRuleset.name == "Renamed test tenant definition"
- tenantRuleset.rules == "SomeRulesCodeModified"
- tenantRuleset.realm == keycloakTestSetup.masterTenant.realm
+ realmRuleset.name == "Renamed test realm definition"
+ realmRuleset.rules == "SomeRulesCodeModified"
+ realmRuleset.realm == keycloakTestSetup.realmMaster.name
and: "the ruleset should reach the engine"
conditions.eventually {
- def deployment = rulesService.tenantEngines.get(MASTER_REALM).deployments.get(rulesetId)
+ def deployment = rulesService.realmEngines.get(MASTER_REALM).deployments.get(rulesetId)
assert deployment != null
- assert deployment.ruleset.version == tenantRuleset.version
+ assert deployment.ruleset.version == realmRuleset.version
}
- when: "a tenant ruleset is updated with an invalid realm"
- tenantRuleset.realm = "thisdoesnotexist"
- rulesetResource.updateTenantRuleset(null, rulesetId, tenantRuleset)
+ when: "a realm ruleset is updated with an invalid realm"
+ realmRuleset.realm = "thisdoesnotexist"
+ rulesetResource.updateRealmRuleset(null, rulesetId, realmRuleset)
then: "the request should be bad"
ex = thrown()
ex.response.status == 400
- when: "a tenant ruleset is updated with an invalid id"
- tenantRuleset.realm = keycloakTestSetup.masterTenant.realm
- tenantRuleset.id = 1234567890l
- rulesetResource.updateTenantRuleset(null, rulesetId, tenantRuleset)
+ when: "a realm ruleset is updated with an invalid id"
+ realmRuleset.realm = keycloakTestSetup.realmMaster.name
+ realmRuleset.id = 1234567890l
+ rulesetResource.updateRealmRuleset(null, rulesetId, realmRuleset)
then: "the request should be bad"
ex = thrown()
ex.response.status == 400
- when: "a non-existent tenant ruleset is updated"
- rulesetResource.updateTenantRuleset(null, 1234567890l, tenantRuleset)
+ when: "a non-existent realm ruleset is updated"
+ rulesetResource.updateRealmRuleset(null, 1234567890l, realmRuleset)
then: "the result should be not found"
ex = thrown()
ex.response.status == 404
- when: "a tenant ruleset is deleted"
- rulesetResource.deleteTenantRuleset(null, rulesetId)
- rulesetResource.getTenantRuleset(null, rulesetId)
+ when: "a realm ruleset is deleted"
+ rulesetResource.deleteRealmRuleset(null, rulesetId)
+ rulesetResource.getRealmRuleset(null, rulesetId)
then: "the result should be not found"
ex = thrown()
@@ -537,13 +537,13 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
and: "the ruleset should be removed from the engine"
conditions.eventually {
- def deployment = rulesService.tenantEngines.get(MASTER_REALM).deployments.get(rulesetId)
+ def deployment = rulesService.realmEngines.get(MASTER_REALM).deployments.get(rulesetId)
assert deployment == null
}
- when: "a tenant ruleset is created in a non-authenticated realm"
- tenantRuleset = new TenantRuleset(keycloakTestSetup.tenantBuilding.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
- rulesetResource.createTenantRuleset(null, tenantRuleset)
+ when: "a realm ruleset is created in a non-authenticated realm"
+ realmRuleset = new RealmRuleset(keycloakTestSetup.realmBuilding.name, "Test realm definition", GROOVY, "SomeRulesCode")
+ rulesetResource.createRealmRuleset(null, realmRuleset)
then: "access should be forbidden"
ex = thrown()
@@ -661,14 +661,14 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
and: "an authenticated test user"
def accessToken = authenticate(
container,
- keycloakTestSetup.tenantBuilding.realm,
+ keycloakTestSetup.realmBuilding.name,
KEYCLOAK_CLIENT_ID,
"testuser2",
"testuser2"
).token
and: "the ruleset resource"
- def rulesetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm, accessToken).proxy(RulesResource.class)
+ def rulesetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name, accessToken).proxy(RulesResource.class)
expect: "the rules engines to be ready"
conditions.eventually {
@@ -684,15 +684,15 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
WebApplicationException ex = thrown()
ex.response.status == 403
- when: "some tenant rules in a non-authenticated realm are retrieved"
- rulesetResource.getTenantRulesets(null, keycloakTestSetup.masterTenant.realm, null, false)
+ when: "some realm rules in a non-authenticated realm are retrieved"
+ rulesetResource.getRealmRulesets(null, keycloakTestSetup.realmMaster.name, null, false)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
- when: "some tenant rules in the authenticated realm are retrieved by user without rules read role"
- def rulesets = rulesetResource.getTenantRulesets(null, keycloakTestSetup.tenantBuilding.realm, null, false)
+ when: "some realm rules in the authenticated realm are retrieved by user without rules read role"
+ def rulesets = rulesetResource.getRealmRulesets(null, keycloakTestSetup.realmBuilding.name, null, false)
then: "no rulesets should be returned"
rulesets.length == 0
@@ -727,60 +727,60 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is created in the authenticated realm"
- def tenantRuleset = new TenantRuleset(keycloakTestSetup.tenantBuilding.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
- rulesetResource.createTenantRuleset(null, tenantRuleset)
+ when: "a realm ruleset is created in the authenticated realm"
+ def realmRuleset = new RealmRuleset(keycloakTestSetup.realmBuilding.name, "Test realm definition", GROOVY, "SomeRulesCode")
+ rulesetResource.createRealmRuleset(null, realmRuleset)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is updated"
- rulesetResource.updateTenantRuleset(null, 1234567890l, tenantRuleset)
+ when: "a realm ruleset is updated"
+ rulesetResource.updateRealmRuleset(null, 1234567890l, realmRuleset)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is deleted"
- rulesetResource.deleteTenantRuleset(null, 1234567890l)
+ when: "a realm ruleset is deleted"
+ rulesetResource.deleteRealmRuleset(null, 1234567890l)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is created in a non-authenticated realm"
- tenantRuleset = new TenantRuleset(keycloakTestSetup.tenantCity.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
- rulesetResource.createTenantRuleset(null, tenantRuleset)
+ when: "a realm ruleset is created in a non-authenticated realm"
+ realmRuleset = new RealmRuleset(keycloakTestSetup.realmCity.name, "Test realm definition", GROOVY, "SomeRulesCode")
+ rulesetResource.createRealmRuleset(null, realmRuleset)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is created in the authenticated realm"
- def assetRuleset = new AssetRuleset(keycloakTestSetup.tenantBuilding.realm, "Test asset definition", GROOVY, "SomeRulesCode")
+ when: "a realm ruleset is created in the authenticated realm"
+ def assetRuleset = new AssetRuleset(keycloakTestSetup.realmBuilding.name, "Test asset definition", GROOVY, "SomeRulesCode")
rulesetResource.createAssetRuleset(null, assetRuleset)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is updated"
+ when: "a realm ruleset is updated"
rulesetResource.updateAssetRuleset(null, 1234567890l, assetRuleset)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is deleted"
+ when: "a realm ruleset is deleted"
rulesetResource.deleteAssetRuleset(null, 1234567890l)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is created in a non-authenticated realm"
- assetRuleset = new AssetRuleset(keycloakTestSetup.tenantCity.realm, "Test asset definition", GROOVY, "SomeRulesCode")
+ when: "a realm ruleset is created in a non-authenticated realm"
+ assetRuleset = new AssetRuleset(keycloakTestSetup.realmCity.name, "Test asset definition", GROOVY, "SomeRulesCode")
rulesetResource.createAssetRuleset(null, assetRuleset)
then: "access should be forbidden"
@@ -809,14 +809,14 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
and: "an authenticated test user"
def accessToken = authenticate(
container,
- keycloakTestSetup.tenantBuilding.realm,
+ keycloakTestSetup.realmBuilding.name,
KEYCLOAK_CLIENT_ID,
"testuser3",
"testuser3"
).token
and: "the ruleset resource"
- def rulesetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm, accessToken).proxy(RulesResource.class)
+ def rulesetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name, accessToken).proxy(RulesResource.class)
expect: "the rules engines to be ready"
conditions.eventually {
@@ -832,15 +832,15 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
WebApplicationException ex = thrown()
ex.response.status == 403
- when: "some tenant rules in a non-authenticated realm are retrieved"
- rulesetResource.getTenantRulesets(null, keycloakTestSetup.masterTenant.realm, null, false)
+ when: "some realm rules in a non-authenticated realm are retrieved"
+ rulesetResource.getRealmRulesets(null, keycloakTestSetup.realmMaster.name, null, false)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
- when: "some tenant rules in the authenticated realm are retrieved by the restricted user"
- def rulesets = rulesetResource.getTenantRulesets(null, keycloakTestSetup.tenantBuilding.realm, null, false)
+ when: "some realm rules in the authenticated realm are retrieved by the restricted user"
+ def rulesets = rulesetResource.getRealmRulesets(null, keycloakTestSetup.realmBuilding.name, null, false)
then: "no rulesets should be returned"
rulesets.length == 0
@@ -882,32 +882,32 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is created in the authenticated realm"
- def tenantRuleset = new TenantRuleset(keycloakTestSetup.tenantBuilding.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
- rulesetResource.createTenantRuleset(null, tenantRuleset)
+ when: "a realm ruleset is created in the authenticated realm"
+ def realmRuleset = new RealmRuleset(keycloakTestSetup.realmBuilding.name, "Test realm definition", GROOVY, "SomeRulesCode")
+ rulesetResource.createRealmRuleset(null, realmRuleset)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
- when: "a tenant ruleset is updated"
- rulesetResource.updateTenantRuleset(null, 1234567890l, tenantRuleset)
+ when: "a realm ruleset is updated"
+ rulesetResource.updateRealmRuleset(null, 1234567890l, realmRuleset)
then: "result should be not found"
ex = thrown()
ex.response.status == 404
- when: "a tenant ruleset is deleted"
- rulesetResource.deleteTenantRuleset(null, 1234567890l)
- rulesetResource.getTenantRuleset(null, 1234567890l)
+ when: "a realm ruleset is deleted"
+ rulesetResource.deleteRealmRuleset(null, 1234567890l)
+ rulesetResource.getRealmRuleset(null, 1234567890l)
then: "the result should be not found"
ex = thrown()
ex.response.status == 404
- when: "a tenant ruleset is created in a non-authenticated realm"
- tenantRuleset = new TenantRuleset(keycloakTestSetup.tenantCity.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
- rulesetResource.createTenantRuleset(null, tenantRuleset)
+ when: "a realm ruleset is created in a non-authenticated realm"
+ realmRuleset = new RealmRuleset(keycloakTestSetup.realmCity.name, "Test realm definition", GROOVY, "SomeRulesCode")
+ rulesetResource.createRealmRuleset(null, realmRuleset)
then: "access should be forbidden"
ex = thrown()
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
index d2e52eeec..03fd8c064 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
@@ -33,7 +33,7 @@ import org.openremote.model.notification.PushNotificationMessage
import org.openremote.model.rules.Ruleset
import org.openremote.model.rules.RulesetStatus
import org.openremote.model.rules.TemporaryFact
-import org.openremote.model.rules.TenantRuleset
+import org.openremote.model.rules.RealmRuleset
import org.openremote.model.rules.json.JsonRulesetDefinition
import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
@@ -80,7 +80,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
def timerService = container.getService(TimerService.class)
def assetStorageService = container.getService(AssetStorageService.class)
def assetProcessingService = container.getService(AssetProcessingService.class)
- RulesEngine tenantBuildingEngine
+ RulesEngine realmBuildingEngine
and: "a mock push notification handler"
PushNotificationHandler mockPushNotificationHandler = Spy(pushNotificationHandler)
@@ -115,8 +115,8 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
notificationService.notificationHandlerMap.put(emailNotificationHandler.getTypeName(), mockEmailNotificationHandler)
and: "some rules"
- Ruleset ruleset = new TenantRuleset(
- keycloakTestSetup.tenantBuilding.realm,
+ Ruleset ruleset = new RealmRuleset(
+ keycloakTestSetup.realmBuilding.name,
"Demo Apartment - All Lights Off",
Ruleset.Lang.JSON,
getClass().getResource("/org/openremote/test/rules/BasicJsonRules.json").text)
@@ -124,12 +124,12 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
expect: "the rule engines to become available and be running with asset states inserted and no longer tracking location rules"
conditions.eventually {
- tenantBuildingEngine = rulesService.tenantEngines.get(keycloakTestSetup.tenantBuilding.realm)
- assert tenantBuildingEngine != null
- assert tenantBuildingEngine.isRunning()
- assert tenantBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING
- assert tenantBuildingEngine.lastFireTimestamp > 0
- assert !tenantBuildingEngine.trackLocationPredicates
+ realmBuildingEngine = rulesService.realmEngines.get(keycloakTestSetup.realmBuilding.name)
+ assert realmBuildingEngine != null
+ assert realmBuildingEngine.isRunning()
+ assert realmBuildingEngine.assetStates.size() == DEMO_RULE_STATES_SMART_BUILDING
+ assert realmBuildingEngine.lastFireTimestamp > 0
+ assert !realmBuildingEngine.trackLocationPredicates
}
and: "the room lights in an apartment to be on"
@@ -145,14 +145,14 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
when: "a user authenticates"
def accessToken = authenticate(
container,
- keycloakTestSetup.tenantBuilding.realm,
+ keycloakTestSetup.realmBuilding.name,
KEYCLOAK_CLIENT_ID,
"testuser3",
"testuser3"
).token
and: "a console is registered by that user"
- def authenticatedConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm, accessToken).proxy(ConsoleResource.class)
+ def authenticatedConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name, accessToken).proxy(ConsoleResource.class)
def consoleRegistration = new ConsoleRegistration(null,
"Test Console",
"1.0",
@@ -191,7 +191,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
when:"an additional user is linked to this console (to help with testing)"
assetStorageService.storeUserAssetLinks(
- Collections.singletonList(new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(), keycloakTestSetup.testuser2Id, consoleRegistration.id))
+ Collections.singletonList(new UserAssetLink(keycloakTestSetup.realmBuilding.getName(), keycloakTestSetup.testuser2Id, consoleRegistration.id))
)
and: "the console location is set to the apartment"
@@ -210,7 +210,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
then: "the console location asset state should be in the rule engine"
conditions.eventually {
- def assetState = tenantBuildingEngine.assetStates.find {it.id == consoleRegistration.id && it.name == Asset.LOCATION.name}
+ def assetState = realmBuildingEngine.assetStates.find {it.id == consoleRegistration.id && it.name == Asset.LOCATION.name}
assert assetState != null
assert assetState.getValue().isPresent()
assert assetState.getValueAs(GeoJSONPoint.class).map{it.x == ManagerTestSetup.SMART_BUILDING_LOCATION.x}.orElse(false)
@@ -263,12 +263,12 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
}
when: "the console device moves back inside the home geofence (as defined in the rule)"
- def lastFireTimestamp = tenantBuildingEngine.lastFireTimestamp
+ def lastFireTimestamp = realmBuildingEngine.lastFireTimestamp
assetProcessingService.sendAttributeEvent(new AttributeEvent(consoleRegistration.id, Asset.LOCATION.name, ManagerTestSetup.SMART_BUILDING_LOCATION), AttributeEvent.Source.CLIENT)
and: "the engine fires at least one more time"
conditions.eventually {
- assert tenantBuildingEngine.lastFireTimestamp > lastFireTimestamp
+ assert realmBuildingEngine.lastFireTimestamp > lastFireTimestamp
}
and: "the console device moves outside the home geofence again (as defined in the rule)"
@@ -298,8 +298,8 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
then: "the ruleset to be redeployed"
conditions.eventually {
- assert tenantBuildingEngine.deployments.find{it.key == ruleset.id}.value.version == version+1
- assert tenantBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
+ assert realmBuildingEngine.deployments.find{it.key == ruleset.id}.value.version == version+1
+ assert realmBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
}
and: "another notification should have been sent to the console when rule is redeployed"
@@ -308,12 +308,12 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
}
when: "the console device moves back inside the home geofence (as defined in the rule)"
- lastFireTimestamp = tenantBuildingEngine.lastFireTimestamp
+ lastFireTimestamp = realmBuildingEngine.lastFireTimestamp
assetProcessingService.sendAttributeEvent(new AttributeEvent(consoleRegistration.id, Asset.LOCATION.name, ManagerTestSetup.SMART_BUILDING_LOCATION), AttributeEvent.Source.CLIENT)
then: "the engine fires at least one more time"
conditions.eventually {
- assert tenantBuildingEngine.lastFireTimestamp > lastFireTimestamp
+ assert realmBuildingEngine.lastFireTimestamp > lastFireTimestamp
}
when: "the console device moves outside the home geofence again (as defined in the rule)"
@@ -326,12 +326,12 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
}
when: "the console device moves back inside the home geofence (as defined in the rule)"
- lastFireTimestamp = tenantBuildingEngine.lastFireTimestamp
+ lastFireTimestamp = realmBuildingEngine.lastFireTimestamp
assetProcessingService.sendAttributeEvent(new AttributeEvent(consoleRegistration.id, Asset.LOCATION.name, ManagerTestSetup.SMART_BUILDING_LOCATION), AttributeEvent.Source.CLIENT)
then: "the engine fires at least one more time"
conditions.eventually {
- assert tenantBuildingEngine.lastFireTimestamp > lastFireTimestamp
+ assert realmBuildingEngine.lastFireTimestamp > lastFireTimestamp
}
when: "when time advances 5 hours"
@@ -383,8 +383,8 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
then: "the ruleset should be redeployed and paused until 1st occurrence"
conditions.eventually {
- assert tenantBuildingEngine.deployments.find{it.key == ruleset.id}.value.version == version+1
- assert tenantBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.PAUSED
+ assert realmBuildingEngine.deployments.find{it.key == ruleset.id}.value.version == version+1
+ assert realmBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.PAUSED
}
when: "the same AttributeEvent is sent"
@@ -406,7 +406,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
then: "eventually the ruleset should be unpaused (1st occurrence)"
conditions.eventually {
- assert tenantBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
+ assert realmBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
}
when: "the same AttributeEvent is sent"
@@ -430,7 +430,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
then: "the ruleset should become paused again (until next occurrence)"
conditions.eventually {
- assert tenantBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.PAUSED
+ assert realmBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.PAUSED
}
when: "the same AttributeEvent is sent"
@@ -452,7 +452,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
then: "eventually the ruleset should be unpaused (next occurrence)"
conditions.eventually {
- assert tenantBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
+ assert realmBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
}
when: "the un-pause elapses"
@@ -460,7 +460,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
then: "the ruleset should become paused again (until last occurrence)"
conditions.eventually {
- assert tenantBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.PAUSED
+ assert realmBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.PAUSED
}
when: "the pause elapses"
@@ -468,7 +468,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
then: "eventually the ruleset should be unpaused (last occurrence)"
conditions.eventually {
- assert tenantBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
+ assert realmBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
}
when: "the un-pause elapses"
@@ -476,7 +476,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
then: "the ruleset should expire"
conditions.eventually {
- assert tenantBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.EXPIRED
+ assert realmBuildingEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.EXPIRED
}
cleanup: "static variables are reset and the mock is removed"
diff --git a/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy b/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy
index 3f62bc21e..52ddc7b85 100644
--- a/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy
@@ -22,7 +22,7 @@ package org.openremote.test.users
import org.openremote.container.security.keycloak.KeycloakIdentityProvider
import org.openremote.manager.setup.SetupService
import org.openremote.model.query.UserQuery
-import org.openremote.model.query.filter.TenantPredicate
+import org.openremote.model.query.filter.RealmPredicate
import org.openremote.test.setup.KeycloakTestSetup
import org.openremote.model.security.ClientRole
import org.openremote.model.security.Role
@@ -64,20 +64,20 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
def regularAccessToken = authenticate(
container,
- keycloakTestSetup.tenantBuilding.realm,
+ keycloakTestSetup.realmBuilding.name,
KEYCLOAK_CLIENT_ID,
"testuser3",
"testuser3"
).token
adminUserResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(UserResource.class)
- regularUserResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm, regularAccessToken).proxy(UserResource.class)
+ regularUserResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name, regularAccessToken).proxy(UserResource.class)
}
def "User queries"() {
when: "a request is made for all users by a super user"
- def users = adminUserResource.query(null, new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)))
+ def users = adminUserResource.query(null, new UserQuery().realm(new RealmPredicate(keycloakTestSetup.realmMaster.name)))
then: "all users should be returned including system users"
users.size() == 3
@@ -85,7 +85,7 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
users.count {!it.isServiceAccount()} == 3
when: "a request is made for all users by a regular user"
- users = regularUserResource.query(null, new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)))
+ users = regularUserResource.query(null, new UserQuery().realm(new RealmPredicate(keycloakTestSetup.realmMaster.name)))
then: "only non system users of the users realm should be returned"
users.size() == 4
@@ -96,7 +96,7 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
users.find {it.isServiceAccount() && it.id == keycloakTestSetup.serviceUser.id} != null
when: "a request is made for all users ordered by username"
- users = regularUserResource.query(null, new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new UserQuery.OrderBy(UserQuery.OrderBy.Property.USERNAME, false)))
+ users = regularUserResource.query(null, new UserQuery().realm(new RealmPredicate(keycloakTestSetup.realmMaster.name)).orderBy(new UserQuery.OrderBy(UserQuery.OrderBy.Property.USERNAME, false)))
then: "only non system users of the users realm should be returned in username order"
users.size() == 4
@@ -106,7 +106,7 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
users[3].username == "testuser3"
when: "a request is made for subset of users ordered by username descending"
- users = regularUserResource.query(null, new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new UserQuery.OrderBy(UserQuery.OrderBy.Property.USERNAME, true)).limit(2))
+ users = regularUserResource.query(null, new UserQuery().realm(new RealmPredicate(keycloakTestSetup.realmMaster.name)).orderBy(new UserQuery.OrderBy(UserQuery.OrderBy.Property.USERNAME, true)).limit(2))
then: "the correct users should be returned"
users.size() == 2
@@ -114,7 +114,7 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
users[1].username == "testuser2"
when: "a request is made for another subset of users ordered by username descending"
- users = regularUserResource.query(null, new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new UserQuery.OrderBy(UserQuery.OrderBy.Property.USERNAME, true)).limit(2).offset(2))
+ users = regularUserResource.query(null, new UserQuery().realm(new RealmPredicate(keycloakTestSetup.realmMaster.name)).orderBy(new UserQuery.OrderBy(UserQuery.OrderBy.Property.USERNAME, true)).limit(2).offset(2))
then: "the correct users should be returned"
users.size() == 2
@@ -122,7 +122,7 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
users[1].username == "building"
when: "a request is made for only service users"
- users = adminUserResource.query(null, new UserQuery().select(new UserQuery.Select().excludeRegularUsers(true)).tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm)))
+ users = adminUserResource.query(null, new UserQuery().select(new UserQuery.Select().excludeRegularUsers(true)).realm(new RealmPredicate(keycloakTestSetup.realmBuilding.name)))
then: "only service users of the requested realm should be returned"
users.size() == 1
@@ -133,7 +133,7 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
def "Get and update roles"() {
when: "a request is made for the roles in the building realm by the admin user"
- def roles = adminUserResource.getRoles(null, keycloakTestSetup.tenantBuilding.realm)
+ def roles = adminUserResource.getRoles(null, keycloakTestSetup.realmBuilding.name)
then: "the standard client roles should have been returned"
roles.size() == ClientRole.values().length
@@ -152,7 +152,7 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
readAssets.compositeRoleIds == null
when: "a request is made for the roles in the smart building realm by a regular user"
- regularUserResource.getRoles(null, keycloakTestSetup.tenantBuilding.realm)
+ regularUserResource.getRoles(null, keycloakTestSetup.realmBuilding.name)
then: "a not allowed exception should be thrown"
thrown(ForbiddenException.class)
@@ -169,8 +169,8 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
roles.find {it.name == ClientRole.READ_MAP.value}.id
] as String[]
).setDescription("This is a test"))
- adminUserResource.updateRoles(null, keycloakTestSetup.tenantBuilding.realm, updatedRoles as Role[])
- roles = adminUserResource.getRoles(null, keycloakTestSetup.tenantBuilding.realm)
+ adminUserResource.updateRoles(null, keycloakTestSetup.realmBuilding.name, updatedRoles as Role[])
+ roles = adminUserResource.getRoles(null, keycloakTestSetup.realmBuilding.name)
def testRole = roles.find {it.name == "test"}
then: "the new composite role should have been saved"
@@ -185,8 +185,8 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
writeRole.compositeRoleIds = [
roles.find {it.name == ClientRole.READ_ASSETS.value}.id
]
- adminUserResource.updateRoles(null, keycloakTestSetup.tenantBuilding.realm, roles)
- roles = adminUserResource.getRoles(null, keycloakTestSetup.tenantBuilding.realm)
+ adminUserResource.updateRoles(null, keycloakTestSetup.realmBuilding.name, roles)
+ roles = adminUserResource.getRoles(null, keycloakTestSetup.realmBuilding.name)
writeRole = roles.find {it.name == ClientRole.WRITE.value}
then: "the write role should have been updated"
diff --git a/test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.java b/test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.java
index a6c846ec5..3b1f15fbb 100644
--- a/test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.java
+++ b/test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.java
@@ -24,7 +24,7 @@ import org.openremote.manager.setup.AbstractKeycloakSetup;
import org.openremote.model.Constants;
import org.openremote.model.Container;
import org.openremote.model.security.ClientRole;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import org.openremote.model.security.User;
import java.util.Arrays;
@@ -54,10 +54,10 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {
public String testuser3Id;
public String smartCityUserId;
public String buildingUserId;
- public Tenant masterTenant;
- public Tenant tenantBuilding;
- public Tenant energyTenant;
- public Tenant tenantCity;
+ public Realm realmMaster;
+ public Realm realmBuilding;
+ public Realm realmEnergy;
+ public Realm realmCity;
public User serviceUser;
public KeycloakTestSetup(Container container) {
@@ -68,11 +68,11 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {
public void onStart() throws Exception {
super.onStart();
- // Tenants
- masterTenant = identityService.getIdentityProvider().getTenant(Constants.MASTER_REALM);
- tenantBuilding = createTenant("building", "Building", true);
- tenantCity = createTenant("smartcity", "Smart City", true);
- energyTenant = createTenant("energy", "Energy Test", true);
+ // Realms
+ realmMaster = identityService.getIdentityProvider().getRealm(Constants.MASTER_REALM);
+ realmBuilding = createRealm("building", "Building", true);
+ realmCity = createRealm("smartcity", "Smart City", true);
+ realmEnergy = createRealm("energy", "Energy Test", true);
// Don't allow demo users to write assets
ClientRole[] demoUserRoles = Arrays.stream(REGULAR_USER_ROLES)
@@ -84,22 +84,22 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {
User testuser1 = createUser(MASTER_REALM, "testuser1", "testuser1", "DemoMaster", "DemoLast", null, true, container.isDevMode() ? REGULAR_USER_ROLES : demoUserRoles);
this.testuser1Id = testuser1.getId();
keycloakProvider.updateUserRoles(MASTER_REALM, testuser1Id, "account"); // Remove all roles for account client
- User testuser2 = createUser(tenantBuilding.getRealm(), "testuser2", "testuser2", "DemoA2", "DemoLast", "[email protected]", true, false, true, new ClientRole[] {
+ User testuser2 = createUser(realmBuilding.getName(), "testuser2", "testuser2", "DemoA2", "DemoLast", "[email protected]", true, false, true, new ClientRole[] {
ClientRole.WRITE_USER,
ClientRole.READ_MAP,
ClientRole.READ_ASSETS
});
this.testuser2Id = testuser2.getId();
- keycloakProvider.updateUserRoles(tenantBuilding.getRealm(), testuser2Id, "account"); // Remove all roles for account client
- User testuser3 = createUser(tenantBuilding.getRealm(), "testuser3", "testuser3", "DemoA3", "DemoLast", "[email protected]", true, true, false, container.isDevMode() ? REGULAR_USER_ROLES : demoUserRoles);
+ keycloakProvider.updateUserRoles(realmBuilding.getName(), testuser2Id, "account"); // Remove all roles for account client
+ User testuser3 = createUser(realmBuilding.getName(), "testuser3", "testuser3", "DemoA3", "DemoLast", "[email protected]", true, true, false, container.isDevMode() ? REGULAR_USER_ROLES : demoUserRoles);
this.testuser3Id = testuser3.getId();
- keycloakProvider.updateUserRoles(tenantBuilding.getRealm(), testuser3Id, "account"); // Remove all roles for account client
- User buildingUser = createUser(tenantBuilding.getRealm(), "building", "building", "Building", "User", "[email protected]", true, demoUserRoles);
+ keycloakProvider.updateUserRoles(realmBuilding.getName(), testuser3Id, "account"); // Remove all roles for account client
+ User buildingUser = createUser(realmBuilding.getName(), "building", "building", "Building", "User", "[email protected]", true, demoUserRoles);
this.buildingUserId = buildingUser.getId();
- keycloakProvider.updateUserRoles(tenantBuilding.getRealm(), buildingUserId, "account"); // Remove all roles for account client
- User smartCityUser = createUser(tenantCity.getRealm(), "smartcity", "smartcity", "Smart", "City", null, true, demoUserRoles);
+ keycloakProvider.updateUserRoles(realmBuilding.getName(), buildingUserId, "account"); // Remove all roles for account client
+ User smartCityUser = createUser(realmCity.getName(), "smartcity", "smartcity", "Smart", "City", null, true, demoUserRoles);
this.smartCityUserId = smartCityUser.getId();
- keycloakProvider.updateUserRoles(tenantCity.getRealm(), smartCityUserId, "account"); // Remove all roles for account client
+ keycloakProvider.updateUserRoles(realmCity.getName(), smartCityUserId, "account"); // Remove all roles for account client
/*
* Service user client
@@ -108,9 +108,9 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {
.setServiceAccount(true)
.setEnabled(true)
.setUsername("org/openremote/test");
- serviceUser = keycloakProvider.createUpdateUser(tenantBuilding.getRealm(), serviceUser, UniqueIdentifierGenerator.generateId("serviceusertest"));
+ serviceUser = keycloakProvider.createUpdateUser(realmBuilding.getName(), serviceUser, UniqueIdentifierGenerator.generateId("serviceusertest"));
keycloakProvider.updateUserRoles(
- tenantBuilding.getRealm(),
+ realmBuilding.getName(),
serviceUser.getId(),
serviceUser.getUsername(),
Stream.of(ClientRole.READ_ASSETS, ClientRole.WRITE_ASSETS, ClientRole.WRITE_ATTRIBUTES).map(ClientRole::getValue).toArray(String[]::new)
diff --git a/test/src/test/java/org/openremote/test/setup/ManagerTestAgentSetup.java b/test/src/test/java/org/openremote/test/setup/ManagerTestAgentSetup.java
index 90b249fc4..668f971f4 100644
--- a/test/src/test/java/org/openremote/test/setup/ManagerTestAgentSetup.java
+++ b/test/src/test/java/org/openremote/test/setup/ManagerTestAgentSetup.java
@@ -23,7 +23,7 @@ import org.openremote.agent.protocol.knx.KNXAgent;
import org.openremote.agent.protocol.velbus.VelbusTCPAgent;
import org.openremote.manager.setup.ManagerSetup;
import org.openremote.model.Container;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import java.util.logging.Logger;
@@ -41,7 +41,7 @@ public class ManagerTestAgentSetup extends ManagerSetup {
public static final String SETUP_CREATE_AGENT_VELBUS_HOST = "SETUP_CREATE_AGENT_VELBUS_HOST";
public static final String SETUP_CREATE_AGENT_VELBUS_PORT = "SETUP_CREATE_AGENT_VELBUS_PORT";
- public String masterRealm;
+ public String realmMasterName;
final protected boolean knx;
final protected String knxGatewayIp;
@@ -67,14 +67,14 @@ public class ManagerTestAgentSetup extends ManagerSetup {
public void onStart() throws Exception {
KeycloakTestSetup keycloakTestSetup = setupService.getTaskOfType(KeycloakTestSetup.class);
- Tenant masterTenant = keycloakTestSetup.masterTenant;
- masterRealm = masterTenant.getRealm();
+ Realm realmMaster = keycloakTestSetup.realmMaster;
+ realmMasterName = realmMaster.getName();
if (knx) {
LOG.info("Enable KNX demo agent, gateway/local IP: " + knxGatewayIp + "/" + knxLocalIp);
KNXAgent agent = new KNXAgent("Demo KNX agent")
- .setRealm(masterRealm)
+ .setRealm(realmMasterName)
.setHost(knxGatewayIp)
.setBindHost(knxLocalIp);
@@ -85,7 +85,7 @@ public class ManagerTestAgentSetup extends ManagerSetup {
LOG.info("Enable Velbus demo agent, COM port: " + velbusPort);
VelbusTCPAgent agent = new VelbusTCPAgent("Demo VELBUS agent")
- .setRealm(masterRealm)
+ .setRealm(realmMasterName)
.setHost(velbusHost)
.setPort(velbusPort);
diff --git a/test/src/test/java/org/openremote/test/setup/ManagerTestSetup.java b/test/src/test/java/org/openremote/test/setup/ManagerTestSetup.java
index 666c92b0d..0beb4a07c 100644
--- a/test/src/test/java/org/openremote/test/setup/ManagerTestSetup.java
+++ b/test/src/test/java/org/openremote/test/setup/ManagerTestSetup.java
@@ -33,7 +33,7 @@ import org.openremote.model.asset.impl.*;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.attribute.MetaItem;
import org.openremote.model.geo.GeoJSONPoint;
-import org.openremote.model.security.Tenant;
+import org.openremote.model.security.Realm;
import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.ValueConstraint;
import org.openremote.model.value.ValueType;
@@ -83,10 +83,10 @@ public class ManagerTestSetup extends ManagerSetup {
public String apartment2LivingroomId;
public String apartment2BathroomId;
public String apartment3LivingroomId;
- public String masterRealm;
- public String realmBuildingTenant;
- public String realmCityTenant;
- public String realmEnergyTenant;
+ public String realmMasterName;
+ public String realmBuildingName;
+ public String realmCityName;
+ public String realmEnergyName;
public String smartCityServiceAgentId;
public String area1Id;
public String microphone1Id;
@@ -107,18 +107,18 @@ public class ManagerTestSetup extends ManagerSetup {
super.onStart();
KeycloakTestSetup keycloakTestSetup = setupService.getTaskOfType(KeycloakTestSetup.class);
- Tenant masterTenant = keycloakTestSetup.masterTenant;
- Tenant tenantBuilding = keycloakTestSetup.tenantBuilding;
- Tenant tenantCity = keycloakTestSetup.tenantCity;
- masterRealm = masterTenant.getRealm();
- this.realmBuildingTenant = tenantBuilding.getRealm();
- this.realmCityTenant = tenantCity.getRealm();
- this.realmEnergyTenant = keycloakTestSetup.energyTenant.getRealm();
+ Realm realmMaster = keycloakTestSetup.realmMaster;
+ Realm realmBuilding = keycloakTestSetup.realmBuilding;
+ Realm realmCity = keycloakTestSetup.realmCity;
+ realmMasterName = realmMaster.getName();
+ realmBuildingName = realmBuilding.getName();
+ realmCityName = realmCity.getName();
+ realmEnergyName = keycloakTestSetup.realmEnergy.getName();
// ################################ Assets for 'master' realm ###################################
BuildingAsset smartOffice = new BuildingAsset("Smart office");
- smartOffice.setRealm(masterRealm);
+ smartOffice.setRealm(realmMasterName);
smartOffice.getAttributes().addOrReplace(
new Attribute<>(Asset.LOCATION, SMART_OFFICE_LOCATION),
new Attribute<>(BuildingAsset.STREET, "Torenallee 20"),
@@ -205,7 +205,7 @@ public class ManagerTestSetup extends ManagerSetup {
// ################################ Assets for 'energy' realm ###################################
EnergyOptimisationAsset electricityOptimisationAsset = new EnergyOptimisationAsset("Optimisation");
electricityOptimisationAsset.setIntervalSize(3d);
- electricityOptimisationAsset.setRealm(keycloakTestSetup.energyTenant.getRealm());
+ electricityOptimisationAsset.setRealm(keycloakTestSetup.realmEnergy.getName());
electricityOptimisationAsset.setFinancialWeighting(100);
electricityOptimisationAsset = assetStorageService.merge(electricityOptimisationAsset);
electricityOptimisationAssetId = electricityOptimisationAsset.getId();
@@ -288,7 +288,7 @@ public class ManagerTestSetup extends ManagerSetup {
// ################################ Assets for 'building' realm ###################################
BuildingAsset smartBuilding = new BuildingAsset("Smart building");
- smartBuilding.setRealm(this.realmBuildingTenant);
+ smartBuilding.setRealm(this.realmBuildingName);
smartBuilding.getAttributes().addOrReplace(
new Attribute<>(Asset.LOCATION, SMART_BUILDING_LOCATION),
new Attribute<>(BuildingAsset.STREET, "Kastanjelaan 500"),
@@ -438,7 +438,7 @@ public class ManagerTestSetup extends ManagerSetup {
apartment1 = assetStorageService.merge(apartment1);
apartment1Id = apartment1.getId();
- apartment2Id = UniqueIdentifierGenerator.generateId(tenantBuilding.getRealm() + "Apartment 2");
+ apartment2Id = UniqueIdentifierGenerator.generateId(realmBuilding.getName() + "Apartment 2");
BuildingAsset apartment2 = new BuildingAsset("Apartment 2");
apartment2.setId(apartment2Id);
apartment2.setParent(smartBuilding);
@@ -567,45 +567,45 @@ public class ManagerTestSetup extends ManagerSetup {
// ################################ Link users and assets ###################################
assetStorageService.storeUserAssetLinks(Arrays.asList(
- new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
+ new UserAssetLink(keycloakTestSetup.realmBuilding.getName(),
keycloakTestSetup.testuser3Id,
apartment1Id),
- new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
+ new UserAssetLink(keycloakTestSetup.realmBuilding.getName(),
keycloakTestSetup.testuser3Id,
apartment1LivingroomId),
- new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
+ new UserAssetLink(keycloakTestSetup.realmBuilding.getName(),
keycloakTestSetup.testuser3Id,
apartment1KitchenId),
- new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
+ new UserAssetLink(keycloakTestSetup.realmBuilding.getName(),
keycloakTestSetup.testuser3Id,
apartment1Bedroom1Id),
- new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
+ new UserAssetLink(keycloakTestSetup.realmBuilding.getName(),
keycloakTestSetup.testuser3Id,
apartment1BathroomId),
- new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
+ new UserAssetLink(keycloakTestSetup.realmBuilding.getName(),
keycloakTestSetup.testuser3Id,
apartment1HallwayId)));
assetStorageService.storeUserAssetLinks(Arrays.asList(
- new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
+ new UserAssetLink(keycloakTestSetup.realmBuilding.getName(),
keycloakTestSetup.buildingUserId,
apartment2Id),
- new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
+ new UserAssetLink(keycloakTestSetup.realmBuilding.getName(),
keycloakTestSetup.buildingUserId,
apartment2LivingroomId),
- new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
+ new UserAssetLink(keycloakTestSetup.realmBuilding.getName(),
keycloakTestSetup.buildingUserId,
apartment2BathroomId)));
// ################################ Make users restricted ###################################
ManagerIdentityProvider identityProvider = identityService.getIdentityProvider();
- identityProvider.updateUserRealmRoles(tenantBuilding.getRealm(), keycloakTestSetup.testuser3Id, identityProvider.addRealmRoles(tenantBuilding.getRealm(), keycloakTestSetup.testuser3Id, RESTRICTED_USER_REALM_ROLE));
- identityProvider.updateUserRealmRoles(tenantBuilding.getRealm(), keycloakTestSetup.buildingUserId, identityProvider.addRealmRoles(tenantBuilding.getRealm(), keycloakTestSetup.buildingUserId, RESTRICTED_USER_REALM_ROLE));
+ identityProvider.updateUserRealmRoles(realmBuilding.getName(), keycloakTestSetup.testuser3Id, identityProvider.addRealmRoles(realmBuilding.getName(), keycloakTestSetup.testuser3Id, RESTRICTED_USER_REALM_ROLE));
+ identityProvider.updateUserRealmRoles(realmBuilding.getName(), keycloakTestSetup.buildingUserId, identityProvider.addRealmRoles(realmBuilding.getName(), keycloakTestSetup.buildingUserId, RESTRICTED_USER_REALM_ROLE));
// ################################ Realm smartcity ###################################
CityAsset smartCity = new CityAsset("Smart city");
- smartCity.setRealm(this.realmCityTenant);
+ smartCity.setRealm(this.realmCityName);
smartCity.addOrReplaceAttributes(
new Attribute<>(Asset.LOCATION, SMART_CITY_LOCATION),
new Attribute<>(CityAsset.CITY, "Eindhoven"),
diff --git a/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy
index 2af23711d..81f256ed7 100644
--- a/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy
+++ b/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy
@@ -54,7 +54,7 @@ import org.openremote.model.query.RulesetQuery
import org.openremote.model.rules.AssetRuleset
import org.openremote.model.rules.GlobalRuleset
import org.openremote.model.rules.Ruleset
-import org.openremote.model.rules.TenantRuleset
+import org.openremote.model.rules.RealmRuleset
import org.openremote.model.security.User
import javax.persistence.TypedQuery
@@ -137,7 +137,7 @@ trait ContainerTrait {
// Reset rulesets
if (container.hasService(RulesetStorageService.class) && container.hasService(RulesService.class)) {
def globalRulesets = getRulesets(GlobalRuleset.class)
- def tenantRulesets = getRulesets(TenantRuleset.class)
+ def realmRulesets = getRulesets(RealmRuleset.class)
def assetRulesets = getRulesets(AssetRuleset.class)
def rulesService = container.getService(RulesService.class)
def rulesetStorageService = container.getService(RulesetStorageService.class)
@@ -157,14 +157,14 @@ trait ContainerTrait {
}
}
}
- if (!tenantRulesets.isEmpty()) {
- println("Purging ${tenantRulesets.size()} tenant ruleset(s)")
- tenantRulesets.forEach {
- rulesetStorageService.delete(TenantRuleset.class, it.id)
- def tenantEngine = rulesService.tenantEngines.get(((TenantRuleset) it).realm)
+ if (!realmRulesets.isEmpty()) {
+ println("Purging ${realmRulesets.size()} realm ruleset(s)")
+ realmRulesets.forEach {
+ rulesetStorageService.delete(RealmRuleset.class, it.id)
+ def realmEngine = rulesService.realmEngines.get(((RealmRuleset) it).realm)
def rulesStopped = false
- while (tenantEngine != null && !rulesStopped) {
- rulesStopped = !tenantEngine.deployments.containsKey(it.id)
+ while (realmEngine != null && !rulesStopped) {
+ rulesStopped = !realmEngine.deployments.containsKey(it.id)
if (counter++ > 100) {
throw new IllegalStateException("Failed to purge ruleset: " + it.name)
}
@@ -192,7 +192,7 @@ trait ContainerTrait {
counter = 0
def enginesStopped = false
while (!enginesStopped) {
- enginesStopped = (rulesService.tenantEngines == null || rulesService.tenantEngines.isEmpty()) && (rulesService.assetEngines == null || rulesService.assetEngines.isEmpty())
+ enginesStopped = (rulesService.realmEngines == null || rulesService.realmEngines.isEmpty()) && (rulesService.assetEngines == null || rulesService.assetEngines.isEmpty())
if (counter++ > 100) {
throw new IllegalStateException("Rule engines have failed to stop")
}
@@ -243,9 +243,9 @@ trait ContainerTrait {
println("Re-inserting ${TestFixture.assetRulesets.size()} asset ruleset(s)")
TestFixture.assetRulesets.forEach { rulesetStorageService.merge(it) }
}
- if (!TestFixture.tenantRulesets.isEmpty()) {
- println("Re-inserting ${TestFixture.tenantRulesets.size()} tenant ruleset(s)")
- TestFixture.tenantRulesets.forEach { rulesetStorageService.merge(it) }
+ if (!TestFixture.realmRulesets.isEmpty()) {
+ println("Re-inserting ${TestFixture.realmRulesets.size()} realm ruleset(s)")
+ TestFixture.realmRulesets.forEach { rulesetStorageService.merge(it) }
}
if (!TestFixture.globalRulesets.isEmpty()) {
println("Re-inserting ${TestFixture.globalRulesets.size()} global ruleset(s)")
@@ -275,7 +275,7 @@ trait ContainerTrait {
// Track rules (very basic)
TestFixture.globalRulesets = getRulesets(GlobalRuleset.class)
- TestFixture.tenantRulesets = getRulesets(TenantRuleset.class)
+ TestFixture.realmRulesets = getRulesets(RealmRuleset.class)
TestFixture.assetRulesets = getRulesets(AssetRuleset.class)
// Track assets
@@ -314,13 +314,13 @@ trait ContainerTrait {
}
println("Global rulesets are deployed")
- println("Waiting for tenant rulesets to be deployed")
+ println("Waiting for realm rulesets to be deployed")
i=0
- while (i < 100 && TestFixture.tenantRulesets.stream().filter { it.enabled }.any { !rulesService.tenantEngines.containsKey(it.realm) || !rulesService.tenantEngines.get(it.realm).deployments.containsKey(it.id) }) {
+ while (i < 100 && TestFixture.realmRulesets.stream().filter { it.enabled }.any { !rulesService.realmEngines.containsKey(it.realm) || !rulesService.realmEngines.get(it.realm).deployments.containsKey(it.id) }) {
Thread.sleep(100)
i++
}
- println("Tenant rulesets are deployed")
+ println("Realm rulesets are deployed")
println("Waiting for asset rulesets to be deployed")
i=0
@@ -360,12 +360,12 @@ trait ContainerTrait {
return rulesetStorageService.findAll(clazz, new RulesetQuery().setFullyPopulate(true))
}
- List<TenantRuleset> getTenantRulesets() {
+ List<RealmRuleset> getRealmRulesets() {
if (!container.hasService(RulesService.class)) {
return Collections.emptyList()
}
RulesService rulesService = container.getService(RulesService.class)
- return rulesService.tenantEngines.values().collect {it.deployments.values()}.flatten {it.ruleset}
+ return rulesService.realmEngines.values().collect {it.deployments.values()}.flatten {it.ruleset}
}
List<AssetRuleset> getAssetRulesets() {
@@ -373,7 +373,7 @@ trait ContainerTrait {
return Collections.emptyList()
}
RulesService rulesService = container.getService(RulesService.class)
- return rulesService.tenantEngines.values().collect {it.deployments.values()}.flatten {it.ruleset}
+ return rulesService.realmEngines.values().collect {it.deployments.values()}.flatten {it.ruleset}
}
List<Asset> getAssets() {
diff --git a/test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovy
index af5604505..9320ab69e 100644
--- a/test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovy
+++ b/test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovy
@@ -58,7 +58,7 @@ trait ManagerContainerTrait extends ContainerTrait {
def rulesService = this.container.getService(RulesService.class)
- return (rulesService.globalEngine == null || rulesService.globalEngine.fireTimer == null) && rulesService.tenantEngines.values().every {it.fireTimer == null} && rulesService.assetEngines.values().every {it.fireTimer == null}
+ return (rulesService.globalEngine == null || rulesService.globalEngine.fireTimer == null) && rulesService.realmEngines.values().every {it.fireTimer == null} && rulesService.assetEngines.values().every {it.fireTimer == null}
}
/**
diff --git a/test/src/testFixtures/java/org/openremote/test/TestFixture.java b/test/src/testFixtures/java/org/openremote/test/TestFixture.java
index 5112a11da..474037888 100644
--- a/test/src/testFixtures/java/org/openremote/test/TestFixture.java
+++ b/test/src/testFixtures/java/org/openremote/test/TestFixture.java
@@ -26,7 +26,7 @@ import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.gateway.GatewayConnection;
import org.openremote.model.rules.AssetRuleset;
import org.openremote.model.rules.GlobalRuleset;
-import org.openremote.model.rules.TenantRuleset;
+import org.openremote.model.rules.RealmRuleset;
import org.openremote.model.security.User;
import org.spockframework.runtime.extension.IGlobalExtension;
@@ -40,7 +40,7 @@ public class TestFixture implements IGlobalExtension {
// Store the container here to allow stopping it after all tests run
protected static Container container;
public static List<GlobalRuleset> globalRulesets;
- public static List<TenantRuleset> tenantRulesets;
+ public static List<RealmRuleset> realmRulesets;
public static List<AssetRuleset> assetRulesets;
public static List<GatewayConnection> gatewayConnections;
public static List<Asset<?>> assets;
diff --git a/ui/app/console_loader/src/pages/page-mobile-geofences.ts b/ui/app/console_loader/src/pages/page-mobile-geofences.ts
index 7e689fb93..a56d7addf 100644
--- a/ui/app/console_loader/src/pages/page-mobile-geofences.ts
+++ b/ui/app/console_loader/src/pages/page-mobile-geofences.ts
@@ -304,7 +304,7 @@ export class PageMobileGeofences extends Page<AppStateKeyed> {
}
protected getGeoNotifications() {
- manager.rest.api.RulesResource.getTenantRulesets(manager.config.realm, {fullyPopulate: true}).then((response: any) => {
+ manager.rest.api.RulesResource.getRealmRulesets(manager.config.realm, {fullyPopulate: true}).then((response: any) => {
const mapItemDefinition: JsonRulesetDefinition = {
rules: []
};
diff --git a/ui/app/manager/src/pages/page-map.ts b/ui/app/manager/src/pages/page-map.ts
index 3b54a7682..b11d2be5a 100644
--- a/ui/app/manager/src/pages/page-map.ts
+++ b/ui/app/manager/src/pages/page-map.ts
@@ -202,8 +202,8 @@ export class PageMap extends Page<MapStateKeyed> {
let response: GenericAxiosResponse<Asset[]>;
const attrsOfInterest = this.getAttributesOfInterest();
const assetQuery: AssetQuery = this.config && this.config.assetQuery ? this.config.assetQuery : {
- tenant: {
- realm: realm
+ realm: {
+ name: realm
},
select: {
attributes: attrsOfInterest,
diff --git a/ui/app/manager/src/pages/page-provisioning.ts b/ui/app/manager/src/pages/page-provisioning.ts
index 7222a085d..0ce936944 100644
--- a/ui/app/manager/src/pages/page-provisioning.ts
+++ b/ui/app/manager/src/pages/page-provisioning.ts
@@ -293,7 +293,7 @@ export class PageProvisioning extends Page<AppStateKeyed> {
return true;
};
- const realmResponse = await manager.rest.api.TenantResource.getAll();
+ const realmResponse = await manager.rest.api.RealmResource.getAll();
if (!responseAndStateOK(realmResponse, i18next.t("loadFailedRealms"))) {
return;
@@ -311,7 +311,7 @@ export class PageProvisioning extends Page<AppStateKeyed> {
return;
}
- this._realmOptions = realmResponse.data.map(r => r.realm);
+ this._realmOptions = realmResponse.data.map(r => r.name);
this._roleOptions = rolesResponse.data.filter(role => !role.composite).map(r => [r.name, r.name] as [string, string]).sort();
this._configs = provisioningResponse.data;
}
diff --git a/ui/app/manager/src/pages/page-realms.ts b/ui/app/manager/src/pages/page-realms.ts
index edb04b9e4..9a1a5c677 100644
--- a/ui/app/manager/src/pages/page-realms.ts
+++ b/ui/app/manager/src/pages/page-realms.ts
@@ -1,22 +1,18 @@
-import {
- css,
- html,
- PropertyValues,
- TemplateResult,
- unsafeCSS,
-} from "lit";
+import {css, html, PropertyValues, TemplateResult, unsafeCSS,} from "lit";
+import {createSelector} from "reselect";
+import {createRef, Ref, ref} from "lit/directives/ref.js";
import {customElement, property} from "lit/decorators.js";
-import manager, { OREvent, DefaultColor3 } from "@openremote/core";
+import manager, {DefaultColor3} from "@openremote/core";
import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
-import { Store } from "@reduxjs/toolkit";
-import {Page, PageProvider} from "@openremote/or-app";
-import {AppStateKeyed} from "@openremote/or-app";
-import { ClientRole, Tenant } from "@openremote/model";
-import { i18next } from "@openremote/or-translate";
-import { OrIcon } from "@openremote/or-icon";
-import { InputType, OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
-import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
+import {Store} from "@reduxjs/toolkit";
+import {AppStateKeyed, Page, PageProvider} from "@openremote/or-app";
+import {ClientRole, Realm} from "@openremote/model";
+import {i18next} from "@openremote/or-translate";
+import {OrIcon} from "@openremote/or-icon";
+import {InputType, OrInputChangedEvent, OrMwcInput} from "@openremote/or-mwc-components/or-mwc-input";
+import {DialogAction, OrMwcDialog, showDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
+import {showSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";
const tableStyle = require("@material/data-table/dist/mdc.data-table.css");
@@ -216,21 +212,30 @@ export class PageRealms extends Page<AppStateKeyed> {
}
@property()
- protected _tenants: Tenant[] = [];
+ protected _realms: Realm[] = [];
+
+ protected _realmSelector = (state: AppStateKeyed) => state.app.realm || manager.displayRealm;
get name(): string {
return "realm_plural";
}
+ protected getRealmState = createSelector(
+ [this._realmSelector],
+ async (realm) => {
+ this.requestUpdate();
+ }
+ )
+
constructor(store: Store<AppStateKeyed>) {
super(store);
- this._getTenants();
+ this._getRealms();
}
public shouldUpdate(_changedProperties: PropertyValues): boolean {
if (_changedProperties.has("realm")) {
- this._getTenants();
+ this._getRealms();
}
return super.shouldUpdate(_changedProperties);
@@ -269,49 +274,47 @@ export class PageRealms extends Page<AppStateKeyed> {
</tr>
</thead>
<tbody class="mdc-data-table__content">
- ${this._tenants.map(
- (tenant, index) => {
+ ${this._realms.map(
+ (realm, index) => {
return html`
<tr id="mdc-data-table-row-${index}" class="mdc-data-table__row" @click="${(ev) => this.expanderToggle(ev, index)}">
<td class="padded-cell mdc-data-table__cell"
>
<or-icon id="mdc-data-table-icon-${index}" icon="chevron-right"></or-icon>
- <span>${tenant.realm}</span>
+ <span>${realm.name}</span>
</td>
<td class="padded-cell mdc-data-table__cell">
- ${tenant.displayName}
+ ${realm.displayName}
</td>
<td class="padded-cell hide-mobile mdc-data-table__cell large">
- ${tenant.enabled ? "Enabled" : "Disabled"}
+ ${realm.enabled ? "Enabled" : "Disabled"}
</td>
</tr>
- <tr id="attribute-meta-row-${index}" class="attribute-meta-row${!tenant.id ? " expanded" : ""}">
+ <tr id="attribute-meta-row-${index}" class="attribute-meta-row${!realm.id ? " expanded" : ""}">
<td colspan="100%">
<div class="meta-item-container">
<div class="row">
<div class="column">
- <or-mwc-input ?readonly="${tenant.id}" .label="${i18next.t("realm")}" .type="${InputType.TEXT}" min="1" required .value="${tenant.realm}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => tenant.realm = e.detail.value}"></or-mwc-input>
- <or-mwc-input ?readonly="${readonly}" .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" .value="${tenant.enabled}" @or-mwc-input-changed="${(e: OrInputChangedEvent) =>tenant.enabled = e.detail.value}"></or-mwc-input>
+ <or-mwc-input ?readonly="${realm.id}" .label="${i18next.t("realm")}" .type="${InputType.TEXT}" min="1" required .value="${realm.name}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => realm.name = e.detail.value}"></or-mwc-input>
+ <or-mwc-input ?readonly="${readonly}" .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" .value="${realm.enabled}" @or-mwc-input-changed="${(e: OrInputChangedEvent) =>realm.enabled = e.detail.value}"></or-mwc-input>
</div>
<div class="column">
- <or-mwc-input .label="${i18next.t("displayName")}" .type="${InputType.TEXT}" min="1" required .value="${tenant.displayName}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => tenant.displayName = e.detail.value}"></or-mwc-input>
+ <or-mwc-input .label="${i18next.t("displayName")}" .type="${InputType.TEXT}" min="1" required .value="${realm.displayName}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => realm.displayName = e.detail.value}"></or-mwc-input>
</div>
</div>
-
-
<div class="row" style="margin-bottom: 0;">
- ${tenant.id && !readonly ? html`
- ${tenant.realm !== "master" ? html`
- <or-mwc-input hidden .label="${i18next.t("delete")}" .type="${InputType.BUTTON}" @click="${() => this._deleteTenant(tenant)}"></or-mwc-input>
+ ${realm.id && !readonly ? html`
+ ${realm.name !== "master" && manager.isSuperUser() ? html`
+ <or-mwc-input .label="${i18next.t("delete")}" .type="${InputType.BUTTON}" .disabled="${manager.displayRealm === realm.name}" @click="${() => this._deleteRealm(realm)}"></or-mwc-input>
` : ``}
- <or-mwc-input style="margin-left: auto;" .label="${i18next.t("save")}" .type="${InputType.BUTTON}" @click="${() => this._updateTenant(tenant)}"></or-mwc-input>
+ <or-mwc-input style="margin-left: auto;" .label="${i18next.t("save")}" .type="${InputType.BUTTON}" @click="${() => this._updateRealm(realm)}"></or-mwc-input>
` : html`
- <or-mwc-input .label="${i18next.t("cancel")}" .type="${InputType.BUTTON}" @click="${() => {this._tenants.splice(-1,1); this._tenants = [...this._tenants]}}"></or-mwc-input>
- <or-mwc-input style="margin-left: auto;" .label="${i18next.t("create")}" .type="${InputType.BUTTON}" @click="${() => this._createTenant(tenant)}"></or-mwc-input>
+ <or-mwc-input .label="${i18next.t("cancel")}" .type="${InputType.BUTTON}" @click="${() => {this._realms.splice(-1,1); this._realms = [...this._realms]}}"></or-mwc-input>
+ <or-mwc-input style="margin-left: auto;" .label="${i18next.t("create")}" .type="${InputType.BUTTON}" @click="${() => this._createRealm(realm)}"></or-mwc-input>
`}
</div>
</div>
@@ -319,10 +322,10 @@ export class PageRealms extends Page<AppStateKeyed> {
</tr>
`
})}
- ${this._tenants.length > 0 && !!this._tenants[this._tenants.length -1].id && !readonly ? html`
+ ${this._realms.length > 0 && !!this._realms[this._realms.length -1].id && !readonly ? html`
<tr class="mdc-data-table__row">
<td colspan="100%">
- <a class="button" @click="${() => this._tenants = [...this._tenants, {displayName:"", enabled: true}]}"><or-icon icon="plus"></or-icon>${i18next.t("add")} ${i18next.t("realm")}</a>
+ <a class="button" @click="${() => this._realms = [...this._realms, {displayName:"", enabled: true}]}"><or-icon icon="plus"></or-icon>${i18next.t("add")} ${i18next.t("realm")}</a>
</td>
</tr>
` : ``}
@@ -337,18 +340,19 @@ export class PageRealms extends Page<AppStateKeyed> {
}
public stateChanged(state: AppStateKeyed) {
+ this.getRealmState(state);
}
- protected async _getTenants() {
- const response = await manager.rest.api.TenantResource.getAll();
- this._tenants = response.data;
- return this._tenants;
+ protected async _getRealms() {
+ const response = await manager.rest.api.RealmResource.getAll();
+ this._realms = response.data;
+ return this._realms;
}
- private async _updateTenant(tenant) {
- const response = await manager.rest.api.TenantResource.update(tenant.realm, tenant);
+ private async _updateRealm(realm) {
+ const response = await manager.rest.api.RealmResource.update(realm.name, realm);
const data: any = response.data;
- this._tenants = this._tenants.map(t => {
+ this._realms = this._realms.map(t => {
if (t.id === data.id) {
return data;
}
@@ -356,25 +360,83 @@ export class PageRealms extends Page<AppStateKeyed> {
})
}
- private async _createTenant(tenant) {
- await manager.rest.api.TenantResource.create(tenant).then(response => {
+ private async _createRealm(realm) {
+ await manager.rest.api.RealmResource.create(realm).then(response => {
//TODO improve this so that header realm picker is updated
window.location.reload();
});
}
- private _deleteTenant(tenant) {
- showOkCancelDialog(i18next.t("delete"), i18next.t("deleteTenantConfirm"), i18next.t("delete"))
- .then((ok) => {
- if (ok) {
- this._doDelete(tenant);
- }
- });
+ private _deleteRealm(realm: Realm) {
+
+ let confirmedName = "";
+ let okBtnRef: Ref<OrMwcInput> = createRef();
+
+ const doDelete = async (dialog: OrMwcDialog) => {
+ try {
+ await manager.rest.api.RealmResource.delete(realm.name);
+ this._realms = this._realms.filter(r => r !== realm);
+ } catch (e) {
+ showSnackbar(undefined, i18next.t("realmDeleteFailed"), i18next.t("dismiss"));
+ }
+ };
+
+ const inputChanged = (value: string) => {
+ confirmedName = value;
+ if (okBtnRef.value) {
+ okBtnRef.value.disabled = confirmedName !== realm.name;
+ }
+ };
+
+ const dialogContent = html`<div>
+ <p style="text-align: justify; font-weight: bold;">${i18next.t("realmDeleteConfirm", {realmName: realm.name})}</p>
+ <or-mwc-input .type="${InputType.TEXT}" @input=${(ev: Event) => inputChanged((ev.target as OrMwcInput).nativeValue)} .label="${i18next.t("realm")}"></or-mwc-input>
+ </div>`;
+
+ const dialogActions: DialogAction[] = [
+ {
+ actionName: "ok",
+ disabled: true,
+ content: html`<or-mwc-input .type="${InputType.BUTTON}" ${ref(okBtnRef)} @click="${(ev: MouseEvent) => {if ((ev.currentTarget as OrMwcInput).disabled) ev.stopPropagation()}}" disabled .label="${i18next.t("ok")}"></or-mwc-input>`,
+ action: doDelete
+ },
+ {
+ default: true,
+ actionName: "cancel",
+ content: i18next.t("cancel")
+ }
+ ];
+
+ const dialog = showDialog(new OrMwcDialog()
+ .setContent(dialogContent)
+ .setActions(dialogActions)
+ .setStyles(html`
+ <style>
+ .mdc-dialog__surface {
+ display: flex;
+ width: 400px;
+ max-width: 100%;
+ overflow: visible;
+ overflow-x: visible !important;
+ overflow-y: visible !important;
+ }
+ #dialog-content {
+ text-align: center;
+ flex: 1;
+ overflow: visible;
+ min-height: 0;
+ }
+ or-asset-tree {
+ height: 100%;
+ }
+ </style>
+ `)
+ .setDismissAction(null));
}
- private async _doDelete(tenant) {
- await manager.rest.api.TenantResource.delete(tenant.realm);
- this._tenants = [...this._tenants.filter(u => u.id != tenant.id)];
+ private async _doDelete(realm) {
+ await manager.rest.api.RealmResource.delete(realm.realm);
+ this._realms = [...this._realms.filter(u => u.id != realm.id)];
}
private expanderToggle(ev: MouseEvent, index:number) {
@@ -389,3 +451,4 @@ export class PageRealms extends Page<AppStateKeyed> {
}
}
}
+
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index b04a2788a..607041013 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -292,13 +292,13 @@ export class PageUsers extends Page<AppStateKeyed> {
return;
}
- const tenantResponse = await manager.rest.api.TenantResource.get(manager.displayRealm);
+ const realmResponse = await manager.rest.api.RealmResource.get(manager.displayRealm);
- if (!this.responseAndStateOK(stateChecker, tenantResponse, i18next.t("loadFailedRoles"))) {
+ if (!this.responseAndStateOK(stateChecker, realmResponse, i18next.t("loadFailedRoles"))) {
return;
}
- const usersResponse = await manager.rest.api.UserResource.query({tenantPredicate: {realm: manager.displayRealm}} as UserQuery);
+ const usersResponse = await manager.rest.api.UserResource.query({realmPredicate: {name: manager.displayRealm}} as UserQuery);
if (!this.responseAndStateOK(stateChecker, usersResponse, i18next.t("loadFailedUsers"))) {
return;
@@ -306,7 +306,7 @@ export class PageUsers extends Page<AppStateKeyed> {
this._compositeRoles = roleResponse.data.filter(role => role.composite).sort(Util.sortByString(role => role.name));
this._roles = roleResponse.data.filter(role => !role.composite).sort(Util.sortByString(role => role.name));
- this._realmRoles = (tenantResponse.data.realmRoles || []).sort(Util.sortByString(role => role.name));
+ this._realmRoles = (realmResponse.data.realmRoles || []).sort(Util.sortByString(role => role.name));
this._users = usersResponse.data.filter(user => !user.serviceAccount).sort(Util.sortByString(u => u.username));
this._serviceUsers = usersResponse.data.filter(user => user.serviceAccount).sort(Util.sortByString(u => u.username));
this._loading = false;
diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.ts
index 7560ff750..84ee323f2 100644
--- a/ui/component/or-app/src/index.ts
+++ b/ui/component/or-app/src/index.ts
@@ -23,7 +23,7 @@ import {AnyAction, Store, Unsubscribe} from "@reduxjs/toolkit";
import {AppStateKeyed, updatePage, updateRealm} from "./app";
import { InputType, OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
import { ORError } from "@openremote/core";
-import { Tenant } from "@openremote/model";
+import { Realm } from "@openremote/model";
const DefaultLogo = require("../images/logo.svg");
const DefaultMobileLogo = require("../images/logo-mobile.svg");
@@ -96,7 +96,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
@state()
protected _activeMenu?: string;
- protected _realms!: Tenant[];
+ protected _realms!: Realm[];
protected _store: Store<S, AnyAction>;
protected _storeUnsubscribe!: Unsubscribe;
@@ -223,7 +223,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
}
// Load available realm info
- const response = await manager.rest.api.TenantResource.getAccessible();
+ const response = await manager.rest.api.RealmResource.getAccessible();
this._realms = response.data;
let realm: string | null | undefined = undefined;
@@ -231,7 +231,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
if (manager.isSuperUser()) {
// Look in session storage
realm = window.sessionStorage.getItem("realm");
- if (realm && !this._realms.some(r => r.realm === realm)) {
+ if (realm && !this._realms.some(r => r.name === realm)) {
realm = undefined;
}
}
diff --git a/ui/component/or-app/src/or-header.ts b/ui/component/or-app/src/or-header.ts
index 5bec0b572..fb19d4a33 100644
--- a/ui/component/or-app/src/or-header.ts
+++ b/ui/component/or-app/src/or-header.ts
@@ -14,7 +14,7 @@ import "@openremote/or-mwc-components/or-mwc-dialog";
import "@openremote/or-icon";
import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";
import {ListItem} from "@openremote/or-mwc-components/or-mwc-list";
-import {Tenant} from "@openremote/model";
+import {Realm} from "@openremote/model";
import {AppStateKeyed, router, updateRealm} from "./index";
import {AnyAction, Store} from "@reduxjs/toolkit";
import {ThunkMiddleware} from "redux-thunk";
@@ -335,7 +335,7 @@ export class OrHeader extends LitElement {
}
@property({type: Array})
- public realms!: Tenant[];
+ public realms!: Realm[];
@property({type: String})
public realm!: string;
@@ -438,7 +438,7 @@ export class OrHeader extends LitElement {
protected _getRealmMenu(callback: (realm: string) => void): TemplateResult {
- const currentRealm = this.realms.find((t) => t.realm === this.realm);
+ const currentRealm = this.realms.find((t) => t.name === this.realm);
let realmTemplate = html`
<div id="realm-picker">
@@ -453,7 +453,7 @@ export class OrHeader extends LitElement {
const menuItems = this.realms.map((r) => {
return {
text: r.displayName!,
- value: r.realm!
+ value: r.name!
} as ListItem;
});
@@ -461,7 +461,7 @@ export class OrHeader extends LitElement {
${getContentWithMenuTemplate(
realmTemplate,
menuItems,
- currentRealm ? currentRealm.realm : undefined,
+ currentRealm ? currentRealm.name : undefined,
(value) => callback(value as string))}
`;
}
diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.ts
index e355be6f2..05a00d8b6 100644
--- a/ui/component/or-asset-tree/src/index.ts
+++ b/ui/component/or-asset-tree/src/index.ts
@@ -1402,8 +1402,8 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
this._loading = true;
const query: AssetQuery = {
- tenant: {
- realm: manager.displayRealm
+ realm: {
+ name: manager.displayRealm
},
select: { // Just need the basic asset info
attributes: []
diff --git a/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts b/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts
index 50d391bdc..32c050108 100644
--- a/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts
+++ b/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts
@@ -58,8 +58,8 @@ export function loadAgents(): PromiseLike<Agent[]> {
}
loadingPromise = manager.rest.api.AssetResource.queryAssets({
- tenant: {
- realm: manager.displayRealm
+ realm: {
+ name: manager.displayRealm
},
types: [
"Agent"
diff --git a/ui/component/or-mwc-components/src/or-mwc-dialog.ts b/ui/component/or-mwc-components/src/or-mwc-dialog.ts
index 63b67fbb0..2c2a80f3f 100644
--- a/ui/component/or-mwc-components/src/or-mwc-dialog.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-dialog.ts
@@ -3,7 +3,7 @@ import {customElement, property, query} from "lit/decorators.js";
import {MDCDialog} from "@material/dialog";
import "@openremote/or-translate";
import "./or-mwc-input";
-import {InputType} from "./or-mwc-input";
+import {InputType, OrMwcInput} from "./or-mwc-input";
import {i18next} from "@openremote/or-translate";
import {Util} from "@openremote/core";
@@ -289,7 +289,7 @@ export class OrMwcDialog extends LitElement {
${this.actions ? this.actions.map((action) => {
return html`
<div class="mdc-button mdc-dialog__button" ?data-mdc-dialog-button-default="${action.default}" data-mdc-dialog-action="${action.actionName}">
- ${typeof(action.content) === "string" ? html`<or-mwc-input .type="${InputType.BUTTON}" .disabled="${action.disabled}" .label="${action.content}"></or-mwc-input>` : action.content}
+ ${typeof(action.content) === "string" ? html`<or-mwc-input .type="${InputType.BUTTON}" @click="${(ev: MouseEvent) => {if ((ev.currentTarget as OrMwcInput).disabled) ev.stopPropagation()}}" .disabled="${action.disabled}" .label="${action.content}"></or-mwc-input>` : action.content}
</div>`;
}) : ``}
</footer>
diff --git a/ui/component/or-mwc-components/src/or-mwc-input.ts b/ui/component/or-mwc-components/src/or-mwc-input.ts
index d0dc592d7..d5cbf934b 100644
--- a/ui/component/or-mwc-components/src/or-mwc-input.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-input.ts
@@ -770,6 +770,12 @@ export class OrMwcInput extends LitElement {
@property({type: Boolean})
public trailingSpace: boolean = false;
+ public get nativeValue(): any {
+ if (this._mdcComponent) {
+ return (this._mdcComponent as any).value;
+ }
+ }
+
/* TEXT INPUT STYLES END */
protected _mdcComponent?: MDCComponent<any>;
diff --git a/ui/component/or-rules/src/flow-viewer/services/exporter.ts b/ui/component/or-rules/src/flow-viewer/services/exporter.ts
index 5ad660ca2..b903b4cc9 100644
--- a/ui/component/or-rules/src/flow-viewer/services/exporter.ts
+++ b/ui/component/or-rules/src/flow-viewer/services/exporter.ts
@@ -11,7 +11,7 @@ export class Exporter {
return JSON.parse(json);
}
- public collectionToRuleset(collection: NodeCollection, type: "global" | "asset" | "tenant") {
+ public collectionToRuleset(collection: NodeCollection, type: "global" | "asset" | "realm") {
const ruleset: Ruleset = {
lang: RulesetLang.FLOW,
name: collection.name,
diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.ts
index 8f7357204..3f24ed067 100644
--- a/ui/component/or-rules/src/index.ts
+++ b/ui/component/or-rules/src/index.ts
@@ -373,7 +373,7 @@ export const getAssetTypes: () => Promise<string[]> = async () => {
// select: {
// attributes: []
// },
- // tenant: {
+ // realm: {
// realm: manager.displayRealm
// },
// recursive: true
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts
index 17d54a601..ca3197b62 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts
@@ -67,7 +67,7 @@ export class OrRuleActionNotification extends LitElement {
let allowedTargetTypes: [NotificationTargetType, string][] = [
[NotificationTargetType.USER, i18next.t("user_plural")],
[NotificationTargetType.ASSET, i18next.t("asset_plural")],
- [NotificationTargetType.TENANT, i18next.t("tenant_plural")],
+ [NotificationTargetType.REALM, i18next.t("realm_plural")],
[NotificationTargetType.CUSTOM, i18next.t("custom")]
];
@@ -122,7 +122,7 @@ export class OrRuleActionNotification extends LitElement {
let value: string | undefined;
if (targetType === NotificationTargetType.USER) {
- targetValuesGenerator = manager.rest.api.UserResource.query({tenant: manager.displayRealm} as UserQuery).then(
+ targetValuesGenerator = manager.rest.api.UserResource.query({realm: manager.displayRealm} as UserQuery).then(
(usersResponse) => usersResponse.data.map((user) => [user.id!, user.username!])
);
label = i18next.t("user_plural");
@@ -135,7 +135,7 @@ export class OrRuleActionNotification extends LitElement {
|| userQuery.assetPredicate
|| userQuery.limit
|| userQuery.pathPredicate
- || userQuery.tenantPredicate) {
+ || userQuery.realmPredicate) {
console.warn("Rule action user target query is unsupported: " + JSON.stringify(userQuery, null, 2));
return;
}
diff --git a/ui/component/or-rules/src/or-rule-list.ts b/ui/component/or-rules/src/or-rule-list.ts
index 2a9e10941..f8de0f463 100644
--- a/ui/component/or-rules/src/or-rule-list.ts
+++ b/ui/component/or-rules/src/or-rule-list.ts
@@ -1,6 +1,6 @@
import {css, html, LitElement, PropertyValues, TemplateResult} from "lit";
import {customElement, property} from "lit/decorators.js";
-import {CalendarEvent, ClientRole, RulesetLang, RulesetUnion, TenantRuleset, WellknownRulesetMetaItems} from "@openremote/model";
+import {CalendarEvent, ClientRole, RulesetLang, RulesetUnion, RealmRuleset, WellknownRulesetMetaItems} from "@openremote/model";
import "@openremote/or-translate";
import manager, {Util} from "@openremote/core";
import "@openremote/or-mwc-components/or-mwc-input";
@@ -445,7 +445,7 @@ export class OrRuleList extends translate(i18next)(LitElement) {
}
protected _onAddClicked(lang: RulesetLang) {
- const type = this._globalRulesets ? "global": "tenant";
+ const type = this._globalRulesets ? "global": "realm";
const realm = manager.isSuperUser() ? manager.displayRealm : manager.config.realm;
const ruleset: RulesetUnion = {
id: 0,
@@ -467,8 +467,8 @@ export class OrRuleList extends translate(i18next)(LitElement) {
}
// Ensure config hasn't messed with certain values
- if (type === "tenant") {
- (ruleset as TenantRuleset).realm = realm;
+ if (type === "realm") {
+ (ruleset as RealmRuleset).realm = realm;
}
const detail = {
@@ -519,8 +519,8 @@ export class OrRuleList extends translate(i18next)(LitElement) {
case "asset":
response = await manager.rest.api.RulesResource.deleteAssetRuleset(ruleset.id!);
break;
- case "tenant":
- response = await manager.rest.api.RulesResource.deleteTenantRuleset(ruleset.id!);
+ case "realm":
+ response = await manager.rest.api.RulesResource.deleteRealmRuleset(ruleset.id!);
break;
case "global":
response = await manager.rest.api.RulesResource.deleteGlobalRuleset(ruleset.id!);
@@ -596,7 +596,7 @@ export class OrRuleList extends translate(i18next)(LitElement) {
language: this._allowedLanguages
}
try {
- const response = await manager.rest.api.RulesResource.getTenantRulesets(this._getRealm() || manager.displayRealm, params);
+ const response = await manager.rest.api.RulesResource.getRealmRulesets(this._getRealm() || manager.displayRealm, params);
if (response && response.data) {
this._buildTreeNodes(response.data, sortFunction);
}
@@ -606,7 +606,7 @@ export class OrRuleList extends translate(i18next)(LitElement) {
}
}
- protected _buildTreeNodes(rulesets: TenantRuleset[], sortFunction: (a: RulesetNode, b: RulesetNode) => number) {
+ protected _buildTreeNodes(rulesets: RealmRuleset[], sortFunction: (a: RulesetNode, b: RulesetNode) => number) {
if (!rulesets || rulesets.length === 0) {
this._nodes = [];
} else {
diff --git a/ui/component/or-rules/src/or-rule-viewer.ts b/ui/component/or-rules/src/or-rule-viewer.ts
index 2741ab93b..d542d64f0 100644
--- a/ui/component/or-rules/src/or-rule-viewer.ts
+++ b/ui/component/or-rules/src/or-rule-viewer.ts
@@ -255,11 +255,11 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {
response = await manager.rest.api.RulesResource.updateAssetRuleset(ruleset.id!, ruleset);
}
break;
- case "tenant":
+ case "realm":
if (isNew) {
- response = await manager.rest.api.RulesResource.createTenantRuleset(ruleset);
+ response = await manager.rest.api.RulesResource.createRealmRuleset(ruleset);
} else {
- response = await manager.rest.api.RulesResource.updateTenantRuleset(ruleset.id!, ruleset);
+ response = await manager.rest.api.RulesResource.updateRealmRuleset(ruleset.id!, ruleset);
}
break;
case "global":