[APHL-1180] code Quality

cqframework · Dec 18, 2024 · dcab860 · dcab860
1 parent abeb51f
commit dcab860
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/adapter/IAdapter.java b/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/adapter/IAdapter.java
@@ -111,18 +111,16 @@ public default <B extends IBase> List<B> resolvePathList(IBase base, String path
         return resolvePathList(base, path).stream().map(i -> (B) i).collect(Collectors.toList());
     }
 
-    @SuppressWarnings("unchecked")
     public default String resolvePathString(IBase base, String path) {
         var result = resolvePath(base, path);
         if (result == null) {
             return null;
-        } else if (result instanceof IPrimitiveType) {
-            return ((IPrimitiveType<String>) result).getValue();
-        } else if (result instanceof IBaseReference) {
-            return ((IBaseReference) result).getReferenceElement().getValue();
+        } else if (result instanceof IPrimitiveType primitive && primitive.getValue() instanceof String string) {
+            return string;
+        } else if (result instanceof IBaseReference reference) {
+            return reference.getReferenceElement().getValue();
         } else {
-            throw new UnprocessableEntityException("Path : " + path + " on element of type "
-                    + base.getClass().getSimpleName() + "could not be resolved");
+            throw new UnprocessableEntityException("Path : {} on element of type {} could not be resolved", path, base.getClass().getSimpleName() );
         }
     }