Engine warning cleanup (#1624)

* Add rewrite framework, fix detekt warnings

* Remove checkstyle config

* More warnings, fix tests on windows

* Clean up ExpandEvaluator

* Few more fixes

* More warning cleanup

* more fixes

* more fixes

* More warnings

Author: JPercival

Src/java/buildSrc/build.gradle.kts

@@ -19,14 +19,9 @@ dependencies {
     implementation("org.glassfish.jaxb:xsom:4.0.5")
     implementation("com.squareup:kotlinpoet:2.1.0")
     implementation("com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:5.6.7")
+    implementation("org.openrewrite.rewrite:org.openrewrite.rewrite.gradle.plugin:7.17.0")
 }
 
 kotlin {
     jvmToolchain(17)
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
 }

Src/java/buildSrc/src/main/kotlin/cql.java-conventions.gradle.kts renamed to Src/java/buildSrc/src/main/kotlin/cql.kotlin-conventions.gradle.kts

@@ -5,9 +5,9 @@ plugins {
     kotlin("jvm")
     id("cql.maven-publishing-conventions")
     id("jacoco")
-    id("cql.sca-conventions")
     id("org.jetbrains.dokka")
     id("io.gitlab.arturbosch.detekt")
+    id("org.openrewrite.rewrite")
 }
 
 repositories {
@@ -18,19 +18,28 @@ repositories {
     }
 }
 
+// Reenable once we have time to address the issues
+//detekt {
+//    // Applies the config files on top of detekt's default config.
+//    buildUponDefaultConfig = true
+//
+//    // The directories where detekt looks for source files.
+//    source.setFrom(
+//        "src/main/kotlin",
+//        "src/test/kotlin",
+//    )
+//
+//    // Custom config with overrides.
+//    config.setFrom("$rootDir/config/detekt/detekt.yml")
+//}
+
 kotlin {
     jvmToolchain(17)
     compilerOptions {
         freeCompilerArgs.add("-Xwarning-level=DEPRECATION:disabled")
     }
 }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 dependencies {
     implementation("org.slf4j:slf4j-api:2.0.13")
     testImplementation("org.hamcrest:hamcrest-all:1.3")
@@ -44,6 +53,8 @@ dependencies {
     testRuntimeOnly("org.eclipse.persistence:org.eclipse.persistence.moxy:4.0.2")
     testRuntimeOnly("org.eclipse.parsson:parsson:1.1.5")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
+    rewrite(project(":rewrite"))
 }
 
 tasks.jar {
@@ -63,7 +74,6 @@ tasks.register<Jar>("dokkaHtmlJar") {
 
 jacoco {
     toolVersion = "0.8.11"
-
 }
 
 tasks.withType<Test> {

Src/java/buildSrc/src/main/kotlin/cql.library-conventions.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("ru.vyarus.animalsniffer")
-    id("cql.java-conventions")
+    id("cql.kotlin-conventions")
 }
 
 dependencies {

Src/java/buildSrc/src/main/kotlin/cql.sca-conventions.gradle.kts

@@ -17,26 +17,30 @@ import org.hl7.fhir.r5.model.Library
 import org.hl7.fhir.utilities.VersionUtilities
 
 class LibraryLoader(private val version: String?) : ILibraryReader {
+    @Suppress("VariableNaming")
     @Throws(FHIRFormatError::class, IOException::class)
     override fun readLibrary(stream: InputStream?): Library? {
-        if (VersionUtilities.isR2Ver(version)) {
-            throw FHIRException("Library is not supported in R2")
-        } else if (VersionUtilities.isR2BVer(version)) {
-            val res = JsonParser().parse(stream)
-            val versionConvertor_14_50 = VersionConvertor_14_50(BaseAdvisor_14_50())
-            return versionConvertor_14_50.convertResource(res) as Library?
-        } else if (VersionUtilities.isR3Ver(version)) {
-            val res = org.hl7.fhir.dstu3.formats.JsonParser().parse(stream)
-            val versionConvertor_30_50 = VersionConvertor_30_50(BaseAdvisor_30_50())
-            return versionConvertor_30_50.convertResource(res) as Library?
-        } else if (VersionUtilities.isR4Ver(version)) {
-            val res = org.hl7.fhir.r4.formats.JsonParser().parse(stream)
-            val versionConvertor_40_50 = VersionConvertor_40_50(BaseAdvisor_40_50())
-            return versionConvertor_40_50.convertResource(res) as Library?
-        } else if (VersionUtilities.isR5Ver(version)) {
-            return org.hl7.fhir.r5.formats.JsonParser().parse(stream) as Library?
-        } else {
-            throw FHIRException("Unknown Version '$version'")
+        return when {
+            VersionUtilities.isR2Ver(version) ->
+                throw FHIRException("Library is not supported in R2")
+            VersionUtilities.isR2BVer(version) -> {
+                val res = JsonParser().parse(stream)
+                val versionConvertor_14_50 = VersionConvertor_14_50(BaseAdvisor_14_50())
+                versionConvertor_14_50.convertResource(res) as Library?
+            }
+            VersionUtilities.isR3Ver(version) -> {
+                val res = org.hl7.fhir.dstu3.formats.JsonParser().parse(stream)
+                val versionConvertor_30_50 = VersionConvertor_30_50(BaseAdvisor_30_50())
+                versionConvertor_30_50.convertResource(res) as Library?
+            }
+            VersionUtilities.isR4Ver(version) -> {
+                val res = org.hl7.fhir.r4.formats.JsonParser().parse(stream)
+                val versionConvertor_40_50 = VersionConvertor_40_50(BaseAdvisor_40_50())
+                versionConvertor_40_50.convertResource(res) as Library?
+            }
+            VersionUtilities.isR5Ver(version) ->
+                org.hl7.fhir.r5.formats.JsonParser().parse(stream) as Library?
+            else -> throw FHIRException("Unknown Version '$version'")
         }
     }
 }

Src/java/config/checkstyle/checkstyle.xml

@@ -2,7 +2,6 @@ package org.cqframework.fhir.npm
 
 import java.io.ByteArrayInputStream
 import java.io.IOException
-import java.lang.String
 import kotlin.plus
 import kotlinx.io.Source
 import kotlinx.io.asSource
@@ -19,6 +18,7 @@ class NpmLibrarySourceProvider(
     private val reader: ILibraryReader,
     private val logger: ILoggingService,
 ) : LibrarySourceProvider {
+    @Suppress("NestedBlockDepth")
     override fun getLibrarySource(libraryIdentifier: VersionedIdentifier): Source? {
         // VersionedIdentifier.id: Name of the library
         // VersionedIdentifier.system: Namespace for the library, as a URL
@@ -52,13 +52,10 @@ class NpmLibrarySourceProvider(
                         }
                     }
                 }
-            } catch (e: IOException) {
+            } catch (_: IOException) {
                 logger.logDebugMessage(
                     ILoggingService.LogCategory.PROGRESS,
-                    String.format(
-                        "Exceptions occurred attempting to load npm library source for %s",
-                        libraryIdentifier.toString(),
-                    ),
+                    "Exceptions occurred attempting to load npm library source for $libraryIdentifier",
                 )
             }
         }

Src/java/cqf-fhir-npm/src/main/kotlin/org/cqframework/fhir/npm/LibraryLoader.kt

@@ -18,6 +18,7 @@ class NpmModelInfoProvider(
     private val reader: ILibraryReader,
     private val logger: ILoggingService,
 ) : ModelInfoProvider {
+    @Suppress("NestedBlockDepth")
     override fun load(modelIdentifier: ModelIdentifier): ModelInfo? {
         // VersionedIdentifier.id: Name of the model
         // VersionedIdentifier.system: Namespace for the model, as a URL
@@ -53,13 +54,10 @@ class NpmModelInfoProvider(
                         }
                     }
                 }
-            } catch (e: IOException) {
+            } catch (_: IOException) {
                 logger.logDebugMessage(
                     ILoggingService.LogCategory.PROGRESS,
-                    String.format(
-                        "Exceptions occurred attempting to load npm library for model %s",
-                        modelIdentifier,
-                    ),
+                    "Exceptions occurred attempting to load npm library for model $modelIdentifier",
                 )
             }
         }

Src/java/cqf-fhir-npm/src/main/kotlin/org/cqframework/fhir/npm/NpmLibrarySourceProvider.kt

@@ -25,9 +25,9 @@ constructor(
         try {
             this.fspcm = fspcm ?: FilesystemPackageCacheManager.Builder().build()
             loadDependencies()
-        } catch (e: Exception) {
+        } catch (e: IOException) {
             logErrorMessage(e.message)
-            throw NpmPackageManagerException(e.message)
+            throw NpmPackageManagerException(e.message, e)
         }
     }
 

Src/java/cqf-fhir-npm/src/main/kotlin/org/cqframework/fhir/npm/NpmModelInfoProvider.kt

@@ -2,9 +2,5 @@ package org.cqframework.fhir.npm
 
 /** This exception is thrown whenever there is an issue with the NpmPackageManager. */
 class NpmPackageManagerException : RuntimeException {
-    constructor(message: String?) : super(message)
-
-    companion object {
-        const val serialVersionUID: Long = 1L
-    }
+    constructor(message: String?, t: Throwable? = null) : super(message, t)
 }