Skip to content

armgit / core

Public Imported from GitHub
0

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

Made DYNAMIC_TIME_PATTERN of QueryParameterInjectorFilter public Disabled child parent restriction in AgentService

Michael Rademakeree8face7c82f
diff --git a/container/src/main/java/org/openremote/container/web/QueryParameterInjectorFilter.java b/container/src/main/java/org/openremote/container/web/QueryParameterInjectorFilter.java
index 4d480592b..140f97d99 100644
--- a/container/src/main/java/org/openremote/container/web/QueryParameterInjectorFilter.java
+++ b/container/src/main/java/org/openremote/container/web/QueryParameterInjectorFilter.java
@@ -54,7 +54,7 @@ public class QueryParameterInjectorFilter implements ClientRequestFilter {
*/
public static final String QUERY_PARAMETERS_PROPERTY = QueryParameterInjectorFilter.class.getName() + ".params";
- protected static final Pattern DYNAMIC_TIME_PATTERN = Pattern.compile(Protocol.DYNAMIC_TIME_PLACEHOLDER_REGEXP);
+ public static final Pattern DYNAMIC_TIME_PATTERN = Pattern.compile(Protocol.DYNAMIC_TIME_PLACEHOLDER_REGEXP);
@SuppressWarnings("unchecked")
@Override
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 6a8111a97..49abd4eda 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
@@ -195,11 +195,12 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
// Do basic check that parent is at least an agent...doesn't confirm its' the correct agent so
// that's up to the protocol to guarantee
- if (!getAgents().containsKey(asset.getParentId())) {
- String msg = "Cannot merge protocol-provided asset as the parent ID is not a valid agent ID: " + asset;
- LOG.warning(msg);
- throw new IllegalArgumentException(msg);
- }
+ // TODO: need to revisit this once agent generated assets logic finalised
+// if (!getAgents().containsKey(asset.getParentId())) {
+// String msg = "Cannot merge protocol-provided asset as the parent ID is not a valid agent ID: " + asset;
+// LOG.warning(msg);
+// throw new IllegalArgumentException(msg);
+// }
// TODO: Define access permissions for merged asset (user asset links inherit from parent agent?)
LOG.fine("Merging asset with protocol-provided: " + asset);