Merge pull request #1276 from JorisHeadease/fix/meta-source-link-fallback-order

grahamegrieve · web-flow · commit 9c3eb9453f1c · 2026-07-30T06:09:43.000+10:00
fix: prioritize special package handlers over meta.source fallback in getPath()
diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/SpecMapManager.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/SpecMapManager.java
@@ -206,9 +206,6 @@ public String getPath(String url, String def, String rt, String id) throws FHIRE
     if (path != null) {
       return path;
     }
-    if (def != null) {
-      return def;
-    }
     if (special != null) {
       switch (special) {
       case FACADE:
@@ -273,6 +270,9 @@ public String getPath(String url, String def, String rt, String id) throws FHIRE
         }
       }
     }
+    if (def != null) {
+      return def;
+    }
     if (url.matches(Constants.URI_REGEX)) {
       int cc = 0;
       int cursor = url.length()-1;

Original file line number	Diff line number	Diff line change
`@@ -206,9 +206,6 @@ public String getPath(String url, String def, String rt, String id) throws FHIRE`
`206`	`206`	`if (path != null) {`
`207`	`207`	`return path;`
`208`	`208`	`}`
`209`		`- if (def != null) {`
`210`		`- return def;`
`211`		`- }`
`212`	`209`	`if (special != null) {`
`213`	`210`	`switch (special) {`
`214`	`211`	`case FACADE:`
`@@ -273,6 +270,9 @@ public String getPath(String url, String def, String rt, String id) throws FHIRE`
`273`	`270`	`}`
`274`	`271`	`}`
`275`	`272`	`}`
	`273`	`+ if (def != null) {`
	`274`	`+ return def;`
	`275`	`+ }`
`276`	`276`	`if (url.matches(Constants.URI_REGEX)) {`
`277`	`277`	`int cc = 0;`
`278`	`278`	`int cursor = url.length()-1;`