From 675b0e1769d5d5cf000e91aa07f0de13779cef5c Mon Sep 17 00:00:00 2001
From: Brick Green <86254221+brick-green@users.noreply.github.com>
Date: Thu, 19 Sep 2024 19:34:22 -0400
Subject: [PATCH] move initializeQueueMessages to companion object (#15928)

---
 prime-router/src/main/kotlin/common/BaseEngine.kt           | 6 ++++++
 .../src/main/kotlin/fhirengine/azure/FHIRFunctions.kt       | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/prime-router/src/main/kotlin/common/BaseEngine.kt b/prime-router/src/main/kotlin/common/BaseEngine.kt
index de7054d34b5..f0e7bcede09 100644
--- a/prime-router/src/main/kotlin/common/BaseEngine.kt
+++ b/prime-router/src/main/kotlin/common/BaseEngine.kt
@@ -7,6 +7,7 @@ import gov.cdc.prime.router.SettingsProvider
 import gov.cdc.prime.router.azure.DatabaseAccess
 import gov.cdc.prime.router.azure.QueueAccess
 import gov.cdc.prime.router.azure.SettingsFacade
+import gov.cdc.prime.router.fhirengine.engine.initializeQueueMessages
 import gov.cdc.prime.router.serializers.CsvSerializer
 import gov.cdc.prime.router.serializers.Hl7Serializer
 import org.apache.logging.log4j.kotlin.Logging
@@ -23,6 +24,11 @@ abstract class BaseEngine(
     companion object {
         val sequentialLimit = 500
 
+        // initialize the json types in PrimeRouterQueueMessage
+        init {
+            initializeQueueMessages()
+        }
+
         /**
          * These are all potentially heavyweight objects that
          * should only be created once.
diff --git a/prime-router/src/main/kotlin/fhirengine/azure/FHIRFunctions.kt b/prime-router/src/main/kotlin/fhirengine/azure/FHIRFunctions.kt
index 3d50e1bf9e9..d8cb1732d3c 100644
--- a/prime-router/src/main/kotlin/fhirengine/azure/FHIRFunctions.kt
+++ b/prime-router/src/main/kotlin/fhirengine/azure/FHIRFunctions.kt
@@ -22,7 +22,6 @@ import gov.cdc.prime.router.fhirengine.engine.FHIRTranslator
 import gov.cdc.prime.router.fhirengine.engine.FhirReceiveQueueMessage
 import gov.cdc.prime.router.fhirengine.engine.PrimeRouterQueueMessage
 import gov.cdc.prime.router.fhirengine.engine.ReportPipelineMessage
-import gov.cdc.prime.router.fhirengine.engine.initializeQueueMessages
 import org.apache.commons.lang3.StringUtils
 import org.apache.logging.log4j.kotlin.Logging
 
@@ -158,8 +157,6 @@ class FHIRFunctions(
         logger.debug(
             "${StringUtils.removeEnd(engineType, "e")}ing message: $message for the $dequeueCount time"
         )
-        // initialize the json types in PrimeRouterQueueMessage
-        initializeQueueMessages()
 
         return when (val queueMessage = QueueMessage.deserialize(message)) {
             is QueueMessage.ReceiveQueueMessage -> {