100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
AssetResource delete now supports multiple assets
Rich Turnerfd255078765c
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.javaindex 16d42436f..209cc64c8 100644--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java@@ -340,7 +340,7 @@ public class AssetEditActivityview.setFormBusy(true);clearViewMessages();environment.getApp().getRequests().send(- requestParams -> assetResource.delete(requestParams, this.assetId),+ requestParams -> assetResource.delete(requestParams, Collections.singletonList(this.assetId)),204,() -> {view.setFormBusy(false);diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex 8c84af3ba..8017bc5e8 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -289,7 +289,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse@Overridepublic boolean deleteAsset(String assetId) {LOG.fine("Deleting protocol-provided: " + assetId);- return assetStorageService.delete(assetId);+ return assetStorageService.delete(Collections.singletonList(assetId));}@Overridediff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex f5df3378b..9929881ae 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -505,20 +505,27 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour}@Override- public void delete(RequestParams requestParams, String assetId) {+ public void delete(RequestParams requestParams, List<String> assetIds) {try {+ if (assetIds == null || assetIds.isEmpty()) {+ throw new WebApplicationException(BAD_REQUEST);+ }+if (isRestrictedUser()) {throw new WebApplicationException(FORBIDDEN);}- Asset asset = assetStorageService.find(assetId, true);- if (asset == null)+ List<Asset> assets = assetStorageService.findAll(new AssetQuery().ids(assetIds.toArray(new String[0])).select(Select.selectExcludePathAndAttributes()));+ if (assets == null || assets.size() != assetIds.size()) {+ LOG.fine("Request to delete one or more invalid assets");return;+ }- if (!isTenantActiveAndAccessible(asset)) {- LOG.fine("Forbidden access for user '" + getUsername() + "', can't delete: " + asset);+ if (assets.stream().anyMatch(asset -> !isTenantActiveAndAccessible(asset))) {+ LOG.fine("Forbidden access for user '" + getUsername() + "', can't delete requested assets");throw new WebApplicationException(FORBIDDEN);}- if (!assetStorageService.delete(assetId)) {++ if (!assetStorageService.delete(assetIds)) {throw new WebApplicationException(BAD_REQUEST);}} catch (IllegalStateException ex) {diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 03f649097..cd9eacfb6 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -75,7 +75,6 @@ import java.util.function.Consumer;import java.util.logging.Level;import java.util.logging.Logger;import java.util.stream.Collectors;-import java.util.stream.IntStream;import static java.util.stream.Collectors.joining;import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;@@ -472,22 +471,25 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}/**- * @return <code>true</code> if the asset was deleted, false if the asset still has children and can't be deleted.+ * @return <code>true</code> if the assets were deleted, false if any of the assets still have children and can't be deleted.*/- public boolean delete(String assetId) {- return persistenceService.doReturningTransaction(em -> {- Asset asset = em.find(Asset.class, assetId);- if (asset != null) {- List<Asset> children = findAll(em, new AssetQuery()- .parents(new ParentPredicate(asset.getId()))- );- if (children.size() > 0)- return false;- LOG.fine("Removing: " + asset);- em.remove(asset);- }- return true;- });+ public boolean delete(List<String> assetIds) {+ try {+ persistenceService.doTransaction(em -> {+ LOG.fine("Removing: " + String.join(", ", assetIds));+ int count = em+ .createQuery("delete from Asset a where not exists(select child.id from Asset child where child.parentId = a.id) and a.id in :ids")+ .setParameter("ids", assetIds)+ .executeUpdate();+ if (assetIds.size() != count) {+ throw new IllegalArgumentException("Cannot delete one or more requested assets as they have children");+ }+ });+ } catch (Exception e) {+ return false;+ }++ return true;}public boolean isUserAsset(String assetId) {diff --git a/model/src/main/java/org/openremote/model/asset/AssetResource.java b/model/src/main/java/org/openremote/model/asset/AssetResource.javaindex 87a82ea04..dd58fdfb7 100644--- a/model/src/main/java/org/openremote/model/asset/AssetResource.java+++ b/model/src/main/java/org/openremote/model/asset/AssetResource.java@@ -30,6 +30,8 @@ import javax.annotation.security.RolesAllowed;import javax.validation.Valid;import javax.ws.rs.*;+import java.util.List;+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;/**@@ -236,12 +238,11 @@ public interface AssetResource {* has children and therefore can't be deleted.*/@DELETE- @Path("{assetId}")@Produces(APPLICATION_JSON)@SuccessStatusCode(204)@RolesAllowed({"write:assets"})@SuppressWarnings("unusable-by-js")- void delete(@BeanParam RequestParams requestParams, @PathParam("assetId") String assetId);+ void delete(@BeanParam RequestParams requestParams, @QueryParam("assetId") List<String> assetIds);/*** Retrieve assets using an {@link AssetQuery}.