From be631a51303dc8308867e56592629bfb405494a5 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.ccom>
Date: Wed, 11 May 2022 02:14:08 +1000
Subject: [PATCH] Trim unknown resource types when pre-adopting extensions of
 type Reference from future versions

---
 .../org/hl7/fhir/r5/utils/XVerExtensionManager.java  | 12 ++++++++++--
 pom.xml                                              |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
index 05781182f..7e577452b 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
@@ -157,9 +157,11 @@ public class XVerExtensionManager {
                 tr.addTargetProfile("http://hl7.org/fhir/StructureDefinition/Resource");
               } else if (p.contains(",")) {
                 for (String pp : p.split("\\,")) {
-                  tr.addTargetProfile("http://hl7.org/fhir/StructureDefinition/"+pp);                              
+                  if (isResource(pp)) {
+                    tr.addTargetProfile("http://hl7.org/fhir/StructureDefinition/"+pp);
+                  }
                 }
-              } else  {
+              } else if (isResource(p)) {
                 tr.addTargetProfile("http://hl7.org/fhir/StructureDefinition/"+p);              
               }
             }
@@ -171,6 +173,12 @@ public class XVerExtensionManager {
     }
   }
 
+  // todo: translate names 
+  
+  private boolean isResource(String p) {
+    return context.getResourceNames().contains(p);
+  }
+
   private boolean hasTargets(String dt) {
     return Utilities.existsInList(dt, "canonical", "Reference", "CodeableReference");
   }
diff --git a/pom.xml b/pom.xml
index d4ad2836c..902235e94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 
     <properties>
         <hapi_fhir_version>5.4.0</hapi_fhir_version>
-        <validator_test_case_version>1.1.98</validator_test_case_version>
+        <validator_test_case_version>1.1.99-SNAPSHOT</validator_test_case_version>
         <junit_jupiter_version>5.7.1</junit_jupiter_version>
         <junit_platform_launcher_version>1.7.1</junit_platform_launcher_version>
         <maven_surefire_version>3.0.0-M5</maven_surefire_version>