Merge pull request #1390 from hapifhir/2023-08-gg-flat-draft-bugs-ver…

…sion-rendering 2023 08 gg flat draft bugs version rendering
hapifhir · Aug 12, 2023 · d136c0c · d136c0c
2 parents cce9d9c + 2474c19
commit d136c0c
Show file tree

Hide file tree

Showing 58 changed files with 825 additions and 266 deletions.
diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java
@@ -93,6 +93,7 @@ public FHIRToolingClient(String baseServiceUrl, String userAgent) throws URISynt
 
   public void initialize(String baseServiceUrl) throws URISyntaxException {
     base = baseServiceUrl;
+    client.setBase(base);
     resourceAddress = new ResourceAddress(baseServiceUrl);
     this.allowedVersions = supportableVersions();
     this.maxResultSetSize = -1;

diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/network/Client.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/network/Client.java
@@ -22,6 +22,16 @@ public class Client {
   private ToolingClientLogger logger;
   private int retryCount;
   private long timeout = DEFAULT_TIMEOUT;
+  private String base;
+
+  public String getBase() {
+    return base;
+  }
+
+  public void setBase(String base) {
+    this.base = base;
+  }
+
 
   public ToolingClientLogger getLogger() {
     return logger;
@@ -167,7 +177,7 @@ public <T extends Resource> Bundle executeBundleRequest(Request.Builder request,
                                                              String message,
                                                              int retryCount,
                                                              long timeout) throws IOException {
-    return new FhirRequestBuilder(request)
+    return new FhirRequestBuilder(request, base)
       .withLogger(logger)
       .withResourceFormat(resourceFormat)
       .withRetryCount(retryCount)
@@ -183,7 +193,7 @@ public <T extends Resource> ResourceRequest<T> executeFhirRequest(Request.Builde
                                                                        String message,
                                                                        int retryCount,
                                                                        long timeout) throws IOException {
-    return new FhirRequestBuilder(request)
+    return new FhirRequestBuilder(request, base)
       .withLogger(logger)
       .withResourceFormat(resourceFormat)
       .withRetryCount(retryCount)

diff --git a/....fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/network/FhirRequestBuilder.java b/....fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/network/FhirRequestBuilder.java
@@ -59,9 +59,11 @@ public class FhirRequestBuilder {
    * {@link ToolingClientLogger} for log output.
    */
   private ToolingClientLogger logger = null;
+  private String source;
 
-  public FhirRequestBuilder(Request.Builder httpRequest) {
+  public FhirRequestBuilder(Request.Builder httpRequest, String source) {
     this.httpRequest = httpRequest;
+    this.source = source;
   }
 
   /**
@@ -265,9 +267,9 @@ protected <T extends Resource> T unmarshalReference(Response response, String fo
           error = (OperationOutcome) resource;
         }
       } catch (IOException ioe) {
-        throw new EFhirClientException("Error reading Http Response: " + ioe.getMessage(), ioe);
+        throw new EFhirClientException("Error reading Http Response from "+source+": " + ioe.getMessage(), ioe);
       } catch (Exception e) {
-        throw new EFhirClientException("Error parsing response message: " + e.getMessage(), e);
+        throw new EFhirClientException("Error parsing response message from "+source+": " + e.getMessage(), e);
       }
     }
 
@@ -301,12 +303,12 @@ else if (rf instanceof OperationOutcome && hasError((OperationOutcome) rf)) {
         }
       }
     } catch (IOException ioe) {
-      throw new EFhirClientException("Error reading Http Response", ioe);
+      throw new EFhirClientException("Error reading Http Response from "+source+": "+ioe.getMessage(), ioe);
     } catch (Exception e) {
-      throw new EFhirClientException("Error parsing response message", e);
+      throw new EFhirClientException("Error parsing response message from "+source+":"+e.getMessage(), e);
     }
     if (error != null) {
-      throw new EFhirClientException("Error from server: " + ResourceUtilities.getErrorDescription(error), error);
+      throw new EFhirClientException("Error from "+source+": " + ResourceUtilities.getErrorDescription(error), error);
     }
     return feed;
   }

diff --git a/....dstu3/src/test/java/org/hl7/fhir/dstu3/utils/client/network/FhirRequestBuilderTests.java b/....dstu3/src/test/java/org/hl7/fhir/dstu3/utils/client/network/FhirRequestBuilderTests.java
@@ -47,7 +47,7 @@ public class FhirRequestBuilderTests {
   final Request.Builder requestBuilder = new Request.Builder()
     .url(DUMMY_URL);
 
-  final FhirRequestBuilder fhirRequestBuilder = Mockito.spy(new FhirRequestBuilder(requestBuilder));
+  final FhirRequestBuilder fhirRequestBuilder = Mockito.spy(new FhirRequestBuilder(requestBuilder, "http://local/local"));
 
   @Mock
   OkHttpClient client;

diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java
@@ -93,6 +93,7 @@ public FHIRToolingClient(String baseServiceUrl, String userAgent) throws URISynt
 
   public void initialize(String baseServiceUrl) throws URISyntaxException {
     base = baseServiceUrl;
+    client.setBase(base);
     resourceAddress = new ResourceAddress(baseServiceUrl);
     this.maxResultSetSize = -1;
   }

diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network/Client.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network/Client.java
@@ -23,6 +23,16 @@ public class Client {
   private FhirLoggingInterceptor fhirLoggingInterceptor;
   private int retryCount;
   private long timeout = DEFAULT_TIMEOUT;
+  private String base;
+
+  public String getBase() {
+    return base;
+  }
+
+  public void setBase(String base) {
+    this.base = base;
+  }
+
 
   public ToolingClientLogger getLogger() {
     return logger;
@@ -131,15 +141,15 @@ public Bundle postBatchRequest(URI resourceUri, byte[] payload, String resourceF
 
   public <T extends Resource> Bundle executeBundleRequest(Request.Builder request, String resourceFormat,
       Headers headers, String message, int retryCount, long timeout) throws IOException {
-    return new FhirRequestBuilder(request).withLogger(fhirLoggingInterceptor).withResourceFormat(resourceFormat)
+    return new FhirRequestBuilder(request, base).withLogger(fhirLoggingInterceptor).withResourceFormat(resourceFormat)
         .withRetryCount(retryCount).withMessage(message)
         .withHeaders(headers == null ? new Headers.Builder().build() : headers)
         .withTimeout(timeout, TimeUnit.MILLISECONDS).executeAsBatch();
   }
 
   public <T extends Resource> ResourceRequest<T> executeFhirRequest(Request.Builder request, String resourceFormat,
       Headers headers, String message, int retryCount, long timeout) throws IOException {
-    return new FhirRequestBuilder(request).withLogger(fhirLoggingInterceptor).withResourceFormat(resourceFormat)
+    return new FhirRequestBuilder(request, base).withLogger(fhirLoggingInterceptor).withResourceFormat(resourceFormat)
         .withRetryCount(retryCount).withMessage(message)
         .withHeaders(headers == null ? new Headers.Builder().build() : headers)
         .withTimeout(timeout, TimeUnit.MILLISECONDS).execute();

diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network/FhirRequestBuilder.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network/FhirRequestBuilder.java
@@ -58,9 +58,11 @@ public class FhirRequestBuilder {
    * {@link FhirLoggingInterceptor} for log output.
    */
   private FhirLoggingInterceptor logger = null;
+  private String source;
 
-  public FhirRequestBuilder(Request.Builder httpRequest) {
+  public FhirRequestBuilder(Request.Builder httpRequest, String source) {
     this.httpRequest = httpRequest;
+    this.source = source;
   }
 
   /**
@@ -264,9 +266,9 @@ protected <T extends Resource> T unmarshalReference(Response response, String fo
           error = (OperationOutcome) resource;
         }
       } catch (IOException ioe) {
-        throw new EFhirClientException("Error reading Http Response: " + ioe.getMessage(), ioe);
+        throw new EFhirClientException("Error reading Http Response from "+source+": " + ioe.getMessage(), ioe);
       } catch (Exception e) {
-        throw new EFhirClientException("Error parsing response message: " + e.getMessage(), e);
+        throw new EFhirClientException("Error parsing response message from "+source+": " + e.getMessage(), e);
       }
     }
 
@@ -296,17 +298,17 @@ protected Bundle unmarshalFeed(Response response, String format) {
           else if (rf instanceof OperationOutcome && hasError((OperationOutcome) rf)) {
             error = (OperationOutcome) rf;
           } else {
-            throw new EFhirClientException("Error reading server response: a resource was returned instead");
+            throw new EFhirClientException("Error reading server response from "+source+": a resource was returned instead");
           }
         }
       }
     } catch (IOException ioe) {
-      throw new EFhirClientException("Error reading Http Response", ioe);
+      throw new EFhirClientException("Error reading Http Response from "+source+":"+ioe.getMessage(), ioe);
     } catch (Exception e) {
-      throw new EFhirClientException("Error parsing response message", e);
+      throw new EFhirClientException("Error parsing response message from "+source+":"+e.getMessage(), e);
     }
     if (error != null) {
-      throw new EFhirClientException("Error from server: " + ResourceUtilities.getErrorDescription(error), error);
+      throw new EFhirClientException("Error from "+source+": " + ResourceUtilities.getErrorDescription(error), error);
     }
     return feed;
   }

diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/FHIRToolingClient.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/FHIRToolingClient.java
@@ -110,6 +110,7 @@ public FHIRToolingClient(String baseServiceUrl, String userAgent) throws URISynt
 
   public void initialize(String baseServiceUrl) throws URISyntaxException {
     base = baseServiceUrl;
+    client.setBase(base);
     resourceAddress = new ResourceAddress(baseServiceUrl);
     this.maxResultSetSize = -1;
     checkCapabilities();

diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/network/Client.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/network/Client.java
@@ -23,6 +23,16 @@ public class Client {
   private int retryCount;
   private long timeout = DEFAULT_TIMEOUT;
   private byte[] payload;
+  private String base;
+
+  public String getBase() {
+    return base;
+  }
+
+  public void setBase(String base) {
+    this.base = base;
+  }
+
 
   public ToolingClientLogger getLogger() {
     return logger;
@@ -135,15 +145,15 @@ public Bundle postBatchRequest(URI resourceUri, byte[] payload, String resourceF
 
   public <T extends Resource> Bundle executeBundleRequest(Request.Builder request, String resourceFormat,
       Headers headers, String message, int retryCount, long timeout) throws IOException {
-    return new FhirRequestBuilder(request).withLogger(fhirLoggingInterceptor).withResourceFormat(resourceFormat)
+    return new FhirRequestBuilder(request, base).withLogger(fhirLoggingInterceptor).withResourceFormat(resourceFormat)
         .withRetryCount(retryCount).withMessage(message)
         .withHeaders(headers == null ? new Headers.Builder().build() : headers)
         .withTimeout(timeout, TimeUnit.MILLISECONDS).executeAsBatch();
   }
 
   public <T extends Resource> ResourceRequest<T> executeFhirRequest(Request.Builder request, String resourceFormat,
       Headers headers, String message, int retryCount, long timeout) throws IOException {
-    return new FhirRequestBuilder(request).withLogger(fhirLoggingInterceptor).withResourceFormat(resourceFormat)
+    return new FhirRequestBuilder(request, base).withLogger(fhirLoggingInterceptor).withResourceFormat(resourceFormat)
         .withRetryCount(retryCount).withMessage(message)
         .withHeaders(headers == null ? new Headers.Builder().build() : headers)
         .withTimeout(timeout, TimeUnit.MILLISECONDS).execute();

diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilder.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/client/network/FhirRequestBuilder.java
@@ -52,9 +52,11 @@ public class FhirRequestBuilder {
    * {@link FhirLoggingInterceptor} for log output.
    */
   private FhirLoggingInterceptor logger = null;
+  private String source;
 
-  public FhirRequestBuilder(Request.Builder httpRequest) {
+  public FhirRequestBuilder(Request.Builder httpRequest, String source) {
     this.httpRequest = httpRequest;
+    this.source = source;
   }
 
   /**
@@ -253,9 +255,9 @@ protected <T extends Resource> T unmarshalReference(Response response, String fo
           error = (OperationOutcome) resource;
         }
       } catch (IOException ioe) {
-        throw new EFhirClientException("Error reading Http Response: " + ioe.getMessage(), ioe);
+        throw new EFhirClientException("Error reading Http Response from "+source+": " + ioe.getMessage(), ioe);
       } catch (Exception e) {
-        throw new EFhirClientException("Error parsing response message: " + e.getMessage(), e);
+        throw new EFhirClientException("Error parsing response message from "+source+": " + e.getMessage(), e);
       }
     }
 
@@ -290,12 +292,12 @@ else if (rf instanceof OperationOutcome && hasError((OperationOutcome) rf)) {
         }
       }
     } catch (IOException ioe) {
-      throw new EFhirClientException("Error reading Http Response", ioe);
+      throw new EFhirClientException("Error reading Http Response from "+source+": "+ioe.getMessage(), ioe);
     } catch (Exception e) {
-      throw new EFhirClientException("Error parsing response message", e);
+      throw new EFhirClientException("Error parsing response message from "+source+": "+e.getMessage(), e);
     }
     if (error != null) {
-      throw new EFhirClientException("Error from server: " + ResourceUtilities.getErrorDescription(error), error);
+      throw new EFhirClientException("Error from "+source+": " + ResourceUtilities.getErrorDescription(error), error);
     }
     return feed;
   }