Remove more deprecated FHIR core APIs (#1421)

cqframework · Oct 7, 2024 · 4e3be26 · 4e3be26
1 parent 533b7f6
commit 4e3be26
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/Src/java/cqf-fhir/src/main/java/org/cqframework/fhir/utilities/IGContext.java b/Src/java/cqf-fhir/src/main/java/org/cqframework/fhir/utilities/IGContext.java
@@ -9,7 +9,7 @@
 import org.hl7.fhir.convertors.conv30_50.VersionConvertor_30_50;
 import org.hl7.fhir.convertors.conv40_50.VersionConvertor_40_50;
 import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.r5.context.IWorkerContext;
+import org.hl7.fhir.r5.context.ILoggingService;
 import org.hl7.fhir.r5.elementmodel.Manager;
 import org.hl7.fhir.r5.model.ImplementationGuide;
 import org.hl7.fhir.utilities.IniFile;
@@ -19,9 +19,9 @@
 
 public class IGContext {
 
-    private IWorkerContext.ILoggingService logger;
+    private ILoggingService logger;
 
-    public IWorkerContext.ILoggingService getLogger() {
+    public ILoggingService getLogger() {
         return logger;
     }
 
@@ -65,7 +65,7 @@ protected void setBinaryPaths(List<String> binaryPaths) {
         this.binaryPaths = binaryPaths;
     }
 
-    public IGContext(IWorkerContext.ILoggingService logger) {
+    public IGContext(ILoggingService logger) {
         this.logger = logger;
     }
 

diff --git a/Src/java/cqf-fhir/src/main/java/org/cqframework/fhir/utilities/LoggerAdapter.java b/Src/java/cqf-fhir/src/main/java/org/cqframework/fhir/utilities/LoggerAdapter.java
@@ -1,9 +1,9 @@
 package org.cqframework.fhir.utilities;
 
-import org.hl7.fhir.r5.context.IWorkerContext;
+import org.hl7.fhir.r5.context.ILoggingService;
 import org.slf4j.Logger;
 
-public class LoggerAdapter implements IWorkerContext.ILoggingService {
+public class LoggerAdapter implements ILoggingService {
     private Logger innerLogger;
 
     public LoggerAdapter(Logger innerLogger) {

diff --git a/Src/java/cqf-fhir/src/test/java/org/cqframework/fhir/utilities/TestIGContext.java b/Src/java/cqf-fhir/src/test/java/org/cqframework/fhir/utilities/TestIGContext.java
@@ -6,10 +6,10 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import org.hl7.fhir.r5.context.IWorkerContext;
+import org.hl7.fhir.r5.context.ILoggingService;
 import org.junit.jupiter.api.Test;
 
-public class TestIGContext implements IWorkerContext.ILoggingService {
+public class TestIGContext implements ILoggingService {
 
     @Test
     void typesAndValuesIG() throws URISyntaxException {

diff --git a/Src/java/gradle.properties b/Src/java/gradle.properties
@@ -2,6 +2,8 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096m
 
+systemProp.sonar.gradle.skipCompile=true
+
 group=info.cqframework
 version=3.17.0-SNAPSHOT
 specification.version=1.5.2