Issue #2162 - updates to how we handle UnsupportOperationException (#…

…2238) Signed-off-by: John T.E. Timm <johntimm@us.ibm.com>
LinuxForHealth · Apr 12, 2021 · d9e8bd5 · d9e8bd5
1 parent 4af75c8
commit d9e8bd5
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 0 deletions.
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/util/FHIRUtil.java b/fhir-model/src/main/java/com/ibm/fhir/model/util/FHIRUtil.java
@@ -159,6 +159,9 @@ public static OperationOutcome.Issue buildOperationOutcomeIssue(IssueSeverity se
 
     public static OperationOutcome.Issue buildOperationOutcomeIssue(IssueSeverity severity, IssueType code, String details,
             String expression) {
+        if (details == null || details.isEmpty()) {
+            details = "<no details>";
+        }
         if (expression == null || expression.isEmpty()) {
             expression = "<no expression>";
         }

diff --git a/fhir-term/src/main/java/com/ibm/fhir/term/service/FHIRTermService.java b/fhir-term/src/main/java/com/ibm/fhir/term/service/FHIRTermService.java
@@ -103,6 +103,17 @@ public void addProvider(FHIRTermServiceProvider provider) {
         providers.add(provider);
     }
 
+    /**
+     * Get a set containing {@link CodeSystem.Concept} instances where all structural
+     * hierarchies have been flattened.
+     *
+     * @param codeSystem
+     *     the code system
+     * @param code
+     *     the root of the hierarchy containing the Concept instances to be flattened
+     * @return
+     *     flattened set of Concept instances for the given tree
+     */
     public Set<Concept> closure(CodeSystem codeSystem, Code code) {
         return findProvider(codeSystem).closure(codeSystem, code);
     }

diff --git a/...ation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/ClosureOperation.java b/...ation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/ClosureOperation.java
@@ -78,6 +78,8 @@ protected Parameters doInvoke(
             throw e;
         } catch (FHIRTermServiceException e) {
             throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());
+        } catch (UnsupportedOperationException e) {
+            throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);
         } catch (Exception e) {
             throw new FHIROperationException("An error occurred during the ConceptMap closure operation", e);
         }

diff --git a/...ation-term/src/main/java/com/ibm/fhir/operation/term/CodeSystemValidateCodeOperation.java b/...ation-term/src/main/java/com/ibm/fhir/operation/term/CodeSystemValidateCodeOperation.java
@@ -53,6 +53,8 @@ protected Parameters doInvoke(
             throw e;
         } catch (FHIRTermServiceException e) {
             throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());
+        } catch (UnsupportedOperationException e) {
+            throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);
         } catch (Exception e) {
             throw new FHIROperationException("An error occurred during the CodeSystem validate code operation", e);
         }

diff --git a/operation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/ExpandOperation.java b/operation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/ExpandOperation.java
@@ -47,6 +47,8 @@ protected Parameters doInvoke(
             throw e;
         } catch (FHIRTermServiceException e) {
             throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());
+        } catch (UnsupportedOperationException e) {
+            throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);
         } catch (Exception e) {
             throw new FHIROperationException("An error occurred during the ValueSet expand operation", e);
         }

diff --git a/operation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/LookupOperation.java b/operation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/LookupOperation.java
@@ -48,6 +48,8 @@ protected Parameters doInvoke(
             outcome = service.lookup(coding, LookupParameters.from(parameters));
         } catch (FHIRTermServiceException e) {
             throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());
+        } catch (UnsupportedOperationException e) {
+            throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);
         } catch(Exception e) {
             throw new FHIROperationException("An error occurred during the CodeSystem lookup operation", e);
         }

diff --git a/...tion/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/SubsumesOperation.java b/...tion/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/SubsumesOperation.java
@@ -59,6 +59,8 @@ protected Parameters doInvoke(
             throw e;
         } catch (FHIRTermServiceException e) {
             throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());
+        } catch (UnsupportedOperationException e) {
+            throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);
         } catch (Exception e) {
             throw new FHIROperationException("An error occurred during the CodeSystem subsumes operation", e);
         }

diff --git a/...ion/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/TranslateOperation.java b/...ion/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/TranslateOperation.java
@@ -14,6 +14,7 @@
 import com.ibm.fhir.model.type.CodeableConcept;
 import com.ibm.fhir.model.type.Coding;
 import com.ibm.fhir.model.type.Element;
+import com.ibm.fhir.model.type.code.IssueType;
 import com.ibm.fhir.registry.FHIRRegistry;
 import com.ibm.fhir.server.operation.spi.FHIROperationContext;
 import com.ibm.fhir.server.operation.spi.FHIRResourceHelpers;
@@ -46,6 +47,8 @@ protected Parameters doInvoke(
             throw e;
         } catch (FHIRTermServiceException e) {
             throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());
+        } catch (UnsupportedOperationException e) {
+            throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);
         } catch (Exception e) {
             throw new FHIROperationException("An error occurred during the ConceptMap translate operation", e);
         }

diff --git a/...eration-term/src/main/java/com/ibm/fhir/operation/term/ValueSetValidateCodeOperation.java b/...eration-term/src/main/java/com/ibm/fhir/operation/term/ValueSetValidateCodeOperation.java
@@ -14,6 +14,7 @@
 import com.ibm.fhir.model.type.CodeableConcept;
 import com.ibm.fhir.model.type.Coding;
 import com.ibm.fhir.model.type.Element;
+import com.ibm.fhir.model.type.code.IssueType;
 import com.ibm.fhir.registry.FHIRRegistry;
 import com.ibm.fhir.server.operation.spi.FHIROperationContext;
 import com.ibm.fhir.server.operation.spi.FHIRResourceHelpers;
@@ -46,6 +47,8 @@ protected Parameters doInvoke(
             throw e;
         } catch (FHIRTermServiceException e) {
             throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());
+        } catch (UnsupportedOperationException e) {
+            throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);
         } catch (Exception e) {
             throw new FHIROperationException("An error occurred during the ValueSet validate code operation", e);
         }