diff --git a/build.sbt b/build.sbt index c0232a1f..219881ef 100644 --- a/build.sbt +++ b/build.sbt @@ -1,16 +1,16 @@ import com.amazonaws.services.s3.model.PutObjectResult import com.softwaremill.Publish.ossPublishSettings import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings -import com.typesafe.sbt.packager.docker._ +import com.typesafe.sbt.packager.docker.* import sbt.Keys.javaOptions import sbt.internal.util.complete.Parsers.spaceDelimited import scoverage.ScoverageKeys.* import scala.sys.process.Process -val v2_12 = "2.12.15" -val v2_13 = "2.13.8" -val v3 = "3.3.1" +val v2_12 = "2.12.19" +val v2_13 = "2.13.13" +val v3 = "3.4.1" lazy val resolvedScalaVersion = sys.env.get("SCALA_MAJOR_VERSION") match { diff --git a/core/src/test/scala/org/elasticmq/actor/QueueActorMsgOpsTest.scala b/core/src/test/scala/org/elasticmq/actor/QueueActorMsgOpsTest.scala index 1a07fe63..232e9d41 100644 --- a/core/src/test/scala/org/elasticmq/actor/QueueActorMsgOpsTest.scala +++ b/core/src/test/scala/org/elasticmq/actor/QueueActorMsgOpsTest.scala @@ -15,7 +15,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val q1 = createQueueData("q1", MillisVisibilityTimeout(1L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) // When lookupResult <- queueActor ? LookupMessage(MessageId("xyz")) @@ -32,7 +32,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D createNewMessageData("xyz", "123", Map(), MillisNextDelivery(123L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(message) // When @@ -51,7 +51,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m = createNewMessageData("xyz", maxMessageContent, Map(), MillisNextDelivery(123L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(m) // When @@ -68,8 +68,8 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val q2 = createQueueData("q2", MillisVisibilityTimeout(2L)) for { - Right(queueActor1) <- queueManagerActor ? CreateQueue(q1) - Right(queueActor2) <- queueManagerActor ? CreateQueue(q2) + case Right(queueActor1) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor2) <- queueManagerActor ? CreateQueue(q2) _ <- queueActor1 ? SendMessage(createNewMessageData("xyz", "123", Map(), MillisNextDelivery(50L))) // When @@ -88,8 +88,8 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m = createNewMessageData("xyz", "123", Map(), MillisNextDelivery(50L)) for { - Right(queueActor1) <- queueManagerActor ? CreateQueue(q1) - Right(queueActor2) <- queueManagerActor ? CreateQueue(q2) + case Right(queueActor1) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor2) <- queueManagerActor ? CreateQueue(q2) _ <- queueActor1 ? SendMessage(m) // When @@ -107,7 +107,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m = createNewMessageData("xyz", "123", Map(), MillisNextDelivery(50L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(m) // When @@ -126,7 +126,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val q1 = createQueueData("q1", MillisVisibilityTimeout(1L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(createNewMessageData("xyz", "123", Map(), MillisNextDelivery(50L))) @@ -153,7 +153,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val q1 = createQueueData("q1", MillisVisibilityTimeout(1L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(createNewMessageData("xyz", "123", Map(), MillisNextDelivery(50L))) // When @@ -177,7 +177,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val q1 = createQueueData("q1", MillisVisibilityTimeout(100L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(createNewMessageData("xyz", "123", Map(), MillisNextDelivery(123L))) // When @@ -194,7 +194,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m = createNewMessageData("xyz", "1234", Map(), MillisNextDelivery(100L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(m) List(mdata) <- queueActor ? ReceiveMessages(DefaultVisibilityTimeout, 1, None, None) @@ -218,7 +218,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D createNewMessageData("xyz2", "1234", Map(), MillisNextDelivery(100L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(m1) _ <- queueActor ? SendMessage(m2) @@ -241,7 +241,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m1 = createNewMessageData("xyz", "123", Map(), MillisNextDelivery(50L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(m1) List(m1data) <- queueActor ? ReceiveMessages(DefaultVisibilityTimeout, 1, None, None) @@ -260,7 +260,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m1 = createNewMessageData("xyz", "123", Map(), MillisNextDelivery(50L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(m1) List(m1data) <- queueActor ? ReceiveMessages(DefaultVisibilityTimeout, 1, None, None) @@ -280,11 +280,11 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m1 = createNewMessageData("xyz", "123", Map(), MillisNextDelivery(50L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(m1) // When - Some(lookupResult) <- queueActor ? LookupMessage(m1.id.get) + case Some(lookupResult) <- queueActor ? LookupMessage(m1.id.get) List(receiveResult1) <- queueActor ? ReceiveMessages(DefaultVisibilityTimeout, 1, None, None) _ = nowProvider.mutableNowMillis.set(110L) List(receiveResult2) <- queueActor ? ReceiveMessages(DefaultVisibilityTimeout, 1, None, None) @@ -307,7 +307,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val List(m1, m2, m3, m4, m5) = msgs for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(m1) _ <- queueActor ? SendMessage(m2) _ <- queueActor ? SendMessage(m3) @@ -333,7 +333,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val List(m1, m2, m3) = msgs for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(m1) _ <- queueActor ? SendMessage(m2) _ <- queueActor ? SendMessage(m3) @@ -354,7 +354,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val start = System.currentTimeMillis() for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) // When receiveResults <- queueActor ? ReceiveMessages(DefaultVisibilityTimeout, 5, Some(Duration.ofMillis(500L)), None) @@ -374,7 +374,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D createNewMessageData("xyz", "123", Map(), MillisNextDelivery(200L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) // When receiveResultsFuture = queueActor ? ReceiveMessages( @@ -403,7 +403,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val start = System.currentTimeMillis() for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) // When receiveResults1Future = queueActor ? ReceiveMessages( @@ -442,7 +442,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D createNewMessageData("xyz2", "123b", Map(), MillisNextDelivery(100)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) // When receiveResults1Future = queueActor ? ReceiveMessages( @@ -493,8 +493,8 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m1 = createNewMessageData(m1ID, "123", Map(), MillisNextDelivery(100)) for { - Right(deadLettersQueueActor) <- queueManagerActor ? CreateQueue(dlq1) - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(deadLettersQueueActor) <- queueManagerActor ? CreateQueue(dlq1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? SendMessage(m1) // When @@ -527,8 +527,8 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m1 = createNewMessageData(m1ID, "123", Map(), MillisNextDelivery(100)) for { - Right(deadLettersQueueActor) <- queueManagerActor ? CreateQueue(dlq1) - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(deadLettersQueueActor) <- queueManagerActor ? CreateQueue(dlq1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? UpdateQueueDeadLettersQueue( Some(DeadLettersQueueData(deadLettersQueueName, 1)), Some(deadLettersQueueActor) @@ -559,8 +559,8 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m1 = createNewMessageData(m1ID, "123", Map(), MillisNextDelivery(100)) for { - Right(redirectToActor) <- queueManagerActor ? CreateQueue(redirectToQueue) - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(redirectToActor) <- queueManagerActor ? CreateQueue(redirectToQueue) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) // When sendAck <- queueActor ? SendMessage(m1) @@ -583,8 +583,8 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D val m1 = createNewMessageData(m1ID, "123", Map(), MillisNextDelivery(100)) for { - Right(copyToActor) <- queueManagerActor ? CreateQueue(copyToQueue) - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(copyToActor) <- queueManagerActor ? CreateQueue(copyToQueue) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) // When _ <- queueActor ? SendMessage(m1) diff --git a/core/src/test/scala/org/elasticmq/actor/QueueActorQueueOpsTest.scala b/core/src/test/scala/org/elasticmq/actor/QueueActorQueueOpsTest.scala index b37b21d4..a24307c7 100644 --- a/core/src/test/scala/org/elasticmq/actor/QueueActorQueueOpsTest.scala +++ b/core/src/test/scala/org/elasticmq/actor/QueueActorQueueOpsTest.scala @@ -16,7 +16,7 @@ class QueueActorQueueOpsTest extends ActorTest with QueueManagerForEachTest with val lastModified = OffsetDateTimeUtil.ofEpochMilli(1316168602L) for { - Right(queueActor) <- queueManagerActor ? CreateQueue( + case Right(queueActor) <- queueManagerActor ? CreateQueue( CreateQueueData.from( QueueData("q1", MillisVisibilityTimeout(1L), Duration.ZERO, Duration.ZERO, created, lastModified) ) @@ -38,7 +38,7 @@ class QueueActorQueueOpsTest extends ActorTest with QueueManagerForEachTest with val q1Modified = createQueueData("q1", MillisVisibilityTimeout(100L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) // When _ <- queueActor ? UpdateQueueDefaultVisibilityTimeout(MillisVisibilityTimeout(100L)) @@ -54,7 +54,7 @@ class QueueActorQueueOpsTest extends ActorTest with QueueManagerForEachTest with val q1 = createQueueData("q1", MillisVisibilityTimeout(1L), tags = tags) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) queueData <- queueActor ? GetQueueData() } yield { queueData.tags should be(tags) @@ -66,7 +66,7 @@ class QueueActorQueueOpsTest extends ActorTest with QueueManagerForEachTest with val q1 = createQueueData("q1", MillisVisibilityTimeout(1L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? UpdateQueueTags(tags) queueData <- queueActor ? GetQueueData() } yield { @@ -80,7 +80,7 @@ class QueueActorQueueOpsTest extends ActorTest with QueueManagerForEachTest with val q1 = createQueueData("q1", MillisVisibilityTimeout(1L), tags = tags) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? UpdateQueueTags(newTag) queueData <- queueActor ? GetQueueData() } yield { @@ -94,7 +94,7 @@ class QueueActorQueueOpsTest extends ActorTest with QueueManagerForEachTest with val q1 = createQueueData("q1", MillisVisibilityTimeout(1L), tags = tags) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(q1) + case Right(queueActor) <- queueManagerActor ? CreateQueue(q1) _ <- queueActor ? UpdateQueueTags(newTag) queueData <- queueActor ? GetQueueData() } yield { @@ -107,7 +107,7 @@ class QueueActorQueueOpsTest extends ActorTest with QueueManagerForEachTest with val queue = createQueueData("q1", MillisVisibilityTimeout(1L)) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(queue) + case Right(queueActor) <- queueManagerActor ? CreateQueue(queue) // When stats <- queueActor ? GetQueueStatistics(123L) @@ -136,7 +136,7 @@ class QueueActorQueueOpsTest extends ActorTest with QueueManagerForEachTest with nowProvider.mutableNowMillis.set(123L) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(queue) + case Right(queueActor) <- queueManagerActor ? CreateQueue(queue) // Invisible messages - received _ <- queueActor ? SendMessage(m1) @@ -175,7 +175,7 @@ class QueueActorQueueOpsTest extends ActorTest with QueueManagerForEachTest with nowProvider.mutableNowMillis.set(123L) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(queue) + case Right(queueActor) <- queueManagerActor ? CreateQueue(queue) // Invisible messages - received _ <- queueActor ? SendMessage(m1) @@ -205,7 +205,7 @@ class QueueActorQueueOpsTest extends ActorTest with QueueManagerForEachTest with ) for { - Right(queueActor) <- queueManagerActor ? CreateQueue(queue) + case Right(queueActor) <- queueManagerActor ? CreateQueue(queue) _ <- queueActor ? SendMessage(msg) firstBatch <- queueActor ? ReceiveMessages(DefaultVisibilityTimeout, 1, None, None) diff --git a/core/src/test/scala/org/elasticmq/actor/QueueEventListenerTest.scala b/core/src/test/scala/org/elasticmq/actor/QueueEventListenerTest.scala index a9c4b555..116cd133 100644 --- a/core/src/test/scala/org/elasticmq/actor/QueueEventListenerTest.scala +++ b/core/src/test/scala/org/elasticmq/actor/QueueEventListenerTest.scala @@ -28,7 +28,7 @@ class QueueEventListenerTest extends ActorTest with QueueManagerWithListenerForE test("QueueMetadataUpdated event should be triggerred") { for { - Right(queue) <- queueManagerActor ? CreateQueue(createQueueData("q1", MillisVisibilityTimeout(1L))) + case Right(queue) <- queueManagerActor ? CreateQueue(createQueueData("q1", MillisVisibilityTimeout(1L))) _ <- queue ? UpdateQueueDefaultVisibilityTimeout(MillisVisibilityTimeout(1000)) } yield { queueEventListener.expectMsgType[QueueEvent.QueueCreated].queue.name shouldBe "q1" @@ -42,7 +42,7 @@ class QueueEventListenerTest extends ActorTest with QueueManagerWithListenerForE test("QueueMessageAdded event should be triggerred") { for { - Right(queue) <- queueManagerActor ? CreateQueue(createQueueData("q1", MillisVisibilityTimeout(1L))) + case Right(queue) <- queueManagerActor ? CreateQueue(createQueueData("q1", MillisVisibilityTimeout(1L))) _ <- queue ? SendMessage(createNewMessageData("abc", "xyz", Map.empty, MillisNextDelivery(100))) } yield { queueEventListener.expectMsgType[QueueEvent.QueueCreated].queue.name shouldBe "q1" @@ -52,7 +52,7 @@ class QueueEventListenerTest extends ActorTest with QueueManagerWithListenerForE test("QueueMessageUpdated event should be triggerred") { for { - Right(queue) <- queueManagerActor ? CreateQueue(createQueueData("q1", MillisVisibilityTimeout(1L))) + case Right(queue) <- queueManagerActor ? CreateQueue(createQueueData("q1", MillisVisibilityTimeout(1L))) _ <- queue ? SendMessage(createNewMessageData("abc", "xyz", Map.empty, MillisNextDelivery(100))) List(msg) <- queue ? ReceiveMessages(MillisVisibilityTimeout(1), 1, None, None) _ <- queue ? UpdateVisibilityTimeout(msg.deliveryReceipt.get, MillisVisibilityTimeout(2000)) @@ -65,7 +65,7 @@ class QueueEventListenerTest extends ActorTest with QueueManagerWithListenerForE test("QueueMessageRemoved event should be triggerred") { for { - Right(queue) <- queueManagerActor ? CreateQueue(createQueueData("q1", MillisVisibilityTimeout(1L))) + case Right(queue) <- queueManagerActor ? CreateQueue(createQueueData("q1", MillisVisibilityTimeout(1L))) _ <- queue ? SendMessage(createNewMessageData("abc", "xyz", Map.empty, MillisNextDelivery(1))) List(msg) <- queue ? ReceiveMessages(MillisVisibilityTimeout(1), 1, None, None) _ <- queue ? DeleteMessage(msg.deliveryReceipt.get)