Issue #2162 - updates to how we handle UnsupportOperationException (#2238)

JohnTimm · web-flow · commit d9e8bd50d91b · 2021-04-12T15:31:32.000-04:00
Signed-off-by: John T.E. Timm &lt;johntimm@us.ibm.com&gt;
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/operation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/ClosureOperation.java b/operation/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/operation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/CodeSystemValidateCodeOperation.java b/operation/fhir-operation-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/operation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/SubsumesOperation.java b/operation/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/operation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/TranslateOperation.java b/operation/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/operation/fhir-operation-term/src/main/java/com/ibm/fhir/operation/term/ValueSetValidateCodeOperation.java b/operation/fhir-operation-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);
         }

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,9 @@ public static OperationOutcome.Issue buildOperationOutcomeIssue(IssueSeverity se`
`159`	`159`
`160`	`160`	`public static OperationOutcome.Issue buildOperationOutcomeIssue(IssueSeverity severity, IssueType code, String details,`
`161`	`161`	`String expression) {`
	`162`	`+ if (details == null \|\| details.isEmpty()) {`
	`163`	`+ details = "<no details>";`
	`164`	`+ }`
`162`	`165`	`if (expression == null \|\| expression.isEmpty()) {`
`163`	`166`	`expression = "<no expression>";`
`164`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ protected Parameters doInvoke(`
`78`	`78`	`throw e;`
`79`	`79`	`} catch (FHIRTermServiceException e) {`
`80`	`80`	`throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());`
	`81`	`+ } catch (UnsupportedOperationException e) {`
	`82`	`+ throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);`
`81`	`83`	`} catch (Exception e) {`
`82`	`84`	`throw new FHIROperationException("An error occurred during the ConceptMap closure operation", e);`
`83`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ protected Parameters doInvoke(`
`53`	`53`	`throw e;`
`54`	`54`	`} catch (FHIRTermServiceException e) {`
`55`	`55`	`throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());`
	`56`	`+ } catch (UnsupportedOperationException e) {`
	`57`	`+ throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);`
`56`	`58`	`} catch (Exception e) {`
`57`	`59`	`throw new FHIROperationException("An error occurred during the CodeSystem validate code operation", e);`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ protected Parameters doInvoke(`
`47`	`47`	`throw e;`
`48`	`48`	`} catch (FHIRTermServiceException e) {`
`49`	`49`	`throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());`
	`50`	`+ } catch (UnsupportedOperationException e) {`
	`51`	`+ throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);`
`50`	`52`	`} catch (Exception e) {`
`51`	`53`	`throw new FHIROperationException("An error occurred during the ValueSet expand operation", e);`
`52`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@ protected Parameters doInvoke(`
`48`	`48`	`outcome = service.lookup(coding, LookupParameters.from(parameters));`
`49`	`49`	`} catch (FHIRTermServiceException e) {`
`50`	`50`	`throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());`
	`51`	`+ } catch (UnsupportedOperationException e) {`
	`52`	`+ throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);`
`51`	`53`	`} catch(Exception e) {`
`52`	`54`	`throw new FHIROperationException("An error occurred during the CodeSystem lookup operation", e);`
`53`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ protected Parameters doInvoke(`
`59`	`59`	`throw e;`
`60`	`60`	`} catch (FHIRTermServiceException e) {`
`61`	`61`	`throw new FHIROperationException(e.getMessage(), e.getCause()).withIssue(e.getIssues());`
	`62`	`+ } catch (UnsupportedOperationException e) {`
	`63`	`+ throw buildExceptionWithIssue(e.getMessage(), IssueType.NOT_SUPPORTED, e);`
`62`	`64`	`} catch (Exception e) {`
`63`	`65`	`throw new FHIROperationException("An error occurred during the CodeSystem subsumes operation", e);`
`64`	`66`	`}`