Skip to content

armgit / core

Public Imported from GitHub
0

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

Only take version if it's lower than the one mapped

Michael Rademaker2e93449b523e
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 5b4fe1ac9..7460ac85c 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
@@ -25,10 +25,10 @@ import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebResource;
import org.openremote.model.Constants;
import org.openremote.model.asset.*;
-import org.openremote.model.query.AssetQuery;
-import org.openremote.model.query.BaseAssetQuery.Select;
import org.openremote.model.attribute.*;
import org.openremote.model.http.RequestParams;
+import org.openremote.model.query.AssetQuery;
+import org.openremote.model.query.BaseAssetQuery.Select;
import org.openremote.model.query.filter.ParentPredicate;
import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.security.Tenant;
@@ -45,8 +45,9 @@ import java.util.logging.Logger;
import static javax.ws.rs.core.Response.Status.*;
import static org.openremote.container.Container.JSON;
-import static org.openremote.model.query.AssetQuery.*;
import static org.openremote.model.attribute.AttributeEvent.Source.CLIENT;
+import static org.openremote.model.query.AssetQuery.Access;
+import static org.openremote.model.query.AssetQuery.Include;
import static org.openremote.model.util.TextUtil.isNullOrEmpty;
public class AssetResourceImpl extends ManagerWebResource implements AssetResource {
@@ -241,13 +242,13 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
boolean isRestrictedUser = isRestrictedUser();
// The asset that will ultimately be stored (override/ignore some values for restricted users)
- Asset resultAsset = storageAsset.map(
+ Asset resultAsset = Asset.map(
asset,
storageAsset,
isRestrictedUser ? storageAsset.getName() : null, // TODO We could allow restricted users to update names?
isRestrictedUser ? storageAsset.getRealmId() : null, // Restricted users can not change realm
isRestrictedUser ? storageAsset.getParentId() : null, // Restricted users can not change realm
- storageAsset.getType(), // The type an never change
+ storageAsset.getType(), // The type can never change
isRestrictedUser ? storageAsset.isAccessPublicRead() : null, // Restricted user can not change access public flag
isRestrictedUser ? storageAsset.getAttributes() : null // Restricted users need manual attribute merging (see below)
);
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 2fafee1ae..1858cb4eb 100644
--- a/model/src/main/java/org/openremote/model/asset/Asset.java
+++ b/model/src/main/java/org/openremote/model/asset/Asset.java
@@ -702,7 +702,11 @@ public class Asset implements IdentifiableEntity {
String overrideType,
Boolean overrideAccessPublicRead,
ObjectValue overrideAttributes) {
- asset.setVersion(assetToMap.getVersion());
+
+ if (asset.getVersion() < assetToMap.getVersion()) {
+ asset.setVersion(assetToMap.getVersion());
+ }
+
asset.setName(overrideName != null ? overrideName : assetToMap.getName());
if (overrideType != null) {
asset.setType(overrideType);