this for easy method chaining
+ */
+ public Include setRecurse(boolean theRecurse) {
myRecurse = theRecurse;
+ return this;
}
public void setValue(String theValue) {
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java
index a53fda12454..033d7d85a8c 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java
@@ -439,7 +439,12 @@ public class FhirSystemDaoDstu3 extends BaseHapiFhirSystemDaotrue (default is false) response will include the
+ * request headers
+ *
+ * @return Returns a reference to this for easy method chaining
+ */
+ @SuppressWarnings("UnusedReturnValue")
+ public ResponseHighlighterInterceptor setShowRequestHeaders(boolean theShowRequestHeaders) {
+ myShowRequestHeaders = theShowRequestHeaders;
+ return this;
+ }
+
/**
* If set to true (default is true) response will include the
* response headers
@@ -275,9 +288,21 @@ public class ResponseHighlighterInterceptor extends InterceptorAdapter {
return myShowResponseHeaders;
}
+ /**
+ * If set to true (default is true) response will include the
+ * response headers
+ *
+ * @return Returns a reference to this for easy method chaining
+ */
+ @SuppressWarnings("UnusedReturnValue")
+ public ResponseHighlighterInterceptor setShowResponseHeaders(boolean theShowResponseHeaders) {
+ myShowResponseHeaders = theShowResponseHeaders;
+ return this;
+ }
+
@Override
public boolean outgoingResponse(RequestDetails theRequestDetails, IBaseResource theResponseObject, HttpServletRequest theServletRequest, HttpServletResponse theServletResponse)
- throws AuthenticationException {
+ throws AuthenticationException {
/*
* Request for _raw
@@ -345,30 +370,6 @@ public class ResponseHighlighterInterceptor extends InterceptorAdapter {
return false;
}
- /**
- * If set to true (default is false) response will include the
- * request headers
- *
- * @return Returns a reference to this for easy method chaining
- */
- @SuppressWarnings("UnusedReturnValue")
- public ResponseHighlighterInterceptor setShowRequestHeaders(boolean theShowRequestHeaders) {
- myShowRequestHeaders = theShowRequestHeaders;
- return this;
- }
-
- /**
- * If set to true (default is true) response will include the
- * response headers
- *
- * @return Returns a reference to this for easy method chaining
- */
- @SuppressWarnings("UnusedReturnValue")
- public ResponseHighlighterInterceptor setShowResponseHeaders(boolean theShowResponseHeaders) {
- myShowResponseHeaders = theShowResponseHeaders;
- return this;
- }
-
private void streamRequestHeaders(ServletRequest theServletRequest, StringBuilder b) {
if (theServletRequest instanceof HttpServletRequest) {
HttpServletRequest sr = (HttpServletRequest) theServletRequest;
@@ -479,14 +480,21 @@ public class ResponseHighlighterInterceptor extends InterceptorAdapter {
b.append(" font-family: monospace;\n");
b.append("}");
b.append(".responseBodyTable {");
- b.append(" width: 100%;");
- b.append(" margin-left: 0px;");
- b.append(" margin-top: 20px;");
+ b.append(" width: 100%;\n");
+ b.append(" margin-left: 0px;\n");
+ b.append(" margin-top: -10px;\n");
+ b.append(" position: relative;\n");
b.append("}");
b.append(".responseBodyTableFirstColumn {");
+ b.append(" position: absolute;\n");
+ b.append(" width: 70px;\n");
b.append("}");
b.append(".responseBodyTableSecondColumn {");
- b.append(" width: 100%;");
+ b.append(" position: absolute;\n");
+ b.append(" margin-left: 70px;\n");
+ b.append(" vertical-align: top;\n");
+ b.append(" left: 0px;\n");
+ b.append(" right: 0px;\n");
b.append("}");
b.append(".lineAnchor A {");
b.append(" text-decoration: none;");
@@ -561,23 +569,29 @@ public class ResponseHighlighterInterceptor extends InterceptorAdapter {
b.append("\n");
try {
- if (isShowRequestHeaders()) {
- streamRequestHeaders(theServletRequest, b);
- }
- if (isShowResponseHeaders()) {
- streamResponseHeaders(theRequestDetails, theServletResponse, b);
- }
- } catch (Throwable t) {
- // ignore (this will hit if we're running in a servlet 2.5 environment)
- }
+ if (isShowRequestHeaders()) {
+ streamRequestHeaders(theServletRequest, b);
+ }
+ if (isShowResponseHeaders()) {
+ streamResponseHeaders(theRequestDetails, theServletResponse, b);
+ }
+ } catch (Throwable t) {
+ // ignore (this will hit if we're running in a servlet 2.5 environment)
+ }
+ b.append("");
StringBuilder target = new StringBuilder();
int linesCount = format(encoded, target, encoding);
+ b.append(target);
+ b.append("");
+ // Line Numbers
+ b.append(" | ");
+ b.append("");
- // Response Body
- b.append("");
- b.append(target);
- b.append(" | ");
-
- b.append("