Skip to content

armgit / core

Public Imported from GitHub
0

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

Rules resource now returns IDs on create

Rich Turner3a7210bdd9c6
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 061020b58..7bc0a6e15 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
@@ -191,11 +191,12 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
/* ################################################################################################# */
@Override
- public void createGlobalRuleset(@BeanParam RequestParams requestParams, GlobalRuleset ruleset) {
+ public long createGlobalRuleset(@BeanParam RequestParams requestParams, GlobalRuleset ruleset) {
if (!isSuperUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- rulesetStorageService.merge(ruleset);
+ ruleset = rulesetStorageService.merge(ruleset);
+ return ruleset.getId();
}
@Override
@@ -232,7 +233,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
/* ################################################################################################# */
@Override
- public void createTenantRuleset(@BeanParam RequestParams requestParams, TenantRuleset ruleset) {
+ public long createTenantRuleset(@BeanParam RequestParams requestParams, TenantRuleset ruleset) {
Tenant tenant = identityService.getIdentityProvider().getTenant(ruleset.getRealm());
if (tenant == null) {
throw new WebApplicationException(BAD_REQUEST);
@@ -241,7 +242,8 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
LOG.fine("Forbidden access for user '" + getUsername() + "': " + tenant);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- rulesetStorageService.merge(ruleset);
+ ruleset = rulesetStorageService.merge(ruleset);
+ return ruleset.getId();
}
@Override
@@ -303,7 +305,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
/* ################################################################################################# */
@Override
- public void createAssetRuleset(@BeanParam RequestParams requestParams, AssetRuleset ruleset) {
+ public long createAssetRuleset(@BeanParam RequestParams requestParams, AssetRuleset ruleset) {
String assetId = ruleset.getAssetId();
if (assetId == null || assetId.length() == 0) {
throw new WebApplicationException("Missing asset identifier value", BAD_REQUEST);
@@ -318,7 +320,8 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
if (isRestrictedUser() && !assetStorageService.isUserAsset(getUserId(), asset.getId())) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- rulesetStorageService.merge(ruleset);
+ ruleset = rulesetStorageService.merge(ruleset);
+ return ruleset.getId();
}
@Override
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 2c70aba02..1ed3a32e9 100644
--- a/model/src/main/java/org/openremote/model/rules/RulesResource.java
+++ b/model/src/main/java/org/openremote/model/rules/RulesResource.java
@@ -111,7 +111,7 @@ public interface RulesResource {
@SuccessStatusCode(204)
@RolesAllowed({"write:rules"})
@SuppressWarnings("unusable-by-js")
- void createGlobalRuleset(@BeanParam RequestParams requestParams, @Valid GlobalRuleset ruleset);
+ long createGlobalRuleset(@BeanParam RequestParams requestParams, @Valid GlobalRuleset ruleset);
/**
* Retrieve a global ruleset. Only the superuser can perform this operation, a 403 status is returned if a regular
@@ -162,7 +162,7 @@ public interface RulesResource {
@SuccessStatusCode(204)
@RolesAllowed({"write:rules"})
@SuppressWarnings("unusable-by-js")
- void createTenantRuleset(@BeanParam RequestParams requestParams, @Valid TenantRuleset ruleset);
+ long createTenantRuleset(@BeanParam RequestParams requestParams, @Valid TenantRuleset ruleset);
/**
* Retrieve a tenant ruleset. The superuser can retrieve rules of all realms, a 403 status is returned if a regular
@@ -214,7 +214,7 @@ public interface RulesResource {
@SuccessStatusCode(204)
@RolesAllowed({"write:rules"})
@SuppressWarnings("unusable-by-js")
- void createAssetRuleset(@BeanParam RequestParams requestParams, @Valid AssetRuleset ruleset);
+ long createAssetRuleset(@BeanParam RequestParams requestParams, @Valid AssetRuleset ruleset);
/**
* Retrieve an asset ruleset. The superuser can retrieve rules of all assets, a 403 status is returned if a regular