Skip to content

armgit / core

Public Imported from GitHub
0

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

HttpClientProtocol: replaced string parsing of link header with JAXRS response link methods

Rich Turnerc4c54141179e
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 f646e251c..f0750cc4e 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
@@ -1182,12 +1182,9 @@ public class HttpClientProtocol extends AbstractProtocol {
}
protected Response executePagingRequest(HttpClientRequest clientRequest, Response response) {
- Optional<String> linkHeader = Optional.ofNullable(response.getHeaderString(HEADER_LINK));
- if (linkHeader.isPresent()) {
- Optional<String> nextUrl = getLinkHeaderValue(linkHeader.get(), "next");
- if (nextUrl.isPresent()) {
- return clientRequest.client.register(new PaginationFilter(nextUrl.get())).request().build(clientRequest.method).invoke();
- }
+ if (response.hasLink("next")) {
+ URI nextUrl = response.getLink("next").getUri();
+ return clientRequest.client.register(new PaginationFilter(nextUrl)).request().build(clientRequest.method).invoke();
}
return null;
}
@@ -1330,15 +1327,4 @@ public class HttpClientProtocol extends AbstractProtocol {
protocolConfig -> protocolConfig.setDisabled(true)
);
}
-
- protected Optional<String> getLinkHeaderValue(String linkHeader, String rel) {
- Optional<String> nextUrl = Optional.empty();
- String[] parts = linkHeader.split(",");
- Optional<String> relPart = Arrays.stream(parts).filter(p -> p.endsWith("rel=\"" + rel + "\"")).findFirst();
- if (relPart.isPresent()) {
- parts = relPart.get().split(";");
- nextUrl = Optional.of(parts[0].replace("<", "").replace(">", "").trim());
- }
- return nextUrl;
- }
}