Skip to content

armgit / core

Public Imported from GitHub
0

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

Added possibility to return last item in JsonPathFilter

Michael Rademakera40dcc735fee
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
index db4473b39..40df29cb0 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
@@ -911,10 +911,10 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
return null;
}
- if (filter.returnFirst) {
+ if (filter.returnFirst || filter.returnLast) {
Value pathValue = Values.parse(pathJson).orElse(null);
if (pathValue != null && pathValue.getType() == ValueType.ARRAY) {
- pathValue = Values.getArray(pathValue).flatMap(arr -> arr.length() > 0 ? arr.get(0) : Optional.empty()).orElse(null);
+ pathValue = Values.getArray(pathValue).flatMap(arr -> arr.length() > 0 ? filter.returnFirst ? arr.get(0) : arr.get(arr.length() - 1) : Optional.empty()).orElse(null);
}
return pathValue;
}