Skip to content

Upgrade scala versions #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 12, 2024
Merged

Upgrade scala versions #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83eb9d6
upgrade scala versions
micossow Apr 12, 2024
5ffd92a
fix refutable patterns errors
micossow Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
62 changes: 31 additions & 31 deletions core/src/test/scala/org/elasticmq/actor/QueueActorMsgOpsTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)))

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)

Expand All @@ -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)

Expand All @@ -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)

Expand All @@ -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)

Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions core/src/test/scala/org/elasticmq/actor/QueueActorQueueOpsTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
Expand All @@ -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))
Expand All @@ -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)
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions core/src/test/scala/org/elasticmq/actor/QueueEventListenerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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))
Expand All @@ -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)
Expand Down