RT-2007: qsh response body (#456)

* OT-2007 changes to QSH to return responseBody as a String

Author: marianbuenosayres

a2d2-api/pom.xml

@@ -310,7 +310,7 @@
 		<dependency>
 			<groupId>io.elimu.a2d2</groupId>
 			<artifactId>generic-helpers</artifactId>
-			<version>0.0.21</version>
+			<version>0.0.22</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- web development, including Tomcat and spring-webmvc -->

fhir-helpers/pom.xml

@@ -20,7 +20,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.elimu.a2d2</groupId>
 	<artifactId>fhir-helpers</artifactId>
-	<version>0.0.21</version>
+	<version>0.0.22</version>
 	<packaging>jar</packaging>
 	<name>fhir-helpers</name>
 	<url>http://maven.apache.org</url>

fhir-query-helper-base/pom.xml

@@ -27,7 +27,7 @@
 	</parent>
 
 	<artifactId>fhir-query-helper-base</artifactId>
-	<version>0.0.21</version>
+	<version>0.0.22</version>
 	<description>CDS Helper base</description>
 
 	<properties>

fhir-query-helper-base/src/main/java/io/elimu/a2d2/cds/fhir/helper/FhirResponse.java

@@ -40,13 +40,20 @@ public class FhirResponse<T> implements Serializable {
 	 * The response string related to the HTTP status
 	 */
 	private String responseStatusInfo;
+	
+	private String responseBody;
 
 	public FhirResponse(T result, int responseStatusCode, String responseStatusInfo) {
+		this(result, responseStatusCode, responseStatusInfo, null);
+	}
+
+	public FhirResponse(T result, int responseStatusCode, String responseStatusInfo, String responseBody) {
 		this.result = result;
 		this.responseStatusCode = responseStatusCode;
 		this.responseStatusInfo = responseStatusInfo;
+		this.responseBody = responseBody;
 	}
-
+	
 	/**
 	 * @return the result object for the query
 	 */
@@ -82,4 +89,11 @@ public void setResponseStatusInfo(String responseStatusInfo) {
 		this.responseStatusInfo = responseStatusInfo;
 	}
 
+	public String getResponseBody() {
+		return responseBody;
+	}
+	
+	public void setResponseBody(String responseBody) {
+		this.responseBody = responseBody;
+	}
 }

fhir-query-helper-base/src/main/java/io/elimu/a2d2/cds/fhir/helper/QueryingServerHelperBase.java

@@ -340,7 +340,7 @@ protected <S> FhirResponse<S> runWithInterceptors(QueryingCallback<S> callback,
 		} finally {
 			client.notInUse();
 		}
-		return new FhirResponse<>(result, tracker.getResponseStatusCode(), tracker.getResponseStatusInfo());
+		return new FhirResponse<>(result, tracker.getResponseStatusCode(), tracker.getResponseStatusInfo(), tracker.getResponseBody());
 	}
 
 	public boolean hasCacheHeaderInterceptor(List<IClientInterceptor> interceptors) {
@@ -394,7 +394,7 @@ public U execute(FhirClientWrapper client) {
 			}
 		}, client);
 		if (resourceBundle.getResult() == null) {
-			return new FhirResponse<>(null, resourceBundle.getResponseStatusCode(), resourceBundle.getResponseStatusInfo());
+			return new FhirResponse<>(null, resourceBundle.getResponseStatusCode(), resourceBundle.getResponseStatusInfo(), resourceBundle.getResponseBody());
 		}
 		return resourceBundle;
 	}
