Rad 994 add http body response (#440)

* log body response on error * response added --------- Co-authored-by: calvarez <[email protected]>
elimuinformatics · Nov 7, 2024 · 6577860 · 6577860
1 parent 636f876
commit 6577860
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/a2d2-api/pom.xml b/a2d2-api/pom.xml
@@ -310,7 +310,7 @@
 		<dependency>
 			<groupId>io.elimu.a2d2</groupId>
 			<artifactId>generic-helpers</artifactId>
-			<version>0.0.19</version>
+			<version>0.0.20</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- web development, including Tomcat and spring-webmvc -->

diff --git a/fhir-helpers/pom.xml b/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.19</version>
+	<version>0.0.20</version>
 	<packaging>jar</packaging>
 	<name>fhir-helpers</name>
 	<url>http://maven.apache.org</url>

diff --git a/fhir-query-helper-base/pom.xml b/fhir-query-helper-base/pom.xml
@@ -27,7 +27,7 @@
 	</parent>
 
 	<artifactId>fhir-query-helper-base</artifactId>
-	<version>0.0.19</version>
+	<version>0.0.20</version>
 	<description>CDS Helper base</description>
 
 	<properties>

diff --git a/fhir-query-helper-base/src/main/java/io/elimu/a2d2/cds/fhir/helper/FetchCallRetry.java b/fhir-query-helper-base/src/main/java/io/elimu/a2d2/cds/fhir/helper/FetchCallRetry.java
@@ -1,9 +1,9 @@
 package io.elimu.a2d2.cds.fhir.helper;
 
 import java.util.function.Function;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
 
 public class FetchCallRetry<T> {
 
@@ -17,7 +17,7 @@ public FetchCallRetry(QueryBuilder builder, Function<Object, T> function) {
 		this.function = function;
 	}
 
-	public T retryRestCall(FhirClientWrapper client) {
+	public T retryRestCall(FhirClientWrapper client)  {
 		int retries = builder.getRetries();
 		int delay = builder.getDelay();
 		int count = 0;
@@ -34,7 +34,11 @@ public T retryRestCall(FhirClientWrapper client) {
 				}
 				log.info("FHIR REST call failed attempt number " + count + " with status " + client.getTracker().getResponseStatusCode() + ". Retrying after waiting " + (delay * count) + "ms");
 				count++;
-			} catch (Throwable t) {
+			} catch (BaseServerResponseException t) {
+				count++;			
+				log.error("Invocation of call failed with body response: " + t.getResponseBody());
+			}
+			catch (Throwable t) {
 				if (client.getTracker().getResponseStatusCode() >= 0 && client.getTracker().getResponseStatusCode() < 500) {
 					throw new RuntimeException("Invocation of call failed with status code " + client.getTracker().getResponseStatusCode() + ". No further retries will be performed");
 				}

diff --git a/fhir-query-helper-dstu2/pom.xml b/fhir-query-helper-dstu2/pom.xml
@@ -25,7 +25,7 @@
 	</parent>
 
 	<artifactId>fhir-query-helper-dstu2</artifactId>
-	<version>0.0.19</version>
+	<version>0.0.20</version>
 	<packaging>jar</packaging>
 	<description>CDS Helper</description>
 

diff --git a/fhir-query-helper-dstu3/pom.xml b/fhir-query-helper-dstu3/pom.xml
@@ -26,7 +26,7 @@
 	</parent>
 
 	<artifactId>fhir-query-helper-dstu3</artifactId>
-	<version>0.0.19</version>
+	<version>0.0.20</version>
 	<packaging>jar</packaging>
 	<description>CDS Helper DSTU3</description>
 

diff --git a/fhir-query-helper-r4/pom.xml b/fhir-query-helper-r4/pom.xml
@@ -26,7 +26,7 @@
 	</parent>
 
 	<artifactId>fhir-query-helper-r4</artifactId>
-	<version>0.0.19</version>
+	<version>0.0.20</version>
 	<packaging>jar</packaging>
 	<description>CDS Helper R4</description>
 

diff --git a/generic-helpers/pom.xml b/generic-helpers/pom.xml
@@ -23,7 +23,7 @@
 		<version>0.0.9-SNAPSHOT</version>
 	</parent>
 	<artifactId>generic-helpers</artifactId>
-	<version>0.0.19</version>
+	<version>0.0.20</version>
 	<name>Base helpers for the Generic services</name>
 	<description>Contains WIHInvoker</description>
 

diff --git a/oauth-helpers/pom.xml b/oauth-helpers/pom.xml
@@ -27,7 +27,7 @@
 	</parent>
 
 	<artifactId>oauth-helpers</artifactId>
-	<version>0.0.19</version>
+	<version>0.0.20</version>
 	<description>OAuth Helper</description>
 
 	<properties>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 		<protobuf-java.version>3.21.8</protobuf-java.version>
 		<mockito.version>2.23.0</mockito.version>
 		<jedis.version>4.0.1</jedis.version>
-		<cds.helper.version>0.0.19</cds.helper.version>
+		<cds.helper.version>0.0.20</cds.helper.version>
 		<freemarker.version>2.3.30</freemarker.version>
 		<jacoco.version>0.8.7</jacoco.version>
 		<jaxb.api.version>2.3.1</jaxb.api.version>
@@ -233,7 +233,7 @@
 				<groupId>${project.groupId}</groupId>
 				<artifactId>generic-helpers</artifactId>
 				<!--version>${cds.helper.version}</version-->
-				<version>0.0.19</version>
+				<version>0.0.20</version>
 			</dependency>
 			<dependency>
 				<groupId>${project.groupId}</groupId>