Skip to content

armgit / core

Public Imported from GitHub
0

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

Replace asset attribute setters with getOrCreate() method call to preserve meta

Rich Turnerfb43494275e6
diff --git a/agent/src/main/java/org/openremote/agent/protocol/mqtt/MQTTAgent.java b/agent/src/main/java/org/openremote/agent/protocol/mqtt/MQTTAgent.java
index 27c30c5a9..099caa3b8 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/mqtt/MQTTAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/mqtt/MQTTAgent.java
@@ -65,7 +65,7 @@ public class MQTTAgent extends IOAgent<MQTTAgent, MQTTProtocol, MQTTAgentLink> {
}
public MQTTAgent setClientId(String clientId) {
- getAttributes().addOrReplace(new Attribute<>(CLIENT_ID, clientId));
+ getAttributes().getOrCreate(CLIENT_ID).setValue(clientId);
return this;
}
@@ -74,7 +74,7 @@ public class MQTTAgent extends IOAgent<MQTTAgent, MQTTProtocol, MQTTAgentLink> {
}
public MQTTAgent setSecureMode(boolean secureMode) {
- getAttributes().addOrReplace(new Attribute<>(SECURE_MODE, secureMode));
+ getAttributes().getOrCreate(SECURE_MODE).setValue(secureMode);
return this;
}
@@ -83,7 +83,7 @@ public class MQTTAgent extends IOAgent<MQTTAgent, MQTTProtocol, MQTTAgentLink> {
}
public MQTTAgent setWebsocketMode(boolean websocketMode) {
- getAttributes().addOrReplace(new Attribute<>(WEBSOCKET_MODE, websocketMode));
+ getAttributes().getOrCreate(WEBSOCKET_MODE).setValue(websocketMode);
return this;
}
@@ -92,7 +92,7 @@ public class MQTTAgent extends IOAgent<MQTTAgent, MQTTProtocol, MQTTAgentLink> {
}
public MQTTAgent setResumeSession(boolean resumeSession) {
- getAttributes().addOrReplace(new Attribute<>(RESUME_SESSION, resumeSession));
+ getAttributes().getOrCreate(RESUME_SESSION).setValue(resumeSession);
return this;
}
@@ -101,7 +101,7 @@ public class MQTTAgent extends IOAgent<MQTTAgent, MQTTProtocol, MQTTAgentLink> {
}
public MQTTAgent setWebsocketPath(String websocketPath) {
- getAttributes().addOrReplace(new Attribute<>(WEBSOCKET_PATH, websocketPath));
+ getAttributes().getOrCreate(WEBSOCKET_PATH).setValue(websocketPath);
return this;
}
@@ -110,7 +110,7 @@ public class MQTTAgent extends IOAgent<MQTTAgent, MQTTProtocol, MQTTAgentLink> {
}
public MQTTAgent setWebsocketQuery(String websocketQuery) {
- getAttributes().addOrReplace(new Attribute<>(WEBSOCKET_QUERY, websocketQuery));
+ getAttributes().getOrCreate(WEBSOCKET_QUERY).setValue(websocketQuery);
return this;
}
}
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 ddbcb2b5b..3f5a30706 100644
--- a/model/src/main/java/org/openremote/model/asset/Asset.java
+++ b/model/src/main/java/org/openremote/model/asset/Asset.java
@@ -584,7 +584,7 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>
public T setLocation(GeoJSONPoint location) {
- getAttributes().addOrReplace(new Attribute<>(LOCATION, location));
+ getAttributes().getOrCreate(LOCATION).setValue(location);
return (T) this;
}
@@ -622,7 +622,6 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>
return getAttributes().getValue(MANUFACTURER);
}
-
public T setManufacturer(String manufacturer) {
getAttributes().getOrCreate(MANUFACTURER).setValue(manufacturer);
return (T) this;
@@ -632,7 +631,6 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>
return getAttributes().getValue(MODEL);
}
-
public T setModel(String model) {
getAttributes().getOrCreate(MODEL).setValue(model);
return (T) this;
diff --git a/model/src/main/java/org/openremote/model/asset/agent/Agent.java b/model/src/main/java/org/openremote/model/asset/agent/Agent.java
index af20f31e9..889122bae 100644
--- a/model/src/main/java/org/openremote/model/asset/agent/Agent.java
+++ b/model/src/main/java/org/openremote/model/asset/agent/Agent.java
@@ -157,7 +157,7 @@ public abstract class Agent<T extends Agent<T, U, V>, U extends Protocol<T>, V e
@SuppressWarnings("unchecked")
public T setDisabled(boolean disabled) {
- getAttributes().addOrReplace(new Attribute<>(DISABLED, disabled));
+ getAttributes().getOrCreate(DISABLED).setValue(disabled);
return (T) this;
}