Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ daaea1a1da5d3374ea1c3e17891f8f1ae37f8418

# Scala Steward: Reformat with scalafmt 3.8.0
54cde10f84ee0b99ea71dcf70c0c8dcacd4a7802

# Scala Steward: Reformat with scalafmt 3.8.2
a835b7008a8cd6bfe97706dd8823593ae6bc99f7
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=3.8.1
version=3.8.2
maxColumn = 120
runner.dialect = scala213
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ trait QueueActorStorage {
case Some(r) =>
logger.debug(s"Sending message $r from ${context.self} to $actualSender")
actualSender ! r
case None =>
case None =>
}
case Failure(ex) => logger.error(s"Failed to notify queue event listener. The state may be inconsistent.", ex)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,30 @@
package org.elasticmq.rest.sqs.client

import com.amazonaws.services.sqs.AmazonSQS
import com.amazonaws.services.sqs.model.{BatchResultErrorEntry, CancelMessageMoveTaskRequest, ChangeMessageVisibilityBatchRequest, ChangeMessageVisibilityBatchRequestEntry, CreateQueueRequest, DeleteMessageBatchRequest, DeleteMessageBatchRequestEntry, GetQueueAttributesRequest, GetQueueUrlRequest, ListDeadLetterSourceQueuesRequest, ListMessageMoveTasksRequest, MessageAttributeValue, MessageSystemAttributeValue, PurgeQueueRequest, QueueDoesNotExistException, ReceiveMessageRequest, ResourceNotFoundException, SendMessageBatchRequest, SendMessageBatchRequestEntry, SendMessageRequest, StartMessageMoveTaskRequest, UnsupportedOperationException}
import com.amazonaws.services.sqs.model.{
BatchResultErrorEntry,
CancelMessageMoveTaskRequest,
ChangeMessageVisibilityBatchRequest,
ChangeMessageVisibilityBatchRequestEntry,
CreateQueueRequest,
DeleteMessageBatchRequest,
DeleteMessageBatchRequestEntry,
GetQueueAttributesRequest,
GetQueueUrlRequest,
ListDeadLetterSourceQueuesRequest,
ListMessageMoveTasksRequest,
MessageAttributeValue,
MessageSystemAttributeValue,
PurgeQueueRequest,
QueueDoesNotExistException,
ReceiveMessageRequest,
ResourceNotFoundException,
SendMessageBatchRequest,
SendMessageBatchRequestEntry,
SendMessageRequest,
StartMessageMoveTaskRequest,
UnsupportedOperationException
}
import org.elasticmq._

import java.nio.ByteBuffer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,42 @@
package org.elasticmq.rest.sqs.client
import org.elasticmq.{BinaryMessageAttribute, MessageAttribute, NumberMessageAttribute, StringMessageAttribute}
import software.amazon.awssdk.core.SdkBytes
import software.amazon.awssdk.services.sqs.model.{AddPermissionRequest, BatchResultErrorEntry, CancelMessageMoveTaskRequest, ChangeMessageVisibilityBatchRequest, ChangeMessageVisibilityBatchRequestEntry, ChangeMessageVisibilityRequest, CreateQueueRequest, DeleteMessageBatchRequest, DeleteMessageBatchRequestEntry, DeleteMessageRequest, DeleteQueueRequest, GetQueueAttributesRequest, GetQueueUrlRequest, ListDeadLetterSourceQueuesRequest, ListMessageMoveTasksRequest, ListQueueTagsRequest, ListQueuesRequest, MessageAttributeValue, MessageSystemAttributeNameForSends, MessageSystemAttributeValue, PurgeQueueRequest, QueueDoesNotExistException, ReceiveMessageRequest, RemovePermissionRequest, ResourceNotFoundException, SendMessageBatchRequest, SendMessageBatchRequestEntry, SendMessageRequest, StartMessageMoveTaskRequest, TagQueueRequest, UnsupportedOperationException, UntagQueueRequest, MessageSystemAttributeName => SdkMessageSystemAttributeName, QueueAttributeName => AwsQueueAttributeName}
import software.amazon.awssdk.services.sqs.model.{
AddPermissionRequest,
BatchResultErrorEntry,
CancelMessageMoveTaskRequest,
ChangeMessageVisibilityBatchRequest,
ChangeMessageVisibilityBatchRequestEntry,
ChangeMessageVisibilityRequest,
CreateQueueRequest,
DeleteMessageBatchRequest,
DeleteMessageBatchRequestEntry,
DeleteMessageRequest,
DeleteQueueRequest,
GetQueueAttributesRequest,
GetQueueUrlRequest,
ListDeadLetterSourceQueuesRequest,
ListMessageMoveTasksRequest,
ListQueueTagsRequest,
ListQueuesRequest,
MessageAttributeValue,
MessageSystemAttributeNameForSends,
MessageSystemAttributeValue,
PurgeQueueRequest,
QueueDoesNotExistException,
ReceiveMessageRequest,
RemovePermissionRequest,
ResourceNotFoundException,
SendMessageBatchRequest,
SendMessageBatchRequestEntry,
SendMessageRequest,
StartMessageMoveTaskRequest,
TagQueueRequest,
UnsupportedOperationException,
UntagQueueRequest,
MessageSystemAttributeName => SdkMessageSystemAttributeName,
QueueAttributeName => AwsQueueAttributeName
}

import scala.collection.JavaConverters._

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ trait BatchRequestsModule {
throw SQSException.batchEntryIdsNotDistinct
}

Limits.verifyBatchSize(uniqueIds.size, sqsLimits).fold(_ => throw SQSException.tooManyEntriesInBatchRequest, identity)
Limits
.verifyBatchSize(uniqueIds.size, sqsLimits)
.fold(_ => throw SQSException.tooManyEntriesInBatchRequest, identity)

val result = messagesData.zipWithIndex.map {
case (messageData, index) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ trait SendMessageDirectives {
// FIFO queues don't support delays
throw SQSException.invalidQueueTypeParameter(DelaySecondsParameter)
case Some(v) if v == 0 && queueData.isFifo => None
case d => d
case d => d
}

val nextDelivery = delaySecondsOption match {
Expand Down