@@ -482,18 +482,20 @@ private FhirResponse<IBaseResource> getResourceList(String resourceType, String
 			if (usePath) {
 				FhirResponse<IBaseResource> resp = fetchServer(resourceType, resourceQuery);
 				List<IBaseResource> result = resp == null || resp.getResult() == null ? null : Arrays.asList(resp.getResult());
-				resourceList = new FhirResponse<List<IBaseResource>>(result, resp.getResponseStatusCode(), resp.getResponseStatusInfo());
+				resourceList = new FhirResponse<List<IBaseResource>>(result, resp.getResponseStatusCode(), resp.getResponseStatusInfo(), resp.getResponseBody());
 			} else {
 				resourceList = queryServer(resourceQuery, qb);
 			}
 		}
 		if(resourceList != null) {
 			if (resourceList.getResult() != null && resourceList.getResult().size()==1) {
 				return new FhirResponse<>(resourceList.getResult().get(0),
-						resourceList.getResponseStatusCode(), resourceList.getResponseStatusInfo());
+						resourceList.getResponseStatusCode(), resourceList.getResponseStatusInfo(), 
+						resourceList.getResponseBody());
 			} else {
 				return new FhirResponse<>(null, resourceList.getResponseStatusCode(),
-						resourceList.getResponseStatusInfo());
+						resourceList.getResponseStatusInfo(),
+						resourceList.getResponseBody());
 			}
 		} else {
 			return new FhirResponse<>(null, HttpStatus.SC_INTERNAL_SERVER_ERROR, "Unable to get resources");
@@ -632,7 +634,7 @@ protected FhirResponse<IBaseBundle> queryPageByLink(String url, boolean useCache
 				return null;
 			}
 			FhirResponse<IBaseResource> res = fetchServer("Bundle", url);
-			return new FhirResponse<>((IBaseBundle) res.getResult(), res.getResponseStatusCode(), res.getResponseStatusInfo());
+			return new FhirResponse<>((IBaseBundle) res.getResult(), res.getResponseStatusCode(), res.getResponseStatusInfo(), res.getResponseBody());
 		} catch (Exception e) {
 			log.error( ERROR_MSG + e.getMessage() + ". [" + e.getClass().getName() + "]");
 		} finally {

fhir-query-helper-base/src/main/java/io/elimu/a2d2/cds/fhir/helper/RequestDataInterceptor.java

@@ -15,6 +15,7 @@
 package io.elimu.a2d2.cds.fhir.helper;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 import org.slf4j.Logger;
@@ -29,6 +30,7 @@ public class RequestDataInterceptor implements IClientInterceptor {
 
 	private int responseStatusCode = -1;
 	private String responseStatusInfo = "not invoked";
+	private String responseBody = null;
 
 	public int getResponseStatusCode() {
 		return responseStatusCode;
@@ -37,6 +39,10 @@ public int getResponseStatusCode() {
 	public String getResponseStatusInfo() {
 		return responseStatusInfo;
 	}
+	
+	public String getResponseBody() {
+		return responseBody;
+	}
 
 	@Override
 	public void interceptRequest(IHttpRequest theRequest) {
@@ -80,6 +86,13 @@ public void interceptResponse(IHttpResponse theResponse) throws IOException {
 			log.trace("HTTP response status info: " + theResponse.getStatusInfo());
 			this.responseStatusInfo = theResponse.getStatusInfo();
 		}
+		try {
+			theResponse.bufferEntity();
+			InputStream respBodyIn = theResponse.readEntity();
+			this.responseBody = new String(respBodyIn.readAllBytes());
+		} catch (Exception e) {
+			log.trace("HTTP response body couldn't be read", e);
+		}
 	}
 
 }

fhir-query-helper-dstu2/pom.xml

@@ -25,7 +25,7 @@
 	</parent>
 
 	<artifactId>fhir-query-helper-dstu2</artifactId>
-	<version>0.0.21</version>
+	<version>0.0.22</version>
 	<packaging>jar</packaging>
 	<description>CDS Helper</description>
 

fhir-query-helper-dstu2/src/main/java/io/elimu/a2d2/cds/fhir/helper/QueryingServerHelper.java

@@ -120,7 +120,7 @@ public List<IBaseResource> execute(FhirClientWrapper client) {
 			}
 		}, client);
 		if (resourceBundle.getResult() == null) {
-			return new FhirResponse<>(null, resourceBundle.getResponseStatusCode(), resourceBundle.getResponseStatusInfo());
+			return new FhirResponse<>(null, resourceBundle.getResponseStatusCode(), resourceBundle.getResponseStatusInfo(), resourceBundle.getResponseBody());
 		}
 		return resourceBundle;
 	}

fhir-query-helper-dstu3/pom.xml

@@ -26,7 +26,7 @@
 	</parent>
 
 	<artifactId>fhir-query-helper-dstu3</artifactId>
-	<version>0.0.21</version>
+	<version>0.0.22</version>
 	<packaging>jar</packaging>
 	<description>CDS Helper DSTU3</description>
 

fhir-query-helper-dstu3/src/main/java/io/elimu/a2d2/cds/fhir/helper/dstu3/QueryingServerHelper.java

@@ -128,7 +128,7 @@ public List<IBaseResource> execute(FhirClientWrapper client) {
 			}
 		}, client);
 		if (resourceBundle.getResult() == null) {
-			return new FhirResponse<>(null, resourceBundle.getResponseStatusCode(), resourceBundle.getResponseStatusInfo());
+			return new FhirResponse<>(null, resourceBundle.getResponseStatusCode(), resourceBundle.getResponseStatusInfo(), resourceBundle.getResponseBody());
 		}
 		return resourceBundle;
 	}