Skip to content

armgit / core

Public Imported from GitHub
0

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

Added the option to add dynamic time values for http requests

Michael Rademaker89a857237bbe
diff --git a/agent/src/main/java/org/openremote/agent/protocol/Protocol.java b/agent/src/main/java/org/openremote/agent/protocol/Protocol.java
index e06db50cf..20c4c037d 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/Protocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/Protocol.java
@@ -409,6 +409,9 @@ public interface Protocol extends ContainerService {
String DYNAMIC_VALUE_PLACEHOLDER_REGEXP = "\"?\\{\\$value}\"?";
+ //Specify to use time. First # delimiter used to specify format. Second # delimiter used to add or subtract millis
+ String DYNAMIC_TIME_PLACEHOLDER_REGEXP = "\"?\\{\\$time#?([a-z,A-Z,\\-,\\s,:]*)#?(-?\\d*)?}\"?";
+
/**
* Get the name for this protocol
*/
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
index 5714cff26..b4aaa5236 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
@@ -222,7 +222,8 @@ public class HttpClientProtocol extends AbstractProtocol {
}
if (queryParameters != null) {
- requestTarget.register(new QueryParameterInjectorFilter(queryParameters, dynamicQueryParameters ? DYNAMIC_VALUE_PLACEHOLDER_REGEXP : null));
+ requestTarget.register(new QueryParameterInjectorFilter(queryParameters, dynamicQueryParameters ? DYNAMIC_VALUE_PLACEHOLDER_REGEXP : null,
+ DYNAMIC_TIME_PLACEHOLDER_REGEXP));
}
return requestTarget;
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/QueryParameterInjectorFilter.java b/agent/src/main/java/org/openremote/agent/protocol/http/QueryParameterInjectorFilter.java
index 84f109976..f3d4be864 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/QueryParameterInjectorFilter.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/QueryParameterInjectorFilter.java
@@ -24,6 +24,11 @@ import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriBuilder;
import java.io.IOException;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* A filter for injecting query parameters into the request URI. If {@link #dynamicPlaceholderRegex} is set any request
@@ -39,11 +44,13 @@ public class QueryParameterInjectorFilter implements ClientRequestFilter {
protected MultivaluedMap<String, String> queryParameters;
protected String dynamicPlaceholderRegex;
protected boolean dynamic;
+ protected String dynamicTimePlaceHolderRegex;
public QueryParameterInjectorFilter(MultivaluedMap<String, String> queryParameters,
- String dynamicPlaceholderRegex) {
+ String dynamicPlaceholderRegex, String dynamicTimePlaceHolderRegex) {
this.queryParameters = queryParameters;
this.dynamicPlaceholderRegex = dynamicPlaceholderRegex;
+ this.dynamicTimePlaceHolderRegex = dynamicTimePlaceHolderRegex;
dynamic = queryParameters != null && dynamicPlaceholderRegex != null
&& queryParameters
@@ -78,6 +85,24 @@ public class QueryParameterInjectorFilter implements ClientRequestFilter {
valueArr[i] = valueArr[i].replaceAll(dynamicPlaceholderRegex, finalDynamicValue);
}
}
+ if (dynamicTimePlaceHolderRegex != null) {
+ for (int i = 0; i < valueArr.length; i++) {
+ if (valueArr[i].matches(dynamicTimePlaceHolderRegex)) {
+ Matcher matcher = Pattern.compile(dynamicTimePlaceHolderRegex).matcher(valueArr[i]);
+ long millisToAdd = 0;
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+ if (matcher.find()) {
+ if (matcher.groupCount() > 0) {
+ dateTimeFormatter = DateTimeFormatter.ofPattern(matcher.group(1));
+ }
+ if (matcher.groupCount() == 2) {
+ millisToAdd = Long.parseLong(matcher.group(2));
+ }
+ }
+ valueArr[i] = dateTimeFormatter.format(Instant.now().plusMillis(millisToAdd).atZone(ZoneId.systemDefault()));
+ }
+ }
+ }
uriBuilder.queryParam(name, (Object[]) valueArr);
});
requestContext.setUri(uriBuilder.build());
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java b/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java
index d6e429f07..fc1435279 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java
@@ -160,7 +160,7 @@ public class WebTargetBuilder {
}
if (injectQueryParameters != null) {
- target.register(new QueryParameterInjectorFilter(injectQueryParameters, null));
+ target.register(new QueryParameterInjectorFilter(injectQueryParameters, null, null));
}
if (followRedirects) {
diff --git a/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy
index 4dc8a5dd5..167dd99d4 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy
@@ -471,7 +471,7 @@ class WebTargetTest extends Specification {
params.add("param1", "param1Value2")
params.add("param3", "param3Value1")
response = target.path("get")
- .register(new QueryParameterInjectorFilter(params, null))
+ .register(new QueryParameterInjectorFilter(params, null, null))
.request()
.get()
@@ -489,7 +489,7 @@ class WebTargetTest extends Specification {
and: "a web target for a server"
def target = new WebTargetBuilder(client, new URIBuilder("https://dynamicparamserver").build())
.build()
- .register(new QueryParameterInjectorFilter(params, /"{0,1}\{\$(value)\}"{0,1}/))
+ .register(new QueryParameterInjectorFilter(params, /"{0,1}\{\$(value)\}"{0,1}/, null))
when: "a request is made to the server"
def response = target.request()
@@ -524,4 +524,4 @@ class WebTargetTest extends Specification {
// def str = response.readEntity(String.class);
// assert response.getStatus() == 200
// }
-}
\ No newline at end of file
+}