Light, fluffy, and always free - The AWS Local Emulator alternative
refactor(sqs): move library usages to imports (#3896)
Vũ Thế Huy709214557c12
diff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueue.java b/src/main/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueue.javaindex 15c1b5e866..2f71271d71 100644--- a/src/main/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueue.java+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueue.java@@ -5,7 +5,12 @@ import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.services.sqs.model.Message;import java.time.Instant;-import java.util.*;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;+import java.util.Optional;+import java.util.Set;+import java.util.UUID;import java.util.concurrent.locks.ReentrantLock;import java.util.function.Predicate;import java.util.stream.Collectors;@@ -48,7 +53,7 @@ class GuardedMessageQueue {}void addMessage(Message message) {- try (var _ = hold()) {+ try (Guard _ = hold()) {messages.add(message);persist();}@@ -57,7 +62,7 @@ class GuardedMessageQueue {/** If persisting fails the in-memory add is rolled back and the exception propagates, so a* caller that compensates on the source side does not leave a duplicate here. */void addAll(List<Message> toAdd) {- try (var _ = hold()) {+ try (Guard _ = hold()) {int mark = messages.size();messages.addAll(toAdd);try {@@ -72,7 +77,7 @@ class GuardedMessageQueue {ClaimResult claimVisibleMessages(int maxMessages, int effectiveTimeout,boolean fifo, int maxReceiveCount,String deadLetterTargetArn) {- try (var _ = hold()) {+ try (Guard _ = hold()) {List<Message> claimed = new ArrayList<>();List<Message> dlqCandidates = new ArrayList<>();@@ -150,7 +155,7 @@ class GuardedMessageQueue {}Optional<Message> removeByReceiptHandle(String receiptHandle) {- try (var _ = hold()) {+ try (Guard _ = hold()) {Message removed = null;for (Iterator<Message> it = messages.iterator(); it.hasNext(); ) {Message m = it.next();@@ -168,7 +173,7 @@ class GuardedMessageQueue {}boolean changeVisibility(String receiptHandle, int visibilityTimeout) {- try (var _ = hold()) {+ try (Guard _ = hold()) {for (Message msg : messages) {if (receiptHandle.equals(msg.getReceiptHandle())) {msg.setVisibleAt(Instant.now().plusSeconds(visibilityTimeout));@@ -181,21 +186,21 @@ class GuardedMessageQueue {}void removeMessages(List<Message> toRemove) {- try (var _ = hold()) {+ try (Guard _ = hold()) {messages.removeAll(toRemove);persist();}}void purge() {- try (var _ = hold()) {+ try (Guard _ = hold()) {messages.clear();persist();}}List<Message> drainAll() {- try (var _ = hold()) {+ try (Guard _ = hold()) {List<Message> drained = new ArrayList<>(messages);messages.clear();persist();@@ -208,7 +213,7 @@ class GuardedMessageQueue {* hold so nothing can slip in between. Used by the message-move-task worker so the source* queue stays observably populated for the duration of a rate-limited move. */Message drainFirstIf(Predicate<Message> eligible) {- try (var _ = hold()) {+ try (Guard _ = hold()) {if (messages.isEmpty() || !eligible.test(messages.getFirst())) {return null;}@@ -220,7 +225,7 @@ class GuardedMessageQueue {/** Put a message that could not be delivered back at the head, preserving queue order. */void restoreFirst(Message message) {- try (var _ = hold()) {+ try (Guard _ = hold()) {messages.addFirst(message);persist();}@@ -238,7 +243,7 @@ class GuardedMessageQueue {* DelaySeconds, so it counts as delayed rather than in flight.*/MessageCounts messageCounts() {- try (var _ = hold()) {+ try (Guard _ = hold()) {long visible = 0;long inFlight = 0;long delayed = 0;@@ -256,13 +261,13 @@ class GuardedMessageQueue {}List<Message> peekAll() {- try (var _ = hold()) {+ try (Guard _ = hold()) {return new ArrayList<>(messages);}}boolean isEmpty() {- try (var _ = hold()) {+ try (Guard _ = hold()) {return messages.isEmpty();}}@@ -272,7 +277,7 @@ class GuardedMessageQueue {}Message findByDeduplicationId(String dedupId, String messageGroupId) {- try (var _ = hold()) {+ try (Guard _ = hold()) {return messages.stream().filter(msg -> dedupId.equals(msg.getMessageDeduplicationId())).filter(msg -> messageGroupId == nulldiff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsJsonHandler.javaindex 489410b1bc..7ee871a31c 100644--- a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsJsonHandler.java@@ -1,14 +1,14 @@package io.github.hectorvent.floci.services.sqs;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.sqs.model.Message;import io.github.hectorvent.floci.services.sqs.model.MessageAttributeValue;import io.github.hectorvent.floci.services.sqs.model.Queue;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;@@ -16,8 +16,10 @@ import jakarta.ws.rs.core.Response;import java.util.ArrayList;import java.util.Base64;import java.util.HashMap;+import java.util.LinkedHashSet;import java.util.List;import java.util.Map;+import java.util.Set;/*** SQS JSON protocol handler (application/x-amz-json-1.0).@@ -83,7 +85,7 @@ public class SqsJsonHandler {}private void writeSystemAttributesJson(ObjectNode msgNode, Message msg,- java.util.Set<String> requested, String senderId) {+ Set<String> requested, String senderId) {if (requested.isEmpty()) {return;}@@ -136,7 +138,6 @@ public class SqsJsonHandler {Map<String, String> attributes = jsonNodeToMap(request.path("Attributes"));Map<String, String> tags = jsonNodeToMap(request.path("tags"));Queue queue = sqsService.createQueue(queueName, attributes, tags, region);-ObjectNode response = objectMapper.createObjectNode();response.put("QueueUrl", queue.getQueueUrl());return Response.ok(response).build();@@ -151,11 +152,10 @@ public class SqsJsonHandler {private Response handleListQueues(JsonNode request, String region) {String prefix = request.path("QueueNamePrefix").asText(null);List<Queue> queues = sqsService.listQueues(prefix, region);-ObjectNode response = objectMapper.createObjectNode();- ArrayNode urls = response.putArray("QueueUrls");+ ArrayNode queueUrls = response.putArray("QueueUrls");for (Queue q : queues) {- urls.add(q.getQueueUrl());+ queueUrls.add(q.getQueueUrl());}return Response.ok(response).build();}@@ -163,7 +163,6 @@ public class SqsJsonHandler {private Response handleGetQueueUrl(JsonNode request, String region) {String queueName = request.path("QueueName").asText(null);String queueUrl = sqsService.getQueueUrl(queueName, region);-ObjectNode response = objectMapper.createObjectNode();response.put("QueueUrl", queueUrl);return Response.ok(response).build();@@ -174,8 +173,8 @@ public class SqsJsonHandler {List<String> attributeNames = new ArrayList<>();JsonNode namesNode = request.path("AttributeNames");if (namesNode.isArray()) {- for (JsonNode n : namesNode) {- attributeNames.add(n.asText());+ for (JsonNode name : namesNode) {+ attributeNames.add(name.asText());}}if (attributeNames.isEmpty()) {@@ -186,7 +185,7 @@ public class SqsJsonHandler {ObjectNode response = objectMapper.createObjectNode();ObjectNode attrsNode = response.putObject("Attributes");- for (var entry : attributes.entrySet()) {+ for (Map.Entry<String, String> entry : attributes.entrySet()) {attrsNode.put(entry.getKey(), entry.getValue());}return Response.ok(response).build();@@ -257,7 +256,7 @@ public class SqsJsonHandler {int visibilityTimeout = request.path("VisibilityTimeout").asInt(-1);Integer waitTimeSeconds = getOptionalIntField(request, "WaitTimeSeconds");- java.util.Set<String> requestedAttrs = new java.util.LinkedHashSet<>();+ Set<String> requestedAttrs = new LinkedHashSet<>();requestedAttrs.addAll(jsonNodeToList(request.path("AttributeNames")));requestedAttrs.addAll(jsonNodeToList(request.path("MessageSystemAttributeNames")));@@ -287,7 +286,7 @@ public class SqsJsonHandler {if (msg.getMessageAttributes() != null && !msg.getMessageAttributes().isEmpty()) {ObjectNode msgAttrs = msgNode.putObject("MessageAttributes");- for (var entry : msg.getMessageAttributes().entrySet()) {+ for (Map.Entry<String, MessageAttributeValue> entry : msg.getMessageAttributes().entrySet()) {ObjectNode valNode = msgAttrs.putObject(entry.getKey());valNode.put("DataType", entry.getValue().getDataType());if (entry.getValue().getBinaryValue() != null) {@@ -522,7 +521,7 @@ public class SqsJsonHandler {ArrayNode successful = objectMapper.createArrayNode();ArrayNode failed = objectMapper.createArrayNode();- for (var result : results) {+ for (SqsService.BatchResultEntry result : results) {if (result.success()) {ObjectNode success = objectMapper.createObjectNode();success.put("Id", result.id());@@ -571,7 +570,7 @@ public class SqsJsonHandler {ObjectNode response = objectMapper.createObjectNode();ObjectNode tagsNode = response.putObject("Tags");- for (var entry : tags.entrySet()) {+ for (Map.Entry<String, String> entry : tags.entrySet()) {tagsNode.put(entry.getKey(), entry.getValue());}return Response.ok(response).build();diff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsQueryHandler.javaindex b0e4bc5754..3d068bcc44 100644--- a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsQueryHandler.java@@ -1,9 +1,13 @@package io.github.hectorvent.floci.services.sqs;-import io.github.hectorvent.floci.core.common.*;+import io.github.hectorvent.floci.core.common.AwsErrorMessages;+import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.common.AwsNamespaces;+import io.github.hectorvent.floci.core.common.AwsQueryResponse;+import io.github.hectorvent.floci.core.common.XmlBuilder;import io.github.hectorvent.floci.services.sqs.model.Message;-import io.github.hectorvent.floci.services.sqs.model.Queue;import io.github.hectorvent.floci.services.sqs.model.MessageAttributeValue;+import io.github.hectorvent.floci.services.sqs.model.Queue;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.MultivaluedMap;@@ -13,8 +17,10 @@ import org.jboss.logging.Logger;import java.util.ArrayList;import java.util.Base64;import java.util.HashMap;+import java.util.LinkedHashSet;import java.util.List;import java.util.Map;+import java.util.Set;/*** Query-protocol handler for SQS actions.@@ -95,7 +101,7 @@ public class SqsQueryHandler {}private static void writeSystemAttributesXml(XmlBuilder xml, Message msg,- java.util.Set<String> requested, String senderId) {+ Set<String> requested, String senderId) {if (requested.isEmpty()) {return;}@@ -168,7 +174,7 @@ public class SqsQueryHandler {String prefix = getParam(params, "QueueNamePrefix");List<Queue> queues = sqsService.listQueues(prefix, region);- var xml = new XmlBuilder();+ XmlBuilder xml = new XmlBuilder();for (Queue q : queues) {xml.elem("QueueUrl", q.getQueueUrl());}@@ -197,8 +203,8 @@ public class SqsQueryHandler {Map<String, String> attributes = sqsService.getQueueAttributes(queueUrl, attributeNames, region);- var xml = new XmlBuilder();- for (var entry : attributes.entrySet()) {+ XmlBuilder xml = new XmlBuilder();+ for (Map.Entry<String, String> entry : attributes.entrySet()) {xml.start("Attribute").elem("Name", entry.getKey()).elem("Value", entry.getValue())@@ -246,7 +252,7 @@ public class SqsQueryHandler {Message msg = sqsService.sendMessage(queueUrl, body, delaySeconds, messageGroupId,messageDeduplicationId, messageAttributes, awsTraceHeader, region);- var xml = new XmlBuilder()+ XmlBuilder xml = new XmlBuilder().elem("MessageId", msg.getMessageId()).elem("MD5OfMessageBody", msg.getMd5OfBody());if (msg.getMd5OfMessageAttributes() != null) {@@ -264,14 +270,14 @@ public class SqsQueryHandler {int visibilityTimeout = getIntParam(params, "VisibilityTimeout", -1);Integer waitTimeSeconds = getOptionalIntParam(params, "WaitTimeSeconds");- java.util.Set<String> requestedAttrs = new java.util.LinkedHashSet<>();+ Set<String> requestedAttrs = new LinkedHashSet<>();requestedAttrs.addAll(collectIndexed(params, "AttributeName."));requestedAttrs.addAll(collectIndexed(params, "MessageSystemAttributeName."));List<Message> messages = sqsService.receiveMessage(queueUrl, maxMessages, visibilityTimeout, waitTimeSeconds, region);String senderId = sqsService.senderIdFor(queueUrl);- var xml = new XmlBuilder();+ XmlBuilder xml = new XmlBuilder();for (Message msg : messages) {xml.start("Message").elem("MessageId", msg.getMessageId())@@ -283,7 +289,7 @@ public class SqsQueryHandler {xml.elem("Body", msg.getBody());writeSystemAttributesXml(xml, msg, requestedAttrs, senderId);if (msg.getMessageAttributes() != null && !msg.getMessageAttributes().isEmpty()) {- for (var entry : msg.getMessageAttributes().entrySet()) {+ for (Map.Entry<String, MessageAttributeValue> entry : msg.getMessageAttributes().entrySet()) {xml.start("MessageAttribute").elem("Name", entry.getKey()).start("Value")@@ -319,7 +325,7 @@ public class SqsQueryHandler {private Response handleDeleteMessageBatch(MultivaluedMap<String, String> params, String region) {String queueUrl = getParam(params, "QueueUrl");- var xml = new XmlBuilder();+ XmlBuilder xml = new XmlBuilder();for (int i = 1; ; i++) {String id = getParam(params, "DeleteMessageBatchRequestEntry." + i + ".Id");@@ -343,7 +349,7 @@ public class SqsQueryHandler {private Response handleSendMessageBatch(MultivaluedMap<String, String> params, String region) {String queueUrl = getParam(params, "QueueUrl");- var xml = new XmlBuilder();+ XmlBuilder xml = new XmlBuilder();record ParsedEntry(String id, String body, Integer delay, String groupId, String dedupId,Map<String, MessageAttributeValue> attributes, String awsTraceHeader) {}@@ -396,7 +402,7 @@ public class SqsQueryHandler {for (ParsedEntry parsed : parsedEntries) {String id = parsed.id();try {- var msg = sqsService.sendMessage(queueUrl, parsed.body(), parsed.delay(),+ Message msg = sqsService.sendMessage(queueUrl, parsed.body(), parsed.delay(),parsed.groupId(), parsed.dedupId(), parsed.attributes(),parsed.awsTraceHeader(), region);xml.start("SendMessageBatchResultEntry")@@ -426,7 +432,7 @@ public class SqsQueryHandler {private Response handleListDeadLetterSourceQueues(MultivaluedMap<String, String> params, String region) {String queueUrl = getParam(params, "QueueUrl");List<String> queues = sqsService.listDeadLetterSourceQueues(queueUrl, region);- var xml = new XmlBuilder();+ XmlBuilder xml = new XmlBuilder();for (String q : queues) {xml.elem("QueueUrl", q);}@@ -438,7 +444,7 @@ public class SqsQueryHandler {String destinationArn = getParam(params, "DestinationArn");int maxRate = getIntParam(params, "MaxNumberOfMessagesPerSecond", 0);String taskHandle = sqsService.startMessageMoveTask(sourceArn, destinationArn, maxRate, region);- var xml = new XmlBuilder().elem("TaskHandle", taskHandle);+ XmlBuilder xml = new XmlBuilder().elem("TaskHandle", taskHandle);return Response.ok(AwsQueryResponse.envelope("StartMessageMoveTask", null, xml.build())).build();}@@ -446,7 +452,7 @@ public class SqsQueryHandler {String sourceArn = getParam(params, "SourceArn");int maxResults = getIntParam(params, "MaxResults", 10);List<SqsService.MoveTask> tasks = sqsService.listMessageMoveTasks(sourceArn, region);- var xml = new XmlBuilder();+ XmlBuilder xml = new XmlBuilder();int count = 0;for (SqsService.MoveTask t : tasks) {if (count++ >= maxResults) break;@@ -472,7 +478,7 @@ public class SqsQueryHandler {private Response handleCancelMessageMoveTask(MultivaluedMap<String, String> params, String region) {String taskHandle = getParam(params, "TaskHandle");long moved = sqsService.cancelMessageMoveTask(taskHandle, region);- var xml = new XmlBuilder().elem("ApproximateNumberOfMessagesMoved", moved);+ XmlBuilder xml = new XmlBuilder().elem("ApproximateNumberOfMessagesMoved", moved);return Response.ok(AwsQueryResponse.envelope("CancelMessageMoveTask", null, xml.build())).build();}@@ -491,7 +497,7 @@ public class SqsQueryHandler {private Response handleChangeMessageVisibilityBatch(MultivaluedMap<String, String> params, String region) {String queueUrl = getParam(params, "QueueUrl");- var entries = new ArrayList<SqsService.ChangeVisibilityBatchEntry>();+ List<SqsService.ChangeVisibilityBatchEntry> entries = new ArrayList<>();for (int i = 1; ; i++) {String id = getParam(params, "ChangeMessageVisibilityBatchRequestEntry." + i + ".Id");if (id == null) break;@@ -500,9 +506,9 @@ public class SqsQueryHandler {entries.add(new SqsService.ChangeVisibilityBatchEntry(id, receiptHandle, visibilityTimeout));}- var results = sqsService.changeMessageVisibilityBatch(queueUrl, entries, region);- var xml = new XmlBuilder();- for (var result : results) {+ List<SqsService.BatchResultEntry> results = sqsService.changeMessageVisibilityBatch(queueUrl, entries, region);+ XmlBuilder xml = new XmlBuilder();+ for (SqsService.BatchResultEntry result : results) {if (result.success()) {xml.start("ChangeMessageVisibilityBatchResultEntry").elem("Id", result.id())@@ -548,8 +554,8 @@ public class SqsQueryHandler {String queueUrl = getParam(params, "QueueUrl");Map<String, String> tags = sqsService.listQueueTags(queueUrl, region);- var xml = new XmlBuilder();- for (var entry : tags.entrySet()) {+ XmlBuilder xml = new XmlBuilder();+ for (Map.Entry<String, String> entry : tags.entrySet()) {xml.start("Tag").elem("Key", entry.getKey()).elem("Value", entry.getValue())diff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.java b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.javaindex 56f3a1d61a..015ccba6ad 100644--- a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.java@@ -1,5 +1,10 @@package io.github.hectorvent.floci.services.sqs;+import com.fasterxml.jackson.core.type.TypeReference;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;@@ -13,26 +18,39 @@ import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.sns.SnsService;import io.github.hectorvent.floci.services.sqs.model.Message;-import io.github.hectorvent.floci.services.sqs.model.Queue;-import com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.services.sqs.model.MessageAttributeValue;+import io.github.hectorvent.floci.services.sqs.model.Queue;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;+import java.nio.charset.StandardCharsets;+import java.security.MessageDigest;+import java.security.NoSuchAlgorithmException;import java.time.Clock;import java.time.Duration;import java.time.Instant;-import java.util.*;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.HashMap;+import java.util.HexFormat;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Objects;+import java.util.Optional;+import java.util.Set;+import java.util.UUID;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.CountDownLatch;+import java.util.concurrent.ExecutorService;+import java.util.concurrent.Executors;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicLong;+import java.util.stream.Collectors;@ApplicationScopedpublic class SqsService implements Resettable, ResourceProvider {@@ -62,8 +80,8 @@ public class SqsService implements Resettable, ResourceProvider {new ConcurrentHashMap<>();/** Move tasks execute on a background thread so MaxNumberOfMessagesPerSecond can throttle* and CancelMessageMoveTask has something to interrupt. One thread per task is sufficient. */- private final java.util.concurrent.ExecutorService moveTaskExecutor =- java.util.concurrent.Executors.newCachedThreadPool(r -> {+ private final ExecutorService moveTaskExecutor =+ Executors.newCachedThreadPool(r -> {Thread t = new Thread(r, "sqs-move-task");t.setDaemon(true);return t;@@ -156,7 +174,7 @@ public class SqsService implements Resettable, ResourceProvider {Set<String> sourceArns = entries.values().stream().filter(Entry::terminal).map(entry -> entry.task().sourceArn())- .collect(java.util.stream.Collectors.toSet());+ .collect(Collectors.toSet());for (String sourceArn : sourceArns) {List<Map.Entry<String, Entry>> terminalEntries = entries.entrySet().stream().filter(entry -> entry.getValue().terminal()@@ -390,7 +408,7 @@ public class SqsService implements Resettable, ResourceProvider {if (dedupStore == null) {return;}- var dedupMap = deduplicationCache.get(storageKey);+ ConcurrentHashMap<String, Instant> dedupMap = deduplicationCache.get(storageKey);if (dedupMap != null && !dedupMap.isEmpty()) {Map<String, Long> serializable = new HashMap<>();dedupMap.forEach((id, expiry) -> serializable.put(id, expiry.toEpochMilli()));@@ -509,7 +527,7 @@ public class SqsService implements Resettable, ResourceProvider {"The specified queue does not exist.", 400);}queueStore.delete(storageKey);- var removed = messagesByQueue.remove(storageKey);+ GuardedMessageQueue removed = messagesByQueue.remove(storageKey);if (removed != null) {removed.close();}@@ -560,13 +578,13 @@ public class SqsService implements Resettable, ResourceProvider {.orElseThrow(() -> new AwsException("AWS.SimpleQueueService.NonExistentQueue","The specified queue does not exist.", 400));- Map<String, String> attrs = new java.util.LinkedHashMap<>(queue.getAttributes());+ Map<String, String> attrs = new LinkedHashMap<>(queue.getAttributes());// Add computed attributesattrs.put("QueueArn", regionResolver.buildArn("sqs", region, queue.getQueueName()));attrs.put("CreatedTimestamp", String.valueOf(queue.getCreatedTimestamp().getEpochSecond()));attrs.put("LastModifiedTimestamp", String.valueOf(queue.getLastModifiedTimestamp().getEpochSecond()));- var counts = getOrCreateQueue(storageKey).messageCounts();+ GuardedMessageQueue.MessageCounts counts = getOrCreateQueue(storageKey).messageCounts();attrs.put("ApproximateNumberOfMessages", String.valueOf(counts.visible()));attrs.put("ApproximateNumberOfMessagesNotVisible", String.valueOf(counts.inFlight()));attrs.put("ApproximateNumberOfMessagesDelayed", String.valueOf(counts.delayed()));@@ -594,7 +612,7 @@ public class SqsService implements Resettable, ResourceProvider {if (attributeNames == null || attributeNames.contains("All")) {return attrs;}- var filtered = new java.util.LinkedHashMap<String, String>();+ Map<String, String> filtered = new LinkedHashMap<>();for (String name : attributeNames) {if (attrs.containsKey(name)) {filtered.put(name, attrs.get(name));@@ -683,7 +701,7 @@ public class SqsService implements Resettable, ResourceProvider {// MessageGroupId/MessageDeduplicationId, so the composite key is unambiguous.String dedupCacheKey = groupScoped ? messageGroupId + "\0" + dedupId : dedupId;cleanupDeduplicationCache(storageKey);- var dedupMap = deduplicationCache.computeIfAbsent(storageKey, k -> new ConcurrentHashMap<>());+ ConcurrentHashMap<String, Instant> dedupMap = deduplicationCache.computeIfAbsent(storageKey, k -> new ConcurrentHashMap<>());Instant expiry = Instant.now().plusSeconds(DEDUP_WINDOW_SECONDS);Instant previous = dedupMap.putIfAbsent(dedupCacheKey, expiry);persistDedup(storageKey);@@ -821,20 +839,20 @@ public class SqsService implements Resettable, ResourceProvider {* UTF-8 body bytes + per-attribute (name UTF-8 + type UTF-8 + value bytes).*/public static int computeMessageSize(String body, Map<String, MessageAttributeValue> attributes) {- int total = body == null ? 0 : body.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;+ int total = body == null ? 0 : body.getBytes(StandardCharsets.UTF_8).length;if (attributes == null || attributes.isEmpty()) {return total;}for (Map.Entry<String, MessageAttributeValue> entry : attributes.entrySet()) {- total += entry.getKey().getBytes(java.nio.charset.StandardCharsets.UTF_8).length;+ total += entry.getKey().getBytes(StandardCharsets.UTF_8).length;MessageAttributeValue value = entry.getValue();if (value.getDataType() != null) {- total += value.getDataType().getBytes(java.nio.charset.StandardCharsets.UTF_8).length;+ total += value.getDataType().getBytes(StandardCharsets.UTF_8).length;}if (value.getBinaryValue() != null) {total += value.getBinaryValue().length;} else if (value.getStringValue() != null) {- total += value.getStringValue().getBytes(java.nio.charset.StandardCharsets.UTF_8).length;+ total += value.getStringValue().getBytes(StandardCharsets.UTF_8).length;}}return total;@@ -862,7 +880,7 @@ public class SqsService implements Resettable, ResourceProvider {}private void cleanupDeduplicationCache(String queueUrl) {- var dedupMap = deduplicationCache.get(queueUrl);+ ConcurrentHashMap<String, Instant> dedupMap = deduplicationCache.get(queueUrl);if (dedupMap != null) {Instant now = Instant.now();dedupMap.entrySet().removeIf(e -> now.isAfter(e.getValue()));@@ -871,10 +889,11 @@ public class SqsService implements Resettable, ResourceProvider {private static String computeMd5(String input) {try {- var md = java.security.MessageDigest.getInstance("MD5");- byte[] digest = md.digest(input.getBytes(java.nio.charset.StandardCharsets.UTF_8));+ MessageDigest md = MessageDigest.getInstance("MD5");+ byte[] digest = md.digest(input.getBytes(StandardCharsets.UTF_8));return HEX.formatHex(digest);- } catch (java.security.NoSuchAlgorithmException e) {+ } catch (NoSuchAlgorithmException ignored) {+ // MD5 is guaranteed to be available in the standard JDK runtimereturn "";}}@@ -955,7 +974,7 @@ public class SqsService implements Resettable, ResourceProvider {return redrivePolicyCache.computeIfAbsent(storageKey, k -> {try {- var rp = new com.fasterxml.jackson.databind.ObjectMapper().readTree(rawPolicy);+ JsonNode rp = new ObjectMapper().readTree(rawPolicy);return new RedrivePolicy(rp.has("maxReceiveCount") ? rp.get("maxReceiveCount").asInt() : -1,rp.has("deadLetterTargetArn") ? rp.get("deadLetterTargetArn").asText() : null@@ -985,15 +1004,15 @@ public class SqsService implements Resettable, ResourceProvider {int maxReceiveCount = rp != null ? rp.maxReceiveCount() : -1;String deadLetterTargetArn = rp != null ? rp.deadLetterTargetArn() : null;- var guardedQueue = getOrCreateQueue(storageKey);- var claimResult = guardedQueue.claimVisibleMessages(+ GuardedMessageQueue guardedQueue = getOrCreateQueue(storageKey);+ GuardedMessageQueue.ClaimResult claimResult = guardedQueue.claimVisibleMessages(maxMessages, effectiveTimeout, queue.isFifo(), maxReceiveCount, deadLetterTargetArn);// Route DLQ candidates to the dead-letter queue only if the destination resolvesif (!claimResult.dlqCandidates().isEmpty() && deadLetterTargetArn != null) {String dlqUrl = queueUrlFromArn(deadLetterTargetArn, region);if (dlqUrl != null) {- var dlqCandidates = claimResult.dlqCandidates();+ List<Message> dlqCandidates = claimResult.dlqCandidates();guardedQueue.removeMessages(dlqCandidates);for (Message msg : dlqCandidates) {msg.setVisibleAt(null);@@ -1167,8 +1186,8 @@ public class SqsService implements Resettable, ResourceProvider {}}- var srcQueueInitial = getOrCreateQueue(srcKey);- var srcCounts = srcQueueInitial.messageCounts();+ GuardedMessageQueue srcQueueInitial = getOrCreateQueue(srcKey);+ GuardedMessageQueue.MessageCounts srcCounts = srcQueueInitial.messageCounts();long toMove = srcCounts.visible() + srcCounts.inFlight() + srcCounts.delayed();String taskHandle = "task-" + UUID.randomUUID();@@ -1263,7 +1282,7 @@ public class SqsService implements Resettable, ResourceProvider {long intervalMillis = maxRate > 0 ? Math.max(1L, 1000L / maxRate) : 0L;long moved = initialMoved;try {- var srcQueue = getOrCreateQueue(srcKey);+ GuardedMessageQueue srcQueue = getOrCreateQueue(srcKey);while (!cancelled.isRequested()) {if (intervalMillis > 0) {try {@@ -1354,7 +1373,7 @@ public class SqsService implements Resettable, ResourceProvider {return null;}try {- JsonNode policy = new com.fasterxml.jackson.databind.ObjectMapper().readTree(raw);+ JsonNode policy = new ObjectMapper().readTree(raw);JsonNode dlqArn = policy.get("deadLetterTargetArn");return dlqArn != null && !dlqArn.isNull() ? dlqArn.asText() : null;} catch (Exception e) {@@ -1372,7 +1391,7 @@ public class SqsService implements Resettable, ResourceProvider {List<ChangeVisibilityBatchEntry> entries, String region) {ensureQueueExists(regionKey(region, queueUrl));List<BatchResultEntry> results = new ArrayList<>();- for (var entry : entries) {+ for (ChangeVisibilityBatchEntry entry : entries) {try {changeMessageVisibility(queueUrl, entry.receiptHandle(), entry.visibilityTimeout(), region);results.add(new BatchResultEntry(entry.id(), true, null, null));@@ -1540,7 +1559,7 @@ public class SqsService implements Resettable, ResourceProvider {Queue queue = queueStore.get(storageKey).orElseThrow(() -> new AwsException("AWS.SimpleQueueService.NonExistentQueue","The specified queue does not exist.", 400));- return new java.util.LinkedHashMap<>(queue.getTags());+ return new LinkedHashMap<>(queue.getTags());}/**diff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/model/Message.java b/src/main/java/io/github/hectorvent/floci/services/sqs/model/Message.javaindex dfb4b713f0..eda78d9ce7 100644--- a/src/main/java/io/github/hectorvent/floci/services/sqs/model/Message.java+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/model/Message.java@@ -4,8 +4,16 @@ import com.fasterxml.jackson.annotation.JsonIgnore;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.io.ByteArrayOutputStream;+import java.io.DataOutputStream;+import java.nio.charset.StandardCharsets;+import java.security.MessageDigest;+import java.security.NoSuchAlgorithmException;import java.time.Instant;+import java.util.ArrayList;+import java.util.Collections;import java.util.HashMap;+import java.util.List;import java.util.Map;import java.util.UUID;@@ -133,20 +141,20 @@ public class Message {return;}try {- var md = java.security.MessageDigest.getInstance("MD5");- java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();- java.io.DataOutputStream dos = new java.io.DataOutputStream(bos);+ MessageDigest md = MessageDigest.getInstance("MD5");+ ByteArrayOutputStream bos = new ByteArrayOutputStream();+ DataOutputStream dos = new DataOutputStream(bos);- java.util.List<String> keys = new java.util.ArrayList<>(messageAttributes.keySet());- java.util.Collections.sort(keys);+ List<String> keys = new ArrayList<>(messageAttributes.keySet());+ Collections.sort(keys);for (String key : keys) {MessageAttributeValue val = messageAttributes.get(key);- byte[] nameBytes = key.getBytes(java.nio.charset.StandardCharsets.UTF_8);+ byte[] nameBytes = key.getBytes(StandardCharsets.UTF_8);dos.writeInt(nameBytes.length);dos.write(nameBytes);- byte[] typeBytes = val.getDataType().getBytes(java.nio.charset.StandardCharsets.UTF_8);+ byte[] typeBytes = val.getDataType().getBytes(StandardCharsets.UTF_8);dos.writeInt(typeBytes.length);dos.write(typeBytes);@@ -156,33 +164,35 @@ public class Message {dos.write(val.getBinaryValue());} else {dos.write(1); // String or Number- byte[] valBytes = val.getStringValue().getBytes(java.nio.charset.StandardCharsets.UTF_8);+ byte[] valBytes = val.getStringValue().getBytes(StandardCharsets.UTF_8);dos.writeInt(valBytes.length);dos.write(valBytes);}}byte[] digest = md.digest(bos.toByteArray());- var sb = new StringBuilder();+ StringBuilder sb = new StringBuilder();for (byte b : digest) {sb.append(String.format("%02x", b));}this.md5OfMessageAttributes = sb.toString();- } catch (Exception e) {+ } catch (Exception ignored) {+ // Attribute serialization failure falls back to null MD5this.md5OfMessageAttributes = null;}}private static String computeMd5(String input) {try {- var md = java.security.MessageDigest.getInstance("MD5");- byte[] digest = md.digest(input.getBytes(java.nio.charset.StandardCharsets.UTF_8));- var sb = new StringBuilder();+ MessageDigest md = MessageDigest.getInstance("MD5");+ byte[] digest = md.digest(input.getBytes(StandardCharsets.UTF_8));+ StringBuilder sb = new StringBuilder();for (byte b : digest) {sb.append(String.format("%02x", b));}return sb.toString();- } catch (java.security.NoSuchAlgorithmException e) {+ } catch (NoSuchAlgorithmException ignored) {+ // MD5 is always available in the standard JDK runtimereturn "";}}diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueueTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueueTest.javaindex ad18f967f3..29ef09b06c 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueueTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueueTest.java@@ -1,6 +1,8 @@package io.github.hectorvent.floci.services.sqs;import io.github.hectorvent.floci.core.storage.InMemoryStorage;+import io.github.hectorvent.floci.services.sqs.GuardedMessageQueue.ClaimResult;+import io.github.hectorvent.floci.services.sqs.GuardedMessageQueue.MessageCounts;import io.github.hectorvent.floci.services.sqs.model.Message;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;@@ -40,7 +42,7 @@ class GuardedMessageQueueTest {void addAndClaimSingleMessage() {queue.addMessage(new Message("hello"));- var result = queue.claimVisibleMessages(1, 30, false, -1, null);+ ClaimResult result = queue.claimVisibleMessages(1, 30, false, -1, null);assertEquals(1, result.claimed().size());assertEquals("hello", result.claimed().get(0).getBody());assertNotNull(result.claimed().get(0).getReceiptHandle());@@ -50,7 +52,7 @@ class GuardedMessageQueueTest {@Testvoid claimEmptyQueueReturnsEmpty() {- var result = queue.claimVisibleMessages(1, 30, false, -1, null);+ ClaimResult result = queue.claimVisibleMessages(1, 30, false, -1, null);assertTrue(result.claimed().isEmpty());assertTrue(result.dlqCandidates().isEmpty());}@@ -59,10 +61,10 @@ class GuardedMessageQueueTest {void claimedMessageBecomesInvisible() {queue.addMessage(new Message("msg1"));- var first = queue.claimVisibleMessages(1, 30, false, -1, null);+ ClaimResult first = queue.claimVisibleMessages(1, 30, false, -1, null);assertEquals(1, first.claimed().size());- var second = queue.claimVisibleMessages(1, 30, false, -1, null);+ ClaimResult second = queue.claimVisibleMessages(1, 30, false, -1, null);assertTrue(second.claimed().isEmpty());}@@ -72,7 +74,7 @@ class GuardedMessageQueueTest {queue.addMessage(new Message("msg2"));queue.addMessage(new Message("msg3"));- var result = queue.claimVisibleMessages(3, 30, false, -1, null);+ ClaimResult result = queue.claimVisibleMessages(3, 30, false, -1, null);assertEquals(3, result.claimed().size());}@@ -82,7 +84,7 @@ class GuardedMessageQueueTest {queue.addMessage(new Message("msg2"));queue.addMessage(new Message("msg3"));- var result = queue.claimVisibleMessages(2, 30, false, -1, null);+ ClaimResult result = queue.claimVisibleMessages(2, 30, false, -1, null);assertEquals(2, result.claimed().size());}@@ -90,13 +92,13 @@ class GuardedMessageQueueTest {void removeByReceiptHandle() {queue.addMessage(new Message("to-delete"));- var claimed = queue.claimVisibleMessages(1, 30, false, -1, null);+ ClaimResult claimed = queue.claimVisibleMessages(1, 30, false, -1, null);String handle = claimed.claimed().get(0).getReceiptHandle();assertTrue(queue.removeByReceiptHandle(handle).isPresent());// Message should be gone even with visibility timeout 0- var result = queue.claimVisibleMessages(1, 0, false, -1, null);+ ClaimResult result = queue.claimVisibleMessages(1, 0, false, -1, null);assertTrue(result.claimed().isEmpty());}@@ -109,13 +111,13 @@ class GuardedMessageQueueTest {void changeVisibility() {queue.addMessage(new Message("msg"));- var claimed = queue.claimVisibleMessages(1, 30, false, -1, null);+ ClaimResult claimed = queue.claimVisibleMessages(1, 30, false, -1, null);String handle = claimed.claimed().get(0).getReceiptHandle();// Set visibility to 0 — message becomes visible immediatelyassertTrue(queue.changeVisibility(handle, 0));- var reClaimed = queue.claimVisibleMessages(1, 30, false, -1, null);+ ClaimResult reClaimed = queue.claimVisibleMessages(1, 30, false, -1, null);assertEquals(1, reClaimed.claimed().size());}@@ -131,7 +133,7 @@ class GuardedMessageQueueTest {queue.purge();- var result = queue.claimVisibleMessages(10, 30, false, -1, null);+ ClaimResult result = queue.claimVisibleMessages(10, 30, false, -1, null);assertTrue(result.claimed().isEmpty());}@@ -144,17 +146,17 @@ class GuardedMessageQueueTest {assertEquals(2, drained.size());assertTrue(queue.isEmpty());- var target = new GuardedMessageQueue(null, null);+ GuardedMessageQueue target = new GuardedMessageQueue(null, null);target.addAll(drained);- var result = target.claimVisibleMessages(10, 30, false, -1, null);+ ClaimResult result = target.claimVisibleMessages(10, 30, false, -1, null);assertEquals(2, result.claimed().size());}@Testvoid addAllRollsBackTheInMemoryAddWhenPersistFails() {AtomicBoolean storeDown = new AtomicBoolean();- var store = new InMemoryStorage<String, List<Message>>() {+ InMemoryStorage<String, List<Message>> store = new InMemoryStorage<String, List<Message>>() {@Overridepublic void put(String key, List<Message> value) {if (storeDown.get()) {@@ -163,7 +165,7 @@ class GuardedMessageQueueTest {super.put(key, value);}};- var target = new GuardedMessageQueue(store, "us-east-1::/000000000000/target");+ GuardedMessageQueue target = new GuardedMessageQueue(store, "us-east-1::/000000000000/target");target.addMessage(new Message("already-there"));storeDown.set(true);@@ -182,7 +184,7 @@ class GuardedMessageQueueTest {delayedMessage.setVisibleAt(Instant.now().plusSeconds(60));queue.addMessage(delayedMessage);- var counts = queue.messageCounts();+ MessageCounts counts = queue.messageCounts();assertEquals(3, counts.visible());assertEquals(0, counts.inFlight());assertEquals(1, counts.delayed(),@@ -190,7 +192,7 @@ class GuardedMessageQueueTest {queue.claimVisibleMessages(2, 30, false, -1, null);- var afterClaim = queue.messageCounts();+ MessageCounts afterClaim = queue.messageCounts();assertEquals(1, afterClaim.visible());assertEquals(2, afterClaim.inFlight(),"Claimed messages are in flight, not delayed");@@ -203,7 +205,7 @@ class GuardedMessageQueueTest {delayedMessage.setVisibleAt(Instant.now().minusSeconds(1));queue.addMessage(delayedMessage);- var counts = queue.messageCounts();+ MessageCounts counts = queue.messageCounts();assertEquals(1, counts.visible(),"A message whose delay has elapsed counts as visible");assertEquals(0, counts.delayed());@@ -227,7 +229,7 @@ class GuardedMessageQueueTest {queue.addMessage(g1m2);queue.addMessage(g2m1);- var first = queue.claimVisibleMessages(10, 30, true, -1, null);+ ClaimResult first = queue.claimVisibleMessages(10, 30, true, -1, null);assertEquals(3, first.claimed().size(),"Single FIFO ReceiveMessage should return all visible messages up to MaxNumberOfMessages");List<String> bodies = first.claimed().stream().map(Message::getBody).toList();@@ -239,7 +241,7 @@ class GuardedMessageQueueTest {assertTrue(g1m1Idx < g1m2Idx, "group1 messages must be in insertion order");// All groups now have in-flight messages — second call returns empty- var second = queue.claimVisibleMessages(10, 30, true, -1, null);+ ClaimResult second = queue.claimVisibleMessages(10, 30, true, -1, null);assertTrue(second.claimed().isEmpty());}@@ -258,7 +260,7 @@ class GuardedMessageQueueTest {queue.addMessage(visible);queue.addMessage(delayed);- var result = queue.claimVisibleMessages(10, 30, true, -1, null);+ ClaimResult result = queue.claimVisibleMessages(10, 30, true, -1, null);assertEquals(1, result.claimed().size(),"A delayed message must not block its message group");assertEquals("visible", result.claimed().get(0).getBody());@@ -271,11 +273,11 @@ class GuardedMessageQueueTest {queue.addMessage(new Message("msg"));// Claim and release (visibility=0) to bump receiveCount- var r1 = queue.claimVisibleMessages(1, 0, false, -1, null);+ ClaimResult r1 = queue.claimVisibleMessages(1, 0, false, -1, null);assertEquals(1, r1.claimed().get(0).getReceiveCount());// Claim again — now receiveCount = 2, maxReceiveCount = 1 → DLQ candidate- var r2 = queue.claimVisibleMessages(1, 0, false, 1, "arn:aws:sqs:us-east-1:000000000000:dlq");+ ClaimResult r2 = queue.claimVisibleMessages(1, 0, false, 1, "arn:aws:sqs:us-east-1:000000000000:dlq");assertTrue(r2.claimed().isEmpty());assertEquals(1, r2.dlqCandidates().size());@@ -310,12 +312,12 @@ class GuardedMessageQueueTest {} catch (Exception e) {throw new RuntimeException(e);}- var result = queue.claimVisibleMessages(messageCount, 30, false, -1, null);+ ClaimResult result = queue.claimVisibleMessages(messageCount, 30, false, -1, null);allClaimed.addAll(result.claimed());}));}- for (var f : futures) {+ for (Future<?> f : futures) {f.get(10, TimeUnit.SECONDS);}@@ -362,19 +364,19 @@ class GuardedMessageQueueTest {throw new RuntimeException(e);}if (threadIdx % 2 == 0) {- var result = queue.claimVisibleMessages(messageCount, 30, false, -1, null);+ ClaimResult result = queue.claimVisibleMessages(messageCount, 30, false, -1, null);claimedCount.addAndGet(result.claimed().size());for (Message m : result.claimed()) {queue.removeByReceiptHandle(m.getReceiptHandle());}} else {- var result = queue.claimVisibleMessages(messageCount, 30, false, -1, null);+ ClaimResult result = queue.claimVisibleMessages(messageCount, 30, false, -1, null);claimedCount.addAndGet(result.claimed().size());}}));}- for (var f : futures) {+ for (Future<?> f : futures) {f.get(10, TimeUnit.SECONDS);}diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsFifoIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsFifoIntegrationTest.javaindex 9c631dd3a7..978dc2f72d 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsFifoIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsFifoIntegrationTest.java@@ -8,6 +8,7 @@ import org.junit.jupiter.api.TestMethodOrder;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;+import static org.junit.jupiter.api.Assertions.assertEquals;@QuarkusTest@TestMethodOrder(MethodOrderer.OrderAnnotation.class)@@ -100,7 +101,7 @@ class SqsFifoIntegrationTest {.extract().xmlPath().getString("SendMessageResponse.SendMessageResult.MessageId");// Same message ID returned- org.junit.jupiter.api.Assertions.assertEquals(msgId1, msgId2);+ assertEquals(msgId1, msgId2);}@Testdiff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsIntegrationTest.javaindex af34e10493..285b7e6d75 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.sqs;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.path.xml.XmlPath;import org.junit.jupiter.api.*;import java.util.LinkedHashMap;@@ -832,7 +833,7 @@ class SqsIntegrationTest {}private static Map<String, String> allQueueAttributes(String url) {- var xml = given()+ XmlPath xml = given().contentType("application/x-www-form-urlencoded").formParam("Action", "GetQueueAttributes").formParam("QueueUrl", url)diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.javaindex 2e32fba00d..24273c3558 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java@@ -14,6 +14,9 @@ import jakarta.enterprise.context.ContextNotActiveException;import jakarta.enterprise.inject.Instance;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;+import org.junit.jupiter.params.ParameterizedTest;+import org.junit.jupiter.params.provider.CsvSource;+import org.junit.jupiter.params.provider.ValueSource;import java.time.Duration;import java.time.Instant;@@ -179,7 +182,7 @@ class SqsServiceTest {@Testvoid createQueue_acceptsTheAwsCeilingWhenTheConfiguredMaximumIsLower() {String region = "eu-west-1";- var service = new SqsService(new InMemoryStorage<>(), 30, 131072, BASE_URL, clock);+ SqsService service = new SqsService(new InMemoryStorage<>(), 30, 131072, BASE_URL, clock);Queue defaulted = service.createQueue("lowered-config-default-queue", null, region);assertEquals("131072",@@ -201,8 +204,8 @@ class SqsServiceTest {@Testvoid getQueueAttributes_clampsAStoredMaximumMessageSizeAboveTheCeiling() {String region = "us-east-1";- var store = new InMemoryStorage<String, Queue>();- var service = new SqsService(store, 30, 1048576, BASE_URL, clock);+ InMemoryStorage<String, Queue> store = new InMemoryStorage<>();+ SqsService service = new SqsService(store, 30, 1048576, BASE_URL, clock);Queue queue = service.createQueue("legacy-size-queue", null, region);// A queue persisted by a build that allowed 2 MB, which no validation path can produce.@@ -716,14 +719,14 @@ class SqsServiceTest {@Testvoid purgeQueueClearsFifoDeduplicationCacheWhenEnabled() {String region = "eu-west-1";- final var service = new SqsService(+ SqsService service = new SqsService(new InMemoryStorage<>(), new InMemoryStorage<>(), new InMemoryStorage<>(),30, 1048576, BASE_URL, new RegionResolver("us-east-1", "000000000000"), true, null);- final var queue = service.createQueue("dedup-clear.fifo", Map.of("ContentBasedDeduplication", "true"), region);+ Queue queue = service.createQueue("dedup-clear.fifo", Map.of("ContentBasedDeduplication", "true"), region);// First send — message M1 added, dedup cache populated with "dedup-1"- final var m1 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);+ Message m1 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);assertNotNull(m1.getMessageId());// Purge clears both messages and the dedup cache@@ -732,14 +735,14 @@ class SqsServiceTest {"Queue must be empty after purge");// Re-send with the same dedup ID — cache was cleared so this is treated as a fresh send- final var m2 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);+ Message m2 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);assertNotNull(m2.getMessageId());- final var received = service.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);+ List<Message> received = service.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);assertEquals(1, received.size(), "One message must be in the queue after re-send");// Third send with same dedup ID — fresh cache entry from m2 deduplicates correctly- final var m3 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);+ Message m3 = service.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);assertEquals(m2.getMessageId(), m3.getMessageId(),"Dedup must work with the fresh cache entry after purge");}@@ -748,7 +751,7 @@ class SqsServiceTest {void purgeQueuePreservesFifoDeduplicationCacheByDefault() {String region = "eu-west-1";// Default service has clearFifoDeduplicationCacheOnPurge=false- final var queue = sqsService.createQueue("dedup-preserve.fifo",+ Queue queue = sqsService.createQueue("dedup-preserve.fifo",Map.of("ContentBasedDeduplication", "true"), region);// Send and then purge — messages are gone but dedup cache is intact@@ -762,7 +765,7 @@ class SqsServiceTest {// so it falls through and creates a new messagesqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", "dedup-1", region);- final var received = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);+ List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 10, 30, 0, region);assertEquals(1, received.size(),"Re-send after purge must produce exactly one message in the queue");}@@ -771,12 +774,12 @@ class SqsServiceTest {void purgeQueueClearsDedupStoreWhenEnabled() {String region = "eu-west-1";- final var dedupStore = new InMemoryStorage<String, Map<String, Long>>();- final var service = new SqsService(+ InMemoryStorage<String, Map<String, Long>> dedupStore = new InMemoryStorage<>();+ SqsService service = new SqsService(new InMemoryStorage<>(), new InMemoryStorage<>(), dedupStore,30, 1048576, BASE_URL, new RegionResolver("us-east-1", "000000000000"), true, null);- final var queue = service.createQueue("dedup-store-clear.fifo",+ Queue queue = service.createQueue("dedup-store-clear.fifo",Map.of("ContentBasedDeduplication", "true"), region);// Send a message — dedup entry must be persisted to the store@@ -980,8 +983,8 @@ class SqsServiceTest {* null, the move block was skipped, and messages stayed on the source queue with nothing* logged. A silent redrive failure is the worst shape this bug takes.*/- @org.junit.jupiter.params.ParameterizedTest- @org.junit.jupiter.params.provider.CsvSource({+ @ParameterizedTest+ @CsvSource({"us-east-1, arn:aws:sqs:us-east-1:000000000000:","us-gov-west-1, arn:aws-us-gov:sqs:us-gov-west-1:000000000000:","cn-north-1, arn:aws-cn:sqs:cn-north-1:000000000000:"})@@ -1003,8 +1006,8 @@ class SqsServiceTest {* The ARN the emulator itself hands back must be the one it accepts. This is the assertion* that ties the two halves together rather than trusting a hand-written prefix.*/- @org.junit.jupiter.params.ParameterizedTest- @org.junit.jupiter.params.provider.ValueSource(strings = {"us-east-1", "us-gov-west-1", "cn-north-1"})+ @ParameterizedTest+ @ValueSource(strings = {"us-east-1", "us-gov-west-1", "cn-north-1"})void startMessageMoveTask_acceptsTheQueueArnGetQueueAttributesReturned(String region) {sqsService.createQueue("rt-dlq", null, region);String dlqArn = sqsService.getQueueAttributes(@@ -1604,7 +1607,7 @@ class SqsServiceTest {Queue q = sqsService.createQueue("traced", null, "us-east-1");sqsService.sendMessage(q.getQueueUrl(), "hi", 0, null, null, null,"Root=1-abc-def", "us-east-1");- var received = sqsService.receiveMessage(q.getQueueUrl(), 1, 30, 0, "us-east-1");+ List<Message> received = sqsService.receiveMessage(q.getQueueUrl(), 1, 30, 0, "us-east-1");assertEquals(1, received.size());assertEquals("Root=1-abc-def", received.get(0).getAwsTraceHeader());}@@ -1612,11 +1615,11 @@ class SqsServiceTest {@Testvoid purgeQueueWithClearFifoDelegatesToSnsForFifoDedupOnSubscribedTopics() {String region = "us-east-1";- final var sns = mock(SnsService.class);- final var service = new SqsService(+ SnsService sns = mock(SnsService.class);+ SqsService service = new SqsService(new InMemoryStorage<>(), new InMemoryStorage<>(), new InMemoryStorage<>(),30, 1048576, BASE_URL, new RegionResolver("us-east-1", "000000000000"), true, sns);- final var queue = service.createQueue("sns-dedup-delegate.fifo", Map.of("FifoQueue", "true"),region);+ Queue queue = service.createQueue("sns-dedup-delegate.fifo", Map.of("FifoQueue", "true"), region);service.purgeQueue(queue.getQueueUrl(), region);verify(sns).clearFifoDeduplicationCacheForSqsQueueSubscriptions(queue.getQueueUrl(), "us-east-1");@@ -1659,8 +1662,8 @@ class SqsServiceTest {Queue queue = sqsService.createQueue("longpoll-release-queue", null, region);String queueUrl = queue.getQueueUrl();- final var pollerEntered = new CountDownLatch(1);- final var staleResult = new AtomicReference<List<Message>>();+ CountDownLatch pollerEntered = new CountDownLatch(1);+ AtomicReference<List<Message>> staleResult = new AtomicReference<>();Thread stalePoller = new Thread(() -> {pollerEntered.countDown();staleResult.set(sqsService.receiveMessage(queueUrl, 1, 30, 8, region));@@ -1686,8 +1689,8 @@ class SqsServiceTest {// A long poll opened before the delete, e.g. a listener generation// that is being torn down while its queue is recreated.- final var pollerEntered = new CountDownLatch(1);- final var staleResult = new AtomicReference<List<Message>>();+ CountDownLatch pollerEntered = new CountDownLatch(1);+ AtomicReference<List<Message>> staleResult = new AtomicReference<>();Thread stalePoller = new Thread(() -> {pollerEntered.countDown();staleResult.set(sqsService.receiveMessage(queueUrl, 1, 30, 8, region));@@ -1791,8 +1794,8 @@ class SqsServiceTest {String queueUrl = queue.getQueueUrl();sqsService.setQueueAttributes(queueUrl, Map.of("ReceiveMessageWaitTimeSeconds", "20"), region);- final var pollerEntered = new CountDownLatch(1);- final var result = new AtomicReference<List<Message>>();+ CountDownLatch pollerEntered = new CountDownLatch(1);+ AtomicReference<List<Message>> result = new AtomicReference<>();Thread poller = new Thread(() -> {pollerEntered.countDown();result.set(sqsService.receiveMessage(queueUrl, 1, 30, null, region));