From f968afd7bd522f7e9ef18b75bfdfab970df7827d Mon Sep 17 00:00:00 2001 From: Eugene Lubarsky Date: Fri, 19 May 2017 19:27:45 +1000 Subject: [PATCH 1/3] Maven bintray repository: use https --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e1d82b8ad8..1ffe06d6a83 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ bintray-dnault-maven bintray - http://dl.bintray.com/dnault/maven + https://dl.bintray.com/dnault/maven jitpack.io From 3afab596abc1c5f61ffaf0c0b990dce8de307ba3 Mon Sep 17 00:00:00 2001 From: Eugene Lubarsky Date: Fri, 19 May 2017 19:29:52 +1000 Subject: [PATCH 2/3] ResponseHighlighter enhancements - hyperlinks and dateTime/UUID whole-string selection via some javascript --- .../ResponseHighlighterInterceptor.java | 22 +++++++-- .../server/interceptor/ResponseHighlighter.js | 45 +++++++++++++++++++ 2 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighter.js diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java index 4d4d867d063..74bffc0b9d6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java @@ -24,6 +24,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; */ import java.io.IOException; +import java.io.InputStream; import java.util.Date; import java.util.Map; import java.util.Set; @@ -33,6 +34,7 @@ import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.hl7.fhir.instance.model.api.IBaseResource; @@ -325,8 +327,13 @@ public class ResponseHighlighterInterceptor extends InterceptorAdapter { b.append(" \n"); b.append(" \n"); b.append("