Merge remote-tracking branch 'origin/master'

Grahame Grieve · Grahame Grieve · commit 9e883511a1e3 · 2025-04-05T07:46:35.000+11:00
diff --git a/org.hl7.fhir.publisher.cli/src/main/resources/logback.xml b/org.hl7.fhir.publisher.cli/src/main/resources/logback.xml
@@ -1,10 +1,7 @@
 <configuration>
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
 	<!-- CLI logback config -->
-	<!-- TODO: this isn't being picked up in JAR creation. It should be overwriting the core config, but is not -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} [%file:%line] %msg%n</pattern>
 		</encoder>
@@ -14,6 +11,4 @@
 		<appender-ref ref="STDOUT" />
 	</root>
 
-	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
-
 </configuration>
diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java
@@ -2378,14 +2378,14 @@ private Locale inferDefaultNarrativeLang(final boolean logDecision) {
       if (logDecision) {
         logMessage("Using " + defaultTranslationLang + " as the default narrative language. (i18n-default-lang has been set in Implementation Guide ini)");
       }
-      return new Locale(defaultTranslationLang);
+      return Locale.forLanguageTag(defaultTranslationLang);
     }
     if (sourceIg != null) {
       if (sourceIg.hasLanguage()) {
         if (logDecision) {
           logMessage("Using " + sourceIg.getLanguage() + " as the default narrative language. (ImplementationGuide.language has been set)");
         }
-        return new Locale(sourceIg.getLanguage());
+        return Locale.forLanguageTag(sourceIg.getLanguage());
       }
       if (sourceIg.hasJurisdiction()) {
         final String jurisdiction = sourceIg.getJurisdictionFirstRep().getCodingFirstRep().getCode();
@@ -2415,7 +2415,7 @@ private List<Locale> translationLocales() {
     res.add(inferDefaultNarrativeLang());
 
     for (String translationLang : translationLangs) {
-      Locale locale = new Locale(translationLang);
+      Locale locale = Locale.forLanguageTag(translationLang);
       if (!res.contains(locale)) {
         res.add(locale);
       }
@@ -5045,7 +5045,7 @@ private void load() throws Exception {
     rcLangs = new RenderingContextLangs(rc);
     for (String l : allLangs()) {
       RenderingContext lrc = rc.copy(false);
-      lrc.setLocale(new Locale(l));
+      lrc.setLocale(Locale.forLanguageTag(l));
       rcLangs.seeLang(l, lrc);
     }
     realmRules = makeRealmBusinessRules();
@@ -15259,7 +15259,7 @@ public static void main(String[] args) throws Exception {
   }
 
   private void setForcedLanguage(String language) {
-    this.forcedLanguage = new Locale(language);
+    this.forcedLanguage = Locale.forLanguageTag(language);
   }
 
   public static String getAbsoluteConfigFilePath(String configFilePath) throws IOException {
diff --git a/org.hl7.fhir.publisher.core/src/test/resources/logback-test.xml b/org.hl7.fhir.publisher.core/src/test/resources/logback-test.xml
@@ -1,9 +1,5 @@
 <configuration>
-	<!-- Core logback config -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} [%file:%line] %msg%n</pattern>
 		</encoder>
@@ -13,6 +9,4 @@
 		<appender-ref ref="STDOUT" />
 	</root>
 
-	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
-
 </configuration>
diff --git a/plot-ig-builder-auto.png b/plot-ig-builder-auto.png

Original file line number	Diff line number	Diff line change
`@@ -2378,14 +2378,14 @@ private Locale inferDefaultNarrativeLang(final boolean logDecision) {`
`2378`	`2378`	`if (logDecision) {`
`2379`	`2379`	`logMessage("Using " + defaultTranslationLang + " as the default narrative language. (i18n-default-lang has been set in Implementation Guide ini)");`
`2380`	`2380`	`}`
`2381`		`- return new Locale(defaultTranslationLang);`
	`2381`	`+ return Locale.forLanguageTag(defaultTranslationLang);`
`2382`	`2382`	`}`
`2383`	`2383`	`if (sourceIg != null) {`
`2384`	`2384`	`if (sourceIg.hasLanguage()) {`
`2385`	`2385`	`if (logDecision) {`
`2386`	`2386`	`logMessage("Using " + sourceIg.getLanguage() + " as the default narrative language. (ImplementationGuide.language has been set)");`
`2387`	`2387`	`}`
`2388`		`- return new Locale(sourceIg.getLanguage());`
	`2388`	`+ return Locale.forLanguageTag(sourceIg.getLanguage());`
`2389`	`2389`	`}`
`2390`	`2390`	`if (sourceIg.hasJurisdiction()) {`
`2391`	`2391`	`final String jurisdiction = sourceIg.getJurisdictionFirstRep().getCodingFirstRep().getCode();`
`@@ -2415,7 +2415,7 @@ private List<Locale> translationLocales() {`
`2415`	`2415`	`res.add(inferDefaultNarrativeLang());`
`2416`	`2416`
`2417`	`2417`	`for (String translationLang : translationLangs) {`
`2418`		`- Locale locale = new Locale(translationLang);`
	`2418`	`+ Locale locale = Locale.forLanguageTag(translationLang);`
`2419`	`2419`	`if (!res.contains(locale)) {`
`2420`	`2420`	`res.add(locale);`
`2421`	`2421`	`}`
`@@ -5045,7 +5045,7 @@ private void load() throws Exception {`
`5045`	`5045`	`rcLangs = new RenderingContextLangs(rc);`
`5046`	`5046`	`for (String l : allLangs()) {`
`5047`	`5047`	`RenderingContext lrc = rc.copy(false);`
`5048`		`- lrc.setLocale(new Locale(l));`
	`5048`	`+ lrc.setLocale(Locale.forLanguageTag(l));`
`5049`	`5049`	`rcLangs.seeLang(l, lrc);`
`5050`	`5050`	`}`
`5051`	`5051`	`realmRules = makeRealmBusinessRules();`
`@@ -15259,7 +15259,7 @@ public static void main(String[] args) throws Exception {`
`15259`	`15259`	`}`
`15260`	`15260`
`15261`	`15261`	`private void setForcedLanguage(String language) {`
`15262`		`- this.forcedLanguage = new Locale(language);`
	`15262`	`+ this.forcedLanguage = Locale.forLanguageTag(language);`
`15263`	`15263`	`}`
`15264`	`15264`
`15265`	`15265`	`public static String getAbsoluteConfigFilePath(String configFilePath) throws IOException {`