100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Add support updating response headers to `WebTargetBuilder` (#1382)
Wouter Born8a42b8c05897
diff --git a/container/src/main/java/org/openremote/container/web/ResponseHeaderUpdateFilter.java b/container/src/main/java/org/openremote/container/web/ResponseHeaderUpdateFilter.javanew file mode 100644index 000000000..dd6b81b2a--- /dev/null+++ b/container/src/main/java/org/openremote/container/web/ResponseHeaderUpdateFilter.java@@ -0,0 +1,32 @@+package org.openremote.container.web;++import jakarta.ws.rs.client.ClientRequestContext;+import jakarta.ws.rs.client.ClientResponseContext;+import jakarta.ws.rs.client.ClientResponseFilter;++import java.io.IOException;+import java.util.List;+import java.util.Map;+import java.util.Set;++/**+ * A filter for updating response headers.+ */+public class ResponseHeaderUpdateFilter implements ClientResponseFilter {++ protected Set<Map.Entry<String, List<String>>> headers;++ public ResponseHeaderUpdateFilter(Map<String, List<String>> headers) {+ this.headers = headers.entrySet();+ }++ @Override+ public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {+ headers.forEach(headerAndValues -> {+ responseContext.getHeaders().remove(headerAndValues.getKey());+ if (!headerAndValues.getValue().isEmpty()) {+ responseContext.getHeaders().addAll(headerAndValues.getKey(), headerAndValues.getValue());+ }+ });+ }+}diff --git a/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java b/container/src/main/java/org/openremote/container/web/WebTargetBuilder.javaindex 5ac06ffdd..8147cec3e 100644--- a/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java+++ b/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java@@ -68,6 +68,7 @@ public class WebTargetBuilder {protected Map<String, List<String>> injectHeaders;protected Map<String, List<String>> injectQueryParameters;protected boolean followRedirects = false;+ private Map<String, List<String>> overrideResponseHeaders;public WebTargetBuilder(ResteasyClient client, URI baseUri) {this.client = client;@@ -103,6 +104,11 @@ public class WebTargetBuilder {return this;}+ public WebTargetBuilder setOverrideResponseHeaders(Map<String, List<String>> overrideResponseHeaders) {+ this.overrideResponseHeaders = overrideResponseHeaders;+ return this;+ }+/*** If the specified status code is returned from the server then it will be treated as a permanent failure* and the web authTarget will no longer be usable (any future requests will immediately return a@@ -172,6 +178,10 @@ public class WebTargetBuilder {target.register(new FollowRedirectFilter());}+ if (overrideResponseHeaders != null) {+ target.register(new ResponseHeaderUpdateFilter(overrideResponseHeaders));+ }+return target;}