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
Moved asset id check from AssetResourceImpl to AssetStorageService and done some logging cleanup
Rich Turner4b2ccc118f96
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex d3fafe402..a8fc4e845 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -461,11 +461,6 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour// Allow client to set identifierif (asset.getId() != null) {- // At least some sanity check, we must hope that the client has set a unique ID- if (asset.getId().length() != 22) {- LOG.fine("Identifier value must be 22 characters, can't persist asset: " + asset);- throw new WebApplicationException(BAD_REQUEST);- }newAsset.setId(asset.getId());}diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 354abb43b..76bf36a55 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -62,6 +62,7 @@ import org.postgresql.util.PGobject;import javax.persistence.EntityManager;import javax.persistence.NoResultException;import javax.persistence.TypedQuery;+import javax.ws.rs.WebApplicationException;import java.sql.*;import java.util.Date;import java.util.*;@@ -74,6 +75,7 @@ import java.util.stream.Collectors;import static java.util.stream.Collectors.groupingBy;import static java.util.stream.Collectors.joining;+import static javax.ws.rs.core.Response.Status.BAD_REQUEST;import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;import static org.openremote.manager.event.ClientEventService.CLIENT_EVENT_TOPIC;@@ -429,15 +431,26 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicif (asset.getId() != null) {+ // At least some sanity check, we must hope that the client has set a unique ID+ if (asset.getId().length() != 22) {+ String msg = "Asset ID must be 22 characters: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);+ }+existing = em.find(Asset.class, asset.getId());// Verify type has not been changedif (existing != null && !existing.getType().equals(asset.getType())) {- throw new IllegalStateException("Asset type cannot be changed");+ String msg = "Asset type cannot be changed: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);}if (existing != null && !existing.getRealm().equals(asset.getRealm())) {- throw new IllegalStateException("Asset realm cannot be changed");+ String msg = "Asset realm cannot be changed: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);}// If this is real merge and desired, copy the persistent version number over the detached@@ -454,16 +467,24 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicAsset parent = find(em, asset.getParentId(), true);// .. the parent must exist- if (parent == null)- throw new IllegalStateException("Parent not found: " + asset.getParentId());+ if (parent == null) {+ String msg = "Asset parent not found: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);+ }// ... the parent can not be a child of the asset- if (parent.pathContains(asset.getId()))- throw new IllegalStateException("Invalid parent");+ if (parent.pathContains(asset.getId())) {+ String msg = "Asset parent cannot be a descendant of the asset: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);+ }// .. the parent should be in the same realmif (asset.getRealm() != null && !parent.getRealm().equals(asset.getRealm())) {- throw new IllegalStateException("Parent not in same realm as asset: " + asset.getRealm());+ String msg = "Asset parent must be in the same realm: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);} else if (asset.getRealm() == null) {// ... and if we don't have a realm identifier, use the parent'sasset.setRealm(parent.getRealm());@@ -473,16 +494,24 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicif (parent.getWellKnownType() == AssetType.GROUP) {String childAssetType = parent.getAttribute("childAssetType").flatMap(AbstractValueHolder::getValueAsString)- .orElseThrow(() -> new IllegalStateException("Parent group asset doesn't have a valid child asset type attribute"));+ .orElseThrow(() -> {+ String msg = "Asset parent is of type GROUP but the childAssetType attribute is invalid: asset=" + asset;+ LOG.info(msg);+ return new IllegalStateException(msg);+ });if (!childAssetType.equals(asset.getType())) {- throw new IllegalStateException("Asset type does not match parent group's child asset type attribute");+ String msg = "Asset type does not match parent GROUP asset's childAssetType attribute: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);}}}// Validate realmif (!identityService.getIdentityProvider().tenantExists(asset.getRealm())) {- throw new IllegalStateException("Realm not found/active: " + asset.getRealm());+ String msg = "Asset realm not found or is inactive: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);}// Validate attributes@@ -495,7 +524,9 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}}if (invalid > 0) {- throw new IllegalStateException("Storing asset failed, invalid attributes: " + invalid);+ String msg = "Asset has one or more invalid attributes: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);}// Validate group child asset type attribute@@ -503,16 +534,25 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicString childAssetType = asset.getAttribute("childAssetType").flatMap(AssetAttribute::getValueAsString).map(childAssetTypeString -> TextUtil.isNullOrEmpty(childAssetTypeString) ? null : childAssetTypeString)- .orElseThrow(() -> new IllegalStateException("Asset type group childAssetType attribute must be a valid string"));+ .orElseThrow(() -> {+ String msg = "Asset of type GROUP childAssetType attribute must be a valid string: asset=" + asset;+ LOG.info(msg);+ return new IllegalStateException(msg);+ });String existingChildAssetType = existing != null ? existing.getAttribute("childAssetType").flatMap(AssetAttribute::getValueAsString)- .orElseThrow(() ->- new IllegalStateException("Asset type group childAssetType attribute must be a valid string")) : childAssetType;+ .orElseThrow(() -> {+ String msg = "Asset of type GROUP childAssetType attribute must be a valid string: asset=" + asset;+ LOG.info(msg);+ return new IllegalStateException(msg);+ }) : childAssetType;if (!childAssetType.equals(existingChildAssetType)) {- throw new IllegalStateException("Asset type group childAssetType attribute cannot be changed");+ String msg = "Asset of type GROUP so childAssetType attribute cannot be changed: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);}}@@ -531,7 +571,9 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicif (!TextUtil.isNullOrEmpty(userName)) {user = identityService.getIdentityProvider().getUser(asset.getRealm(), userName);if (user == null) {- throw new IllegalStateException("User not found: " + userName);+ String msg = "User not found: " + userName;+ LOG.info(msg);+ throw new IllegalStateException(msg);}}