Merge pull request #326 from IBM/johntimm-master

JohnTimm · web-flow · commit 8b07ca8d5859 · 2019-10-28T17:27:33.000-04:00
Issue #193 - client swallows IO exceptions
diff --git a/fhir-client/src/main/java/com/ibm/fhir/client/impl/FHIRClientImpl.java b/fhir-client/src/main/java/com/ibm/fhir/client/impl/FHIRClientImpl.java
@@ -728,8 +728,8 @@ private Builder addRequestHeaders(Builder builder, FHIRRequestHeader[] headers)
     protected synchronized Client getClient() throws Exception {
         if (client == null) {
             ClientBuilder cb = ClientBuilder.newBuilder()
-                    .register(new FHIRProvider())
-                    .register(new FHIRJsonProvider())
+                    .register(new FHIRProvider(RuntimeType.CLIENT))
+                    .register(new FHIRJsonProvider(RuntimeType.CLIENT))
                     .register(new FHIRJsonPatchProvider(RuntimeType.CLIENT));
 
             // Add support for basic auth if enabled.
@@ -788,7 +788,7 @@ public WebTarget getWebTarget() throws Exception {
     @Override
     public WebTarget getWebTarget(String baseURL) throws Exception {
         ClientBuilder cb =
-                ClientBuilder.newBuilder().register(new FHIRProvider()).register(new FHIRJsonProvider()).keyStore(getKeyStore(), getKeyStoreKeyPassword());
+                ClientBuilder.newBuilder().register(new FHIRProvider(RuntimeType.CLIENT)).register(new FHIRJsonProvider(RuntimeType.CLIENT)).keyStore(getKeyStore(), getKeyStoreKeyPassword());
 
         KeyStore ts = getTrustStore();
 
@@ -802,7 +802,7 @@ public WebTarget getWebTarget(String baseURL) throws Exception {
     @Override
     public WebTarget getWebTargetUsingBasicAuth(String baseURL, String username, String pwd) throws Exception {
         Client client =
-                ClientBuilder.newBuilder().register(new FHIRProvider()).register(new FHIRJsonProvider()).register(new FHIRBasicAuthenticator(username, pwd)).keyStore(getKeyStore(), getKeyStoreKeyPassword()).trustStore(getTrustStore()).build();
+                ClientBuilder.newBuilder().register(new FHIRProvider(RuntimeType.CLIENT)).register(new FHIRJsonProvider(RuntimeType.CLIENT)).register(new FHIRBasicAuthenticator(username, pwd)).keyStore(getKeyStore(), getKeyStoreKeyPassword()).trustStore(getTrustStore()).build();
         return client.target(baseURL);
     }
 
diff --git a/fhir-client/src/test/java/com/ibm/fhir/client/test/mains/JaxrsClientTestMain.java b/fhir-client/src/test/java/com/ibm/fhir/client/test/mains/JaxrsClientTestMain.java
@@ -8,6 +8,7 @@
 
 import static com.ibm.fhir.model.type.String.string;
 
+import javax.ws.rs.RuntimeType;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
@@ -47,7 +48,7 @@ public static void main(String[] args) throws Exception {
         FHIRGenerator.generator( Format.XML, false).generate(patient, System.out);
         
         Client client = ClientBuilder.newBuilder()
-                .register(new FHIRProvider())
+                .register(new FHIRProvider(RuntimeType.CLIENT))
                 .build();
         
         WebTarget target = client.target("http://localhost:9080/fhir-server/api/v4");
diff --git a/fhir-client/src/test/java/com/ibm/fhir/client/test/mains/ReadClaimTestMain.java b/fhir-client/src/test/java/com/ibm/fhir/client/test/mains/ReadClaimTestMain.java
@@ -6,6 +6,7 @@
 
 package com.ibm.fhir.client.test.mains;
 
+import javax.ws.rs.RuntimeType;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
@@ -20,7 +21,7 @@
 public class ReadClaimTestMain {
     public static void main(String[] args) throws Exception {
         Client client = ClientBuilder.newBuilder()
-                .register(new FHIRProvider())
+                .register(new FHIRProvider(RuntimeType.CLIENT))
                 .build();
         WebTarget target = client.target("http://fhirtest.uhn.ca/baseDstu2");
         Response response = target.path("Claim/14105").request(FHIRMediaType.APPLICATION_FHIR_JSON).get();
diff --git a/fhir-client/src/test/java/com/ibm/fhir/client/test/mains/UpdateTestMain.java b/fhir-client/src/test/java/com/ibm/fhir/client/test/mains/UpdateTestMain.java
@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.ws.rs.RuntimeType;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
@@ -29,7 +30,7 @@
 public class UpdateTestMain {
     public static void main(String[] args) throws Exception {
         Client client = ClientBuilder.newBuilder()
-                .register(new FHIRProvider())
+                .register(new FHIRProvider(RuntimeType.CLIENT))
                 .build();
         
         WebTarget target = client.target("http://localhost:9080/fhir-server/api/v4");
diff --git a/fhir-provider/src/main/java/com/ibm/fhir/provider/FHIRJsonProvider.java b/fhir-provider/src/main/java/com/ibm/fhir/provider/FHIRJsonProvider.java
@@ -19,6 +19,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,6 +32,7 @@
 import javax.json.JsonWriterFactory;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
+import javax.ws.rs.RuntimeType;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
@@ -50,6 +52,12 @@ public class FHIRJsonProvider implements MessageBodyReader<JsonObject>, MessageB
     
     private static final JsonReaderFactory JSON_READER_FACTORY = Json.createReaderFactory(null);
     private static final JsonWriterFactory JSON_WRITER_FACTORY = Json.createWriterFactory(null);
+    
+    private final RuntimeType runtimeType;
+    
+    public FHIRJsonProvider(RuntimeType runtimeType) {
+        this.runtimeType = Objects.requireNonNull(runtimeType);
+    }
 
     @Override
     public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
@@ -87,10 +95,12 @@ public void writeTo(JsonObject t, Class<?> type, Type genericType, Annotation[]
             writer.writeObject(t);
         } catch (JsonException e) {
             log.log(Level.WARNING, "an error occurred during resource serialization", e);
-            Response response = buildResponse(
-                buildOperationOutcome(Collections.singletonList(
-                    buildOperationOutcomeIssue(IssueSeverity.FATAL, IssueType.EXCEPTION, "FHIRProvider: " + e.getMessage(), null))), mediaType);
-            throw new WebApplicationException(response);
+            if (RuntimeType.SERVER.equals(runtimeType)) {
+                Response response = buildResponse(
+                    buildOperationOutcome(Collections.singletonList(
+                        buildOperationOutcomeIssue(IssueSeverity.FATAL, IssueType.EXCEPTION, "FHIRProvider: " + e.getMessage(), null))), mediaType);
+                throw new WebApplicationException(response);
+            }
         } finally {
             log.exiting(this.getClass().getName(), "writeTo");
         }
diff --git a/fhir-provider/src/main/java/com/ibm/fhir/provider/FHIRProvider.java b/fhir-provider/src/main/java/com/ibm/fhir/provider/FHIRProvider.java
@@ -17,11 +17,13 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
+import javax.ws.rs.RuntimeType;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
@@ -54,6 +56,12 @@ public class FHIRProvider implements MessageBodyReader<Resource>, MessageBodyWri
     @Context
     private HttpHeaders requestHeaders;
     
+    private final RuntimeType runtimeType;
+    
+    public FHIRProvider(RuntimeType runtimeType) {
+        this.runtimeType = Objects.requireNonNull(runtimeType);
+    }
+    
     @Override
     public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
         return Resource.class.isAssignableFrom(type);
@@ -90,10 +98,12 @@ public void writeTo(Resource t, Class<?> type, Type genericType, Annotation[] an
             FHIRGenerator.generator(getFormat(mediaType), isPretty(requestHeaders)).generate(t, entityStream);
         } catch (FHIRGeneratorException e) {
             log.log(Level.WARNING, "an error occurred during resource serialization", e);
-            Response response = buildResponse(
-                buildOperationOutcome(Collections.singletonList(
-                    buildOperationOutcomeIssue(IssueSeverity.FATAL, IssueType.EXCEPTION, "FHIRProvider: " + e.getMessage(), e.getPath()))), mediaType);
-            throw new WebApplicationException(response);
+            if (RuntimeType.SERVER.equals(runtimeType)) {
+                Response response = buildResponse(
+                    buildOperationOutcome(Collections.singletonList(
+                        buildOperationOutcomeIssue(IssueSeverity.FATAL, IssueType.EXCEPTION, "FHIRProvider: " + e.getMessage(), e.getPath()))), mediaType);
+                throw new WebApplicationException(response);
+            }
         } finally {
             log.exiting(this.getClass().getName(), "writeTo");
         }
diff --git a/fhir-server/src/main/java/com/ibm/fhir/server/FHIRApplication.java b/fhir-server/src/main/java/com/ibm/fhir/server/FHIRApplication.java
@@ -53,8 +53,8 @@ public Set<Object> getSingletons() {
         try {
             if (singletons == null) {
                 singletons = new HashSet<Object>();
-                singletons.add(new FHIRProvider());
-                singletons.add(new FHIRJsonProvider());
+                singletons.add(new FHIRProvider(RuntimeType.SERVER));
+                singletons.add(new FHIRJsonProvider(RuntimeType.SERVER));
                 singletons.add(new FHIRJsonPatchProvider(RuntimeType.SERVER));
             }
             return singletons;
