Merge pull request #814 from HL7/2023-11-gg-misc1

2023 11 gg misc1

Author: grahamegrieve

RELEASE_NOTES.md

@@ -0,0 +1,24 @@
+* Loader: Reduce memory utilization (clean up before Jekyll)
+* Loader: Fix NPE on descriptions on spreadsheets
+* Loader: Fix committee URLs
+* Terminology Sub-system: Improve expansion error messages
+* Terminology Sub-system: Fix expansion language - don't set for displayName parameter
+* Validator: Fix validator not allowing canonical resource extensions in canonical resources in bundles
+* Validator: Fix bundle validation error on intneral link checking
+* Validator: Check parameter type for FHIRPath where() and all()
+* Validator: Validate that composite search parameters have components
+* Renderer: Adjust value set rendering for fragment code systems
+* Renderer: Fix NPE rendering some resources
+* Renderer: Fix rendering of TriggerDefinition
+* Renderer: Add support for rendering union and intersections of profiles in profile comparison
+* Renderer: Fix for broken markdown re-processing
+* Renderer: Improve identifier rendering
+* Renderer: fix bad link on VSAC code systems
+* Renderer: clean up dependency presentation
+* Renderer: Add IPS Comparison 
+* Renderer: HL7 trademark related fixes 
+* Renderer: do NOT force white background in ToC
+* Renderer: Fix missing examples when using versioned canonical URLs
+* Renderer: fix broken markdown processing generating IP statements fragment
+* Generator: add Jekyll/windows note
+

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/CqlSubSystem.java

@@ -43,8 +43,7 @@
 import org.hl7.elm_modelinfo.r1.ModelInfo;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.exceptions.FHIRFormatError;
-import org.hl7.fhir.r5.context.IWorkerContext;
-import org.hl7.fhir.r5.context.IWorkerContext.ILoggingService;
+import org.hl7.fhir.r5.context.ILoggingService;
 import org.hl7.fhir.r5.model.DataRequirement;
 import org.hl7.fhir.r5.model.Enumerations;
 import org.hl7.fhir.r5.model.Library;
@@ -163,7 +162,7 @@ public ModelInfo load(ModelIdentifier modelIdentifier) {
             }
           }
         } catch (IOException e) {
-          logger.logDebugMessage(IWorkerContext.ILoggingService.LogCategory.PROGRESS, String.format("Exceptions occurred attempting to load npm library for model %s", modelIdentifier.toString()));
+          logger.logDebugMessage(ILoggingService.LogCategory.PROGRESS, String.format("Exceptions occurred attempting to load npm library for model %s", modelIdentifier.toString()));
         }
       }
 

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/FSHRunner.java

@@ -19,7 +19,7 @@
 import org.apache.commons.exec.PumpStreamHandler;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
-import org.hl7.fhir.r5.context.IWorkerContext;
+import org.hl7.fhir.r5.context.ILoggingService;
 import org.hl7.fhir.utilities.IniFile;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.settings.FhirSettings;
@@ -28,13 +28,13 @@
 
 public class FSHRunner {
 
-    private final IWorkerContext.ILoggingService logger;
+    private final ILoggingService logger;
 
     private static final long FSH_TIMEOUT = 60000 * 5; // 5 minutes....
 
     private long fshTimeout = FSH_TIMEOUT;
 
-    public FSHRunner(IWorkerContext.ILoggingService logger) {
+    public FSHRunner(ILoggingService logger) {
         this.logger = logger;
     }
 

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/HTMLInspector.java

@@ -40,9 +40,10 @@
 
 import org.hl7.fhir.exceptions.FHIRFormatError;
 import org.hl7.fhir.igtools.publisher.SpecMapManager.SpecialPackageType;
-import org.hl7.fhir.r5.context.IWorkerContext.ILoggingService;
-import org.hl7.fhir.r5.context.IWorkerContext.ILoggingService.LogCategory;
+import org.hl7.fhir.r5.context.ILoggingService;
+import org.hl7.fhir.r5.context.ILoggingService.LogCategory;
 import org.hl7.fhir.utilities.CommaSeparatedStringBuilder;
+import org.hl7.fhir.utilities.PathBuilder;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
@@ -718,7 +719,8 @@ private boolean checkResolveLink(String filename, Location loc, String path, Str
         } else {
           try {
             String folder = Utilities.getDirectoryForFile(filename);
-            page = Utilities.path(folder == null ? (altRootFolder != null && filename.startsWith(altRootFolder) ? altRootFolder : rootFolder) : folder, page.replace("/", File.separator));
+            String f = folder == null ? (altRootFolder != null && filename.startsWith(altRootFolder) ? altRootFolder : rootFolder) : folder;
+            page = PathBuilder.getPathBuilder().withRequiredTarget(rootFolder).buildPath(f, page.replace("/", File.separator));
           } catch (java.nio.file.InvalidPathException e) {
             page = null;
           }

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/IFetchFile.java

@@ -27,8 +27,8 @@
 import java.util.List;
 
 import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.context.ILoggingService;
 import org.hl7.fhir.r5.context.IWorkerContext;
-import org.hl7.fhir.r5.context.IWorkerContext.ILoggingService;
 import org.hl7.fhir.r5.model.DataType;
 
 public interface IFetchFile {