Skip to content

armgit / core

Public Imported from GitHub
0

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

Minor bug fixes

Rich Turner0067fb187668
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java
index e359d99e7..9e0a6ce57 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java
@@ -27,7 +27,7 @@ import javax.persistence.Entity;
@Entity
public class VelbusSerialAgent extends VelbusAgent<VelbusSerialAgent, VelbusSerialProtocol> {
- public static final AttributeDescriptor<String> VELBUS_SERIAL_PORT = SERIAL_PORT;
+ public static final AttributeDescriptor<String> VELBUS_SERIAL_PORT = SERIAL_PORT.withOptional(false);
public static final AgentDescriptor<VelbusSerialAgent, VelbusSerialProtocol, VelbusAgentLink> DESCRIPTOR = new AgentDescriptor<>(
VelbusSerialAgent.class, VelbusSerialProtocol.class, VelbusAgentLink.class
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java
index e84eef0f1..af5d124e7 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java
@@ -172,7 +172,7 @@ public class RelayProcessor extends OutputChannelProcessor {
})
.orElse(null);
break;
- case "LOCKED":
+ case "_LOCKED":
command = Values.getBoolean(value)
.map(locked -> {
params[0] = 0xFFFFFF;
@@ -180,7 +180,7 @@ public class RelayProcessor extends OutputChannelProcessor {
})
.orElse(null);
break;
- case "INHIBITED":
+ case "_INHIBITED":
command = Values.getBoolean(value)
.map(inhibited -> {
params[0] = 0xFFFFFF;
@@ -205,6 +205,7 @@ public class RelayProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_LOCK":
+ case "_FORCE_OFF":
command = Values.getIntegerCoerced(value)
.map(duration -> {
params[0] = duration;
diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.java
index 9da21b810..2f470add3 100644
--- a/manager/src/main/java/org/openremote/manager/map/MapService.java
+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java
@@ -159,7 +159,7 @@ public class MapService implements ContainerService {
mapSettingsPath = Paths.get(getString(container.getConfig(), MAP_SETTINGS_PATH, MAP_SETTINGS_PATH_DEFAULT));
if (!Files.isRegularFile(mapSettingsPath)) {
- LOG.warning("Map settings file not found '" + mapSettingsPath.toAbsolutePath() + "', faling back to built in map settings");
+ LOG.warning("Map settings file not found '" + mapSettingsPath.toAbsolutePath() + "', falling back to built in map settings");
mapSettingsPath = null;
}
diff --git a/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java b/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java
index 5130258a3..ead95a0e4 100644
--- a/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java
@@ -673,7 +673,7 @@ public class ManagerSetup implements Setup {
Log.info("Provisioning assets");
- Files.list(Paths.get(provisionDocRoot.toString(), "assets")).filter(Files::isRegularFile)
+ Files.list(Paths.get(provisionDocRoot.toString(), "assets")).sorted()
.forEach(file -> {
try {
Asset<?> asset = Values.JSON.readValue(file.toFile(), Asset.class);
diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java b/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java
index 96b82c080..c24930a04 100644
--- a/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java
+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java
@@ -42,7 +42,7 @@ import java.util.Optional;
*/
@JsonTypeInfo(property = "type", use = JsonTypeInfo.Id.CUSTOM, defaultImpl = AgentLink.Default.class)
@JsonTypeIdResolver(AgentLink.AgentLinkTypeIdResolver.class)
-public abstract class AgentLink<T extends AgentLink<?>> implements Serializable {
+public abstract class AgentLink<T extends AgentLink<?>> implements Serializable {
/**
* Resolves agent link type as agent type strings using {@link org.openremote.model.util.AssetModelUtil}