Merge pull request #677 from softwaremill/queue-ordering-fix

Queue ordering fix

Author: micossow

persistence/persistence-file/src/main/scala/org/elasticmq/persistence/file/QueueConfigUtil.scala

@@ -1,7 +1,7 @@
 package org.elasticmq.persistence.file
 
 import com.typesafe.config.{Config, ConfigFactory, ConfigObject, ConfigValue}
-import org.elasticmq.persistence.{CreateQueueMetadata, DeadLettersQueue}
+import org.elasticmq.persistence.{CreateQueueMetadata, DeadLettersQueue, QueueSorter}
 import org.joda.time.DateTime
 
 import java.io.File
@@ -43,7 +43,7 @@ object QueueConfigUtil {
 
     val now = new DateTime().toInstant.getMillis
 
-    queuesConfig.map { case (n, v) =>
+    val unsortedQueues = queuesConfig.map { case (n, v) =>
       val c = v.asInstanceOf[ConfigObject].toConfig
       val isFifo = getOptionalBoolean(c, "fifo").getOrElse(false)
       CreateQueueMetadata(
@@ -68,6 +68,7 @@ object QueueConfigUtil {
         tags = getOptionalTags(c, "tags")
       )
     }.toList
+    QueueSorter.sortCreateQueues(unsortedQueues)
   }
 
   private def addSuffixWhenFifoQueue(queueName: String, isFifo: Boolean): String = {

persistence/persistence-file/src/test/resources/expected-single-queue-config.conf

@@ -17,4 +17,8 @@ queues {
       tag1Key = tag1Value
     }
   }
+  dead {
+    created = 0,
+    lastModified = 0,
+  }
 }

persistence/persistence-file/src/test/scala/org/elasticmq/persistence/file/QueueConfigUtilTest.scala

@@ -60,8 +60,10 @@ class QueueConfigUtilTest extends AnyFunSuite with Matchers with OptionValues {
       Some("messageTo"),
       Map("tag1Key" -> "tag1Value")
     )
-    persistedQueues.length shouldBe 1
-    persistedQueues.head shouldBe expectedQueue
+    val expectedDeadLetters = CreateQueueMetadata("dead")
+    persistedQueues.length shouldBe 2
+    persistedQueues.head shouldBe expectedDeadLetters
+    persistedQueues.last shouldBe expectedQueue
   }
 
   test("Persisted queues should take precedence over startup queues with same names") {