Light, fluffy, and always free - The AWS Local Emulator alternative
chore(style): replace var in more files no open PR touches (#5071)
TATSUNO “Taz” Yasuhiroace5cbfc635a
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SqsMd5Test.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SqsMd5Test.javaindex f4386fdf2b..0869155957 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SqsMd5Test.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SqsMd5Test.java@@ -40,13 +40,13 @@ class SqsMd5Test {String queueUrl = sqs.createQueue(CreateQueueRequest.builder().queueName(queueName).build()).queueUrl();- var attrs = Map.of(+ Map<String, MessageAttributeValue> attrs = Map.of("trace-id", MessageAttributeValue.builder().dataType("String").stringValue("abc-123").build(),"priority", MessageAttributeValue.builder().dataType("Number").stringValue("42").build());- var resp = sqs.sendMessage(SendMessageRequest.builder()+ SendMessageResponse resp = sqs.sendMessage(SendMessageRequest.builder().queueUrl(queueUrl).messageBody("hello standard").messageAttributes(attrs)@@ -101,13 +101,13 @@ class SqsMd5Test {QueueAttributeName.CONTENT_BASED_DEDUPLICATION, "true")).build()).queueUrl();- var attrs = Map.of(+ Map<String, MessageAttributeValue> attrs = Map.of("trace-id", MessageAttributeValue.builder().dataType("String").stringValue("abc-123").build(),"priority", MessageAttributeValue.builder().dataType("Number").stringValue("42").build());- var resp = sqs.sendMessage(SendMessageRequest.builder()+ SendMessageResponse resp = sqs.sendMessage(SendMessageRequest.builder().queueUrl(queueUrl).messageBody("hello fifo").messageGroupId("g1")@@ -133,17 +133,17 @@ class SqsMd5Test {.attributes(Map.of(QueueAttributeName.FIFO_QUEUE, "true")).build()).queueUrl();- var firstAttrs = Map.of(+ Map<String, MessageAttributeValue> firstAttrs = Map.of("k", MessageAttributeValue.builder().dataType("String").stringValue("v1").build());- var secondAttrs = Map.of(+ Map<String, MessageAttributeValue> secondAttrs = Map.of("k", MessageAttributeValue.builder().dataType("String").stringValue("v2").build());- var firstResponse = sqs.sendMessage(SendMessageRequest.builder()+ SendMessageResponse firstResponse = sqs.sendMessage(SendMessageRequest.builder().queueUrl(queueUrl).messageBody("body-1").messageGroupId("g1").messageDeduplicationId("same-dedup").messageAttributes(firstAttrs).build());- var secondResponse = sqs.sendMessage(SendMessageRequest.builder()+ SendMessageResponse secondResponse = sqs.sendMessage(SendMessageRequest.builder().queueUrl(queueUrl).messageBody("body-2").messageGroupId("g1").messageDeduplicationId("same-dedup").messageAttributes(secondAttrs).build());@@ -168,7 +168,7 @@ class SqsMd5Test {QueueAttributeName.CONTENT_BASED_DEDUPLICATION, "true")).build()).queueUrl();- var attrs = Map.of(+ Map<String, MessageAttributeValue> attrs = Map.of("blob", MessageAttributeValue.builder().dataType("Binary").binaryValue(SdkBytes.fromByteArray(new byte[]{1, 2, 3, 4, 5}))@@ -191,7 +191,7 @@ class SqsMd5Test {QueueAttributeName.CONTENT_BASED_DEDUPLICATION, "true")).build()).queueUrl();- var attrs = Map.of(+ Map<String, MessageAttributeValue> attrs = Map.of("priority", MessageAttributeValue.builder().dataType("Number.int").stringValue("42").build());@@ -214,7 +214,7 @@ class SqsMd5Test {QueueAttributeName.FIFO_THROUGHPUT_LIMIT, "perMessageGroupId")).build()).queueUrl();- var attrs = Map.of(+ Map<String, MessageAttributeValue> attrs = Map.of("key", MessageAttributeValue.builder().dataType("String").stringValue("value").build());diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StsTest.javaindex 639cce9e13..affa8de185 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StsTest.java@@ -31,6 +31,7 @@ import javax.xml.crypto.dsig.spec.XPathFilter2ParameterSpec;import javax.xml.crypto.dsig.spec.XPathFilterParameterSpec;import javax.xml.crypto.dsig.spec.XPathType;import javax.xml.transform.OutputKeys;+import javax.xml.transform.Transformer;import javax.xml.transform.TransformerFactory;import javax.xml.transform.dom.DOMSource;import javax.xml.transform.stream.StreamResult;@@ -463,7 +464,7 @@ class StsTest {factory.newSignatureMethod(SignatureMethod.RSA_SHA256, null), List.of(reference));factory.newXMLSignature(signedInfo, null).sign(new DOMSignContext(signingKeys.getPrivate(), assertion));- var transformer = TransformerFactory.newInstance().newTransformer();+ Transformer transformer = TransformerFactory.newInstance().newTransformer();transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");StringWriter output = new StringWriter();transformer.transform(new DOMSource(document), new StreamResult(output));diff --git a/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLifecycleManager.java b/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLifecycleManager.javaindex 48c28eac85..818b437407 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLifecycleManager.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLifecycleManager.java@@ -1317,8 +1317,8 @@ public class ContainerLifecycleManager {private EndpointInfo resolveEndpoint(InspectContainerResponse inspect, int containerPort, String preferredNetwork) {if (!containerDetector.isRunningInContainer()) {// Native mode: use localhost and the bound host port- var bindings = inspect.getNetworkSettings().getPorts().getBindings();- var binding = bindings.get(ExposedPort.tcp(containerPort));+ Map<ExposedPort, Ports.Binding[]> bindings = inspect.getNetworkSettings().getPorts().getBindings();+ Ports.Binding[] binding = bindings.get(ExposedPort.tcp(containerPort));if (binding != null && binding.length > 0) {int hostPort = Integer.parseInt(binding[0].getHostPortSpec());@@ -1343,7 +1343,7 @@ public class ContainerLifecycleManager {}private String resolveContainerIp(InspectContainerResponse inspect, String preferredNetwork) {- var networks = inspect.getNetworkSettings().getNetworks();+ Map<String, ContainerNetwork> networks = inspect.getNetworkSettings().getNetworks();if (networks != null) {// Prefer the configured network so that when the container is on both// bridge (default) and the service network, we return the right IP.diff --git a/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLogStreamer.java b/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLogStreamer.javaindex 16a64d8958..16a102642e 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLogStreamer.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLogStreamer.java@@ -290,7 +290,7 @@ public class ContainerLogStreamer {private static final ScheduledExecutorService CLOSE_DRAIN_SCHEDULER = closeDrainScheduler();private static ScheduledExecutorService closeDrainScheduler() {- var scheduler = new ScheduledThreadPoolExecutor(1, runnable -> {+ ScheduledThreadPoolExecutor scheduler = new ScheduledThreadPoolExecutor(1, runnable -> {Thread thread = new Thread(runnable, "floci-container-log-close");thread.setDaemon(true);return thread;diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsService.java b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsService.javaindex 020ff70d3d..3f47754c8b 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsService.java@@ -177,7 +177,7 @@ public class CloudWatchMetricStreamsService {throw new AwsException("InvalidParameterValue","Each member of StatisticsConfigurations requires at least one AdditionalStatistics entry.", 400);}- for (var metric : configuration.getIncludeMetrics()) {+ for (MetricStreamStatisticsConfiguration.IncludeMetric metric : configuration.getIncludeMetrics()) {if (metric.namespace() == null || metric.namespace().isBlank()|| metric.metricName() == null || metric.metricName().isBlank()) {throw new AwsException("MissingParameter",diff --git a/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryService.java b/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryService.javaindex eb750d940c..8e6a5d48fa 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryService.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryService.java@@ -490,7 +490,7 @@ public class GlueSchemaRegistryService {info.getOtherMetadataValueList() != null? new ArrayList<>(info.getOtherMetadataValueList()): new ArrayList<>();- for (var item : history) {+ for (MetadataInfo.OtherMetadataValueListItem item : history) {if (value.equals(item.getMetadataValue())) {throw new AwsException("AlreadyExistsException","Metadata key/value pair already exists: " + key + "=" + value, 400);@@ -571,7 +571,7 @@ public class GlueSchemaRegistryService {return stored;}Map<String, MetadataInfo> filtered = new java.util.LinkedHashMap<>();- for (var f : metadataList) {+ for (MetadataKeyValueFilter f : metadataList) {MetadataInfo info = stored.get(f.metadataKey());if (info == null) continue;if (f.metadataValue() == null || f.metadataValue().isBlank()) {@@ -579,7 +579,7 @@ public class GlueSchemaRegistryService {} else if (f.metadataValue().equals(info.getMetadataValue())) {filtered.put(f.metadataKey(), info);} else if (info.getOtherMetadataValueList() != null) {- for (var item : info.getOtherMetadataValueList()) {+ for (MetadataInfo.OtherMetadataValueListItem item : info.getOtherMetadataValueList()) {if (f.metadataValue().equals(item.getMetadataValue())) {filtered.put(f.metadataKey(), info);break;diff --git a/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/SchemaCompatibilityChecker.java b/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/SchemaCompatibilityChecker.javaindex c2684b419d..b90894e4d4 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/SchemaCompatibilityChecker.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/schemaregistry/SchemaCompatibilityChecker.java@@ -10,6 +10,7 @@ import io.apicurio.registry.content.canon.AvroContentCanonicalizer;import io.apicurio.registry.content.canon.ContentCanonicalizer;import io.apicurio.registry.content.canon.JsonContentCanonicalizer;import io.apicurio.registry.content.canon.ProtobufContentCanonicalizer;+import io.apicurio.registry.rules.RuleViolation;import io.apicurio.registry.rules.compatibility.AvroCompatibilityChecker;import io.apicurio.registry.rules.compatibility.CompatibilityChecker;import io.apicurio.registry.rules.compatibility.CompatibilityDifference;@@ -194,7 +195,7 @@ public final class SchemaCompatibilityChecker {}return result.getIncompatibleDifferences().stream().map(d -> {- var rv = d.asRuleViolation();+ RuleViolation rv = d.asRuleViolation();String desc = rv != null ? rv.getDescription() : null;String ctx = rv != null ? rv.getContext() : null;if (desc == null) {diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/WarmPool.java b/src/main/java/io/github/hectorvent/floci/services/lambda/WarmPool.javaindex 8039eee091..e5e789ed2a 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/WarmPool.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/WarmPool.java@@ -416,7 +416,7 @@ public class WarmPool implements ContainerTeardown {long idleTimeoutMs = config.services().lambda().containerIdleTimeoutSeconds() * 1000L;long now = clock.millis();- for (var entry : poolStates.entrySet()) {+ for (Map.Entry<String, PoolState> entry : poolStates.entrySet()) {String functionName = entry.getKey();PoolState poolState = entry.getValue();List<ContainerHandle> toEvict = new ArrayList<>();diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.java b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.javaindex fce3841ae1..14818aaa2c 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.lambda.launcher;+import com.github.dockerjava.api.command.ExecCreateCmd;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;@@ -56,6 +57,7 @@ import java.util.concurrent.ExecutionException;import java.util.concurrent.TimeUnit;import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicReference;+import java.util.stream.Stream;/*** Starts and stops Docker containers for Lambda function execution.@@ -315,7 +317,7 @@ public class ContainerLauncher implements LambdaRuntimeLauncher {}if (fn.getFileSystemConfigs() != null && !fn.getFileSystemConfigs().isEmpty()) {- var efsCfg = config.storage().efs();+ EmulatorConfig.EfsSharingConfig efsCfg = config.storage().efs();fn.getFileSystemConfigs().forEach(fileSystem -> {String volumeName = efsVolumeName(fileSystem.getArn());lifecycleManager.ensureSharedVolume(volumeName,@@ -1119,7 +1121,7 @@ public class ContainerLauncher implements LambdaRuntimeLauncher {static boolean shouldUseCodeVolume(Path codeDir) {final long threshold = CODE_VOLUME_MIN_BYTES;final long[] total = {0L};- try (var stream = Files.walk(codeDir)) {+ try (Stream<Path> stream = Files.walk(codeDir)) {for (Path path : (Iterable<Path>) stream::iterator) {if (Files.isRegularFile(path)) {total[0] += Files.size(path);@@ -1419,7 +1421,7 @@ public class ContainerLauncher implements LambdaRuntimeLauncher {for (String name : extensionNames) {try {String path = EXTENSIONS_DIR + "/" + name;- var create = dockerClient.execCreateCmd(containerId)+ ExecCreateCmd create = dockerClient.execCreateCmd(containerId).withCmd(path).withAttachStdout(true).withAttachStderr(true);@@ -1524,7 +1526,7 @@ public class ContainerLauncher implements LambdaRuntimeLauncher {*/private static void createTarFromDir(Path sourceDir, OutputStream out) throws IOException {try (TarArchiveOutputStream tar = RetryingTarCopier.newTarStream(out);- var stream = Files.walk(sourceDir)) {+ Stream<Path> stream = Files.walk(sourceDir)) {for (Path path : (Iterable<Path>) stream::iterator) {if (Files.isDirectory(path)) {continue;@@ -1534,7 +1536,7 @@ public class ContainerLauncher implements LambdaRuntimeLauncher {entry.setSize(Files.size(path));entry.setMode(0755);tar.putArchiveEntry(entry);- try (var fis = Files.newInputStream(path)) {+ try (InputStream fis = Files.newInputStream(path)) {fis.transferTo(tar);}tar.closeArchiveEntry();diff --git a/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManager.java b/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManager.javaindex fd8d01f868..c4a9b92094 100644--- a/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManager.java@@ -21,6 +21,7 @@ import org.jboss.logging.Logger;import java.io.ByteArrayOutputStream;import java.io.IOException;+import java.io.InputStream;import java.net.HttpURLConnection;import java.net.URI;import java.nio.charset.StandardCharsets;@@ -265,7 +266,7 @@ public class MwaaEnvironmentManager {return false;}String body;- try (var in = conn.getInputStream()) {+ try (InputStream in = conn.getInputStream()) {body = new String(in.readAllBytes(), StandardCharsets.UTF_8);}return body.contains("\"metadatabase\"") && body.contains("\"scheduler\"")diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java b/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.javaindex d663c53d3e..14976edcd9 100644--- a/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java@@ -6791,7 +6791,7 @@ public class RdsService implements Resettable, ResourceProvider {String requestedTag = engineVersion.trim();// Aurora MySQL versions read 8.0.mysql_aurora.3.08.0. The MySQL image tag is the part in front.- var auroraSuffix = requestedTag.indexOf(".mysql_aurora.");+ int auroraSuffix = requestedTag.indexOf(".mysql_aurora.");if (auroraSuffix > 0) {requestedTag = requestedTag.substring(0, auroraSuffix);}diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.javaindex 4bd8d6f475..d6bd76b8a8 100644--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java@@ -224,7 +224,7 @@ public class SesQueryHandler {private Response handleGetIdentityVerificationAttributes(MultivaluedMap<String, String> params, String region) {List<String> identities = extractMembers(params, "Identities");- var xml = new XmlBuilder().start("VerificationAttributes");+ XmlBuilder xml = new XmlBuilder().start("VerificationAttributes");for (String identityValue : identities) {Identity identity =identityService.getIdentityVerificationAttributes(identityValue, region);@@ -306,7 +306,7 @@ public class SesQueryHandler {}private Response handleGetSendQuota(String region) {- var xml = new XmlBuilder()+ XmlBuilder xml = new XmlBuilder().elem("Max24HourSend", "200.0").elem("MaxSendRate", "1.0").elem("SentLast24Hours",@@ -316,7 +316,7 @@ public class SesQueryHandler {private Response handleGetSendStatistics(String region) {long sentCount = sentEmailService.countInRegion(region);- var xml = new XmlBuilder().start("SendDataPoints");+ XmlBuilder xml = new XmlBuilder().start("SendDataPoints");if (sentCount > 0) {xml.start("member").elem("DeliveryAttempts", String.valueOf(sentCount))@@ -344,7 +344,7 @@ public class SesQueryHandler {private Response handleListVerifiedEmailAddresses(String region) {List<String> emails = identityService.getVerifiedEmailAddresses(region);- var xml = new XmlBuilder().start("VerifiedEmailAddresses");+ XmlBuilder xml = new XmlBuilder().start("VerifiedEmailAddresses");for (String email : emails) {xml.elem("member", email);}@@ -370,7 +370,7 @@ public class SesQueryHandler {private Response handleGetIdentityNotificationAttributes(MultivaluedMap<String, String> params, String region) {List<String> identities = extractMembers(params, "Identities");- var xml = new XmlBuilder().start("NotificationAttributes");+ XmlBuilder xml = new XmlBuilder().start("NotificationAttributes");for (String identityValue : identities) {Identity identity =identityService.getIdentityNotificationAttributes(identityValue, region);@@ -400,7 +400,7 @@ public class SesQueryHandler {private Response handleGetIdentityDkimAttributes(MultivaluedMap<String, String> params, String region) {List<String> identities = extractMembers(params, "Identities");- var xml = new XmlBuilder().start("DkimAttributes");+ XmlBuilder xml = new XmlBuilder().start("DkimAttributes");for (String identityValue : identities) {Identity identity =identityService.getIdentityVerificationAttributes(identityValue, region);@@ -442,7 +442,7 @@ public class SesQueryHandler {private Response handleVerifyDomainDkim(MultivaluedMap<String, String> params, String region) {String domain = getParam(params, "Domain");List<String> tokens = identityService.verifyDomainDkim(domain, region);- var xml = new XmlBuilder().start("DkimTokens");+ XmlBuilder xml = new XmlBuilder().start("DkimTokens");for (String token : tokens) {xml.elem("member", token);}@@ -496,7 +496,7 @@ public class SesQueryHandler {private Response handleGetIdentityMailFromDomainAttributes(MultivaluedMap<String, String> params, String region) {List<String> identities = extractMembers(params, "Identities");- var xml = new XmlBuilder().start("MailFromDomainAttributes");+ XmlBuilder xml = new XmlBuilder().start("MailFromDomainAttributes");for (String identityValue : identities) {Identity identity = identityService.getMailFromAttributes(identityValue, region);xml.start("entry");@@ -529,7 +529,7 @@ public class SesQueryHandler {String identity = requireParam(params, "Identity");List<String> names = extractMembers(params, "PolicyNames");Map<String, String> policies = policyService.getIdentityPolicies(identity, names, region);- var xml = new XmlBuilder().start("Policies");+ XmlBuilder xml = new XmlBuilder().start("Policies");policies.forEach((name, doc) -> xml.start("entry").elem("key", name).elem("value", doc).end("entry"));xml.end("Policies");return Response.ok(AwsQueryResponse.envelope("GetIdentityPolicies", AwsNamespaces.SES, xml.build())).build();@@ -537,7 +537,7 @@ public class SesQueryHandler {private Response handleListIdentityPolicies(MultivaluedMap<String, String> params, String region) {String identity = requireParam(params, "Identity");- var xml = new XmlBuilder().start("PolicyNames");+ XmlBuilder xml = new XmlBuilder().start("PolicyNames");for (String name : policyService.listIdentityPolicyNames(identity, region)) {xml.elem("member", name);}@@ -569,7 +569,7 @@ public class SesQueryHandler {private Response handleGetTemplate(MultivaluedMap<String, String> params, String region) {String templateName = getParam(params, "TemplateName");EmailTemplate template = templateService.getTemplate(templateName, region);- var xml = new XmlBuilder().start("Template")+ XmlBuilder xml = new XmlBuilder().start("Template").elem("TemplateName", template.getTemplateName());if (template.getSubject() != null) {xml.elem("SubjectPart", template.getSubject());@@ -1448,7 +1448,7 @@ public class SesQueryHandler {private static final java.util.Map<String, String> INTERNAL_EVENT_TYPE_TO_V1;static {java.util.Map<String, String> reverse = new java.util.HashMap<>();- for (var e : V1_EVENT_TYPE_TO_INTERNAL.entrySet()) {+ for (Map.Entry<String, String> e : V1_EVENT_TYPE_TO_INTERNAL.entrySet()) {reverse.put(e.getValue(), e.getKey());}INTERNAL_EVENT_TYPE_TO_V1 = java.util.Map.copyOf(reverse);diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeletionPolicyIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeletionPolicyIntegrationTest.javaindex d7163bd713..e9d4cc68b4 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeletionPolicyIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeletionPolicyIntegrationTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.cloudformation;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import io.restassured.response.Response;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;@@ -1355,7 +1356,7 @@ class CloudFormationDeletionPolicyIntegrationTest {}private static String createStack(String stackName, String template, String auth) {- var req = given().contentType("application/x-www-form-urlencoded");+ RequestSpecification req = given().contentType("application/x-www-form-urlencoded");if (auth != null) {req.header("Authorization", auth);}@@ -1389,7 +1390,7 @@ class CloudFormationDeletionPolicyIntegrationTest {}private static void updateStack(String stackName, String template, String auth) {- var req = given().contentType("application/x-www-form-urlencoded");+ RequestSpecification req = given().contentType("application/x-www-form-urlencoded");if (auth != null) {req.header("Authorization", auth);}@@ -1437,7 +1438,7 @@ class CloudFormationDeletionPolicyIntegrationTest {}private static Response cfnQuery(String action, String stackId, String auth) {- var req = given().contentType("application/x-www-form-urlencoded");+ RequestSpecification req = given().contentType("application/x-www-form-urlencoded");if (auth != null) {req.header("Authorization", auth);}diff --git a/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryServiceTest.javaindex 67c5f44d03..c233264331 100644--- a/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/GlueSchemaRegistryServiceTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.glue.schemaregistry;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.InMemoryStorage;+import io.github.hectorvent.floci.services.glue.schemaregistry.model.MetadataInfo;import io.github.hectorvent.floci.services.glue.schemaregistry.model.Registry;import io.github.hectorvent.floci.services.glue.schemaregistry.model.RegistryId;import io.github.hectorvent.floci.services.glue.schemaregistry.model.Schema;@@ -172,8 +173,8 @@ class GlueSchemaRegistryServiceTest {service.createRegistry("b", null, null, REGION);service.createRegistry("c", null, null, REGION);- var first = service.listRegistries(2, null);- var second = service.listRegistries(2, first.nextToken());+ GlueSchemaRegistryService.Page<Registry> first = service.listRegistries(2, null);+ GlueSchemaRegistryService.Page<Registry> second = service.listRegistries(2, first.nextToken());assertEquals(2, first.items().size());assertEquals("2", first.nextToken());@@ -214,7 +215,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid deleteRegistryCascadesToSchemasVersionsAndMetadata() {service.createRegistry("r1", null, null, REGION);- var first = service.createSchema(new RegistryId("r1", null),+ SchemaVersion first = service.createSchema(new RegistryId("r1", null),"users", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION).firstVersion();service.putSchemaVersionMetadata(first.getSchemaVersionId(), "team", "platform");@@ -270,7 +271,7 @@ class GlueSchemaRegistryServiceTest {void createSchemaCreatesV1AndReturnsAvailable() {preCreateRegistry();- var result = service.createSchema(new RegistryId("reg", null),+ GlueSchemaRegistryService.SchemaWithFirstVersion result = service.createSchema(new RegistryId("reg", null),"users", "AVRO", "BACKWARD", "desc", AVRO_V1, null, REGION);Schema schema = result.schema();@@ -290,7 +291,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid createSchemaWithoutRegistryAutoCreatesDefaultRegistry() {- var result = service.createSchema(null, "users", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION);+ GlueSchemaRegistryService.SchemaWithFirstVersion result = service.createSchema(null, "users", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION);assertEquals("default-registry", result.schema().getRegistryName());}@@ -298,7 +299,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid createSchemaDefaultsToBackwardWhenCompatibilityOmitted() {preCreateRegistry();- var result = service.createSchema(new RegistryId("reg", null),+ GlueSchemaRegistryService.SchemaWithFirstVersion result = service.createSchema(new RegistryId("reg", null),"s1", "AVRO", null, null, AVRO_V1, null, REGION);assertEquals("BACKWARD", result.schema().getCompatibility());@@ -381,7 +382,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid registerSchemaVersionDuplicateDefinitionReturnsExistingId() {preCreateRegistry();- var v1 = service.createSchema(new RegistryId("reg", null),+ SchemaVersion v1 = service.createSchema(new RegistryId("reg", null),"users", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION).firstVersion();SchemaVersion same = service.registerSchemaVersion(@@ -721,7 +722,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid getSchemaVersionByLatest() {preCreateRegistry();- var first = service.createSchema(new RegistryId("reg", null),+ SchemaVersion first = service.createSchema(new RegistryId("reg", null),"users", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION).firstVersion();SchemaVersion v2 = service.registerSchemaVersion(new SchemaId("reg", "users", null), AVRO_V2_BACKWARD_OK, REGION);@@ -751,7 +752,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid getSchemaVersionByVersionId() {preCreateRegistry();- var first = service.createSchema(new RegistryId("reg", null),+ SchemaVersion first = service.createSchema(new RegistryId("reg", null),"users", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION).firstVersion();SchemaVersion fetched = service.getSchemaVersion(@@ -774,7 +775,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid getSchemaByDefinitionFindsExisting() {preCreateRegistry();- var first = service.createSchema(new RegistryId("reg", null),+ SchemaVersion first = service.createSchema(new RegistryId("reg", null),"users", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION).firstVersion();SchemaVersion found = service.getSchemaByDefinition(@@ -786,7 +787,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid getSchemaByDefinitionMatchesDespiteWhitespace() {preCreateRegistry();- var first = service.createSchema(new RegistryId("reg", null),+ SchemaVersion first = service.createSchema(new RegistryId("reg", null),"users", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION).firstVersion();// Same Avro schema but with extra whitespace@@ -812,7 +813,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid getSchemaByArnRoundTrips() {preCreateRegistry();- var result = service.createSchema(new RegistryId("reg", null),+ GlueSchemaRegistryService.SchemaWithFirstVersion result = service.createSchema(new RegistryId("reg", null),"users", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION);Schema fetched = service.getSchema(@@ -860,8 +861,8 @@ class GlueSchemaRegistryServiceTest {service.createSchema(new RegistryId("reg", null), "b", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION);service.createSchema(new RegistryId("reg", null), "c", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION);- var first = service.listSchemas(new RegistryId("reg", null), REGION, 2, null);- var second = service.listSchemas(new RegistryId("reg", null), REGION, 2, first.nextToken());+ GlueSchemaRegistryService.Page<Schema> first = service.listSchemas(new RegistryId("reg", null), REGION, 2, null);+ GlueSchemaRegistryService.Page<Schema> second = service.listSchemas(new RegistryId("reg", null), REGION, 2, first.nextToken());assertEquals(2, first.items().size());assertEquals("2", first.nextToken());@@ -929,8 +930,8 @@ class GlueSchemaRegistryServiceTest {service.registerSchemaVersion(new SchemaId("reg", "a", null),AVRO_V2_BACKWARD_OK.replace("email", "phone"), REGION);- var first = service.listSchemaVersions(new SchemaId("reg", "a", null), REGION, 2, null);- var second = service.listSchemaVersions(new SchemaId("reg", "a", null), REGION, 2, first.nextToken());+ GlueSchemaRegistryService.Page<SchemaVersion> first = service.listSchemaVersions(new SchemaId("reg", "a", null), REGION, 2, null);+ GlueSchemaRegistryService.Page<SchemaVersion> second = service.listSchemaVersions(new SchemaId("reg", "a", null), REGION, 2, first.nextToken());assertEquals(2, first.items().size());assertEquals("2", first.nextToken());@@ -941,7 +942,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid deleteSchemaCascadesToVersions() {preCreateRegistry();- var first = service.createSchema(new RegistryId("reg", null),+ SchemaVersion first = service.createSchema(new RegistryId("reg", null),"a", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION).firstVersion();service.deleteSchema(new SchemaId("reg", "a", null), REGION);@@ -961,7 +962,7 @@ class GlueSchemaRegistryServiceTest {service.registerSchemaVersion(new SchemaId("reg", "a", null), AVRO_V2_BACKWARD_OK, REGION);service.updateSchema(new SchemaId("reg", "a", null), null, null, 2L, REGION);- var results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1", REGION);+ List<GlueSchemaRegistryService.VersionDeletionResult> results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1", REGION);assertEquals(1, results.size());assertNull(results.get(0).errorCode());@@ -979,7 +980,7 @@ class GlueSchemaRegistryServiceTest {AVRO_V2_BACKWARD_OK.replace("email", "phone"), REGION);service.updateSchema(new SchemaId("reg", "a", null), null, null, 3L, REGION);- var results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1-2", REGION);+ List<GlueSchemaRegistryService.VersionDeletionResult> results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1-2", REGION);assertEquals(2, results.size());assertEquals(1, service.listSchemaVersions(new SchemaId("reg", "a", null), REGION).size());}@@ -990,7 +991,7 @@ class GlueSchemaRegistryServiceTest {service.createSchema(new RegistryId("reg", null), "a", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION);service.registerSchemaVersion(new SchemaId("reg", "a", null), AVRO_V2_BACKWARD_OK, REGION);- var results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1", REGION);+ List<GlueSchemaRegistryService.VersionDeletionResult> results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1", REGION);assertEquals(1, results.size());assertEquals(1L, results.get(0).versionNumber());@@ -1025,7 +1026,7 @@ class GlueSchemaRegistryServiceTest {preCreateRegistry();service.createSchema(new RegistryId("reg", null), "a", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION);- var results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1-25", REGION);+ List<GlueSchemaRegistryService.VersionDeletionResult> results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1-25", REGION);assertEquals(25, results.size());}@@ -1035,7 +1036,7 @@ class GlueSchemaRegistryServiceTest {preCreateRegistry();service.createSchema(new RegistryId("reg", null), "a", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION);- var results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1,99", REGION);+ List<GlueSchemaRegistryService.VersionDeletionResult> results = service.deleteSchemaVersions(new SchemaId("reg", "a", null), "1,99", REGION);assertEquals(2, results.size());// Version 1 is the latest and only — cannot delete (latest constraint).assertEquals(99L, results.get(1).versionNumber());@@ -1064,14 +1065,14 @@ class GlueSchemaRegistryServiceTest {@Testvoid checkSchemaVersionValidityForValidAvro() {- var r = service.checkSchemaVersionValidity("AVRO", AVRO_V1);+ GlueSchemaRegistryService.CheckValidityResult r = service.checkSchemaVersionValidity("AVRO", AVRO_V1);assertTrue(r.valid());assertNull(r.error());}@Testvoid checkSchemaVersionValidityForInvalidAvro() {- var r = service.checkSchemaVersionValidity("AVRO", "{not-valid-avro");+ GlueSchemaRegistryService.CheckValidityResult r = service.checkSchemaVersionValidity("AVRO", "{not-valid-avro");assertFalse(r.valid());assertNotNull(r.error());}@@ -1095,11 +1096,11 @@ class GlueSchemaRegistryServiceTest {void putSchemaVersionMetadataStoresKeyValue() {String svId = firstVersionId();- var r = service.putSchemaVersionMetadata(svId, "team", "platform");+ GlueSchemaRegistryService.MetadataPutResult r = service.putSchemaVersionMetadata(svId, "team", "platform");assertEquals("team", r.metadataKey());assertEquals("platform", r.metadataValue());- var map = service.querySchemaVersionMetadata(svId, null);+ Map<String, MetadataInfo> map = service.querySchemaVersionMetadata(svId, null);assertEquals("platform", map.get("team").getMetadataValue());}@@ -1120,7 +1121,7 @@ class GlueSchemaRegistryServiceTest {service.putSchemaVersionMetadata(svId, "team", "data");- var map = service.querySchemaVersionMetadata(svId, null);+ Map<String, MetadataInfo> map = service.querySchemaVersionMetadata(svId, null);assertEquals("data", map.get("team").getMetadataValue());assertEquals(1, map.get("team").getOtherMetadataValueList().size());assertEquals("platform", map.get("team").getOtherMetadataValueList().get(0).getMetadataValue());@@ -1141,7 +1142,7 @@ class GlueSchemaRegistryServiceTest {service.removeSchemaVersionMetadata(svId, "team", "data");- var map = service.querySchemaVersionMetadata(svId, null);+ Map<String, MetadataInfo> map = service.querySchemaVersionMetadata(svId, null);assertEquals("platform", map.get("team").getMetadataValue());assertNull(map.get("team").getOtherMetadataValueList());}@@ -1170,7 +1171,7 @@ class GlueSchemaRegistryServiceTest {service.putSchemaVersionMetadata(svId, "team", "platform");service.putSchemaVersionMetadata(svId, "owner", "alice");- var filtered = service.querySchemaVersionMetadata(svId,+ Map<String, MetadataInfo> filtered = service.querySchemaVersionMetadata(svId,List.of(new GlueSchemaRegistryService.MetadataKeyValueFilter("team", null)));assertEquals(1, filtered.size());@@ -1180,7 +1181,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid deletingSchemaVersionRemovesMetadata() {preCreateRegistry();- var first = service.createSchema(new RegistryId("reg", null),+ SchemaVersion first = service.createSchema(new RegistryId("reg", null),"a", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION).firstVersion();service.registerSchemaVersion(new SchemaId("reg", "a", null), AVRO_V2_BACKWARD_OK, REGION);service.updateSchema(new SchemaId("reg", "a", null), null, null, 2L, REGION);@@ -1207,7 +1208,7 @@ class GlueSchemaRegistryServiceTest {@Testvoid tagAndGetTagsForSchema() {preCreateRegistry();- var schema = service.createSchema(new RegistryId("reg", null),+ Schema schema = service.createSchema(new RegistryId("reg", null),"a", "AVRO", "BACKWARD", null, AVRO_V1, null, REGION).schema();service.tagResource(schema.getSchemaArn(), Map.of("owner", "alice"));diff --git a/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/SchemaCompatibilityCheckerTest.java b/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/SchemaCompatibilityCheckerTest.javaindex caa338154d..b8b9ba3e64 100644--- a/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/SchemaCompatibilityCheckerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/glue/schemaregistry/SchemaCompatibilityCheckerTest.java@@ -76,38 +76,38 @@ class SchemaCompatibilityCheckerTest {@Testvoid noneAlwaysCompatible() {- var r = SchemaCompatibilityChecker.check("NONE", List.of(AVRO_V1), AVRO_ADD_REQUIRED, "AVRO");+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("NONE", List.of(AVRO_V1), AVRO_ADD_REQUIRED, "AVRO");assertTrue(r.compatible());}@Testvoid disabledShortCircuits() {- var r = SchemaCompatibilityChecker.check("DISABLED", List.of(AVRO_V1), AVRO_ADD_REQUIRED, "AVRO");+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("DISABLED", List.of(AVRO_V1), AVRO_ADD_REQUIRED, "AVRO");assertTrue(r.compatible());}@Testvoid emptyExistingIsCompatible() {- var r = SchemaCompatibilityChecker.check("BACKWARD", List.of(), AVRO_V1, "AVRO");+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("BACKWARD", List.of(), AVRO_V1, "AVRO");assertTrue(r.compatible());}@Testvoid backwardAcceptsAddOptionalField() {- var r = SchemaCompatibilityChecker.check("BACKWARD", List.of(AVRO_V1), AVRO_ADD_OPTIONAL, "AVRO");+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("BACKWARD", List.of(AVRO_V1), AVRO_ADD_OPTIONAL, "AVRO");assertTrue(r.compatible(), () -> "expected compatible, got: " + r.reason());}@Testvoid backwardRejectsAddRequiredField() {- var r = SchemaCompatibilityChecker.check("BACKWARD", List.of(AVRO_V1), AVRO_ADD_REQUIRED, "AVRO");+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("BACKWARD", List.of(AVRO_V1), AVRO_ADD_REQUIRED, "AVRO");assertFalse(r.compatible());assertNotNull(r.reason());}@Testvoid backwardAllRejectsRequiredAddedAcrossAnyPriorVersion() {- var r = SchemaCompatibilityChecker.check("BACKWARD_ALL",+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("BACKWARD_ALL",List.of(AVRO_V1, AVRO_ADD_OPTIONAL), AVRO_ADD_REQUIRED, "AVRO");assertFalse(r.compatible());}@@ -117,13 +117,13 @@ class SchemaCompatibilityCheckerTest {// FORWARD: latest reader can read new (writer) data. Adding a required field// means new writers produce extra fields that old readers don't know about,// which old readers ignore — so it is FORWARD-compatible.- var r = SchemaCompatibilityChecker.check("FORWARD", List.of(AVRO_V1), AVRO_ADD_REQUIRED, "AVRO");+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("FORWARD", List.of(AVRO_V1), AVRO_ADD_REQUIRED, "AVRO");assertTrue(r.compatible(), () -> "expected compatible, got: " + r.reason());}@Testvoid protobufBackwardRejectsRemovingRequiredField() {- var r = SchemaCompatibilityChecker.check(+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("BACKWARD",List.of(PROTOBUF_REQUIRED_EMAIL),PROTOBUF_REMOVE_REQUIRED_EMAIL,@@ -134,7 +134,7 @@ class SchemaCompatibilityCheckerTest {@Testvoid protobufForwardRejectsAddingRequiredField() {- var r = SchemaCompatibilityChecker.check(+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("FORWARD",List.of(PROTOBUF_OPTIONAL_EMAIL),PROTOBUF_ADD_REQUIRED_PHONE,@@ -265,7 +265,7 @@ class SchemaCompatibilityCheckerTest {@Testvoid jsonBackwardAcceptsAnUnchangedSchema() {- var r = SchemaCompatibilityChecker.check("BACKWARD", List.of(JSON_V1), JSON_V1, "JSON");+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("BACKWARD", List.of(JSON_V1), JSON_V1, "JSON");assertTrue(r.compatible(), () -> "expected compatible, got: " + r.reason());}@@ -276,21 +276,21 @@ class SchemaCompatibilityCheckerTest {*/@Testvoid jsonBackwardTreatsANewOptionalPropertyAsNarrowing() {- var r = SchemaCompatibilityChecker.check("BACKWARD", List.of(JSON_V1), JSON_ADD_OPTIONAL, "JSON");+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("BACKWARD", List.of(JSON_V1), JSON_ADD_OPTIONAL, "JSON");assertFalse(r.compatible());assertNotNull(r.reason());}@Testvoid jsonBackwardRejectsAddingARequiredProperty() {- var r = SchemaCompatibilityChecker.check("BACKWARD", List.of(JSON_V1), JSON_ADD_REQUIRED, "JSON");+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("BACKWARD", List.of(JSON_V1), JSON_ADD_REQUIRED, "JSON");assertFalse(r.compatible());assertNotNull(r.reason());}@Testvoid jsonFirstVersionIsCompatible() {- var r = SchemaCompatibilityChecker.check("BACKWARD", List.of(), JSON_V1, "JSON");+ SchemaCompatibilityChecker.Result r = SchemaCompatibilityChecker.check("BACKWARD", List.of(), JSON_V1, "JSON");assertTrue(r.compatible(), () -> "expected compatible, got: " + r.reason());}}diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.javaindex e9829b164b..88434c107d 100644--- a/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.java@@ -1723,7 +1723,7 @@ class RdsServiceTest {@Testvoid describeOrderableDbInstanceOptionsFiltersByEngineVersionAndClass() {- var result = rdsService.describeOrderableDbInstanceOptions(+ List<Map<String, String>> result = rdsService.describeOrderableDbInstanceOptions("postgres", "18.1", "db.t3.micro");assertEquals(1, result.size());@@ -1734,9 +1734,9 @@ class RdsServiceTest {@Testvoid describeOrderableDbInstanceOptionsIncludesModernGravitonPostgresClasses() {- var flociPinned = rdsService.describeOrderableDbInstanceOptions(+ List<Map<String, String>> flociPinned = rdsService.describeOrderableDbInstanceOptions("postgres", "18.1", "db.m8g.large");- var awsEquivalent = rdsService.describeOrderableDbInstanceOptions(+ List<Map<String, String>> awsEquivalent = rdsService.describeOrderableDbInstanceOptions("postgres", "18.4", "db.m8g.large");assertEquals(1, flociPinned.size());@@ -1749,7 +1749,7 @@ class RdsServiceTest {@Testvoid describeOrderableDbInstanceOptionsIncludesCurrentSmallGravitonPostgresClass() {- var result = rdsService.describeOrderableDbInstanceOptions(+ List<Map<String, String>> result = rdsService.describeOrderableDbInstanceOptions("postgres", "16.14", "db.t4g.small");assertEquals(1, result.size());@@ -7198,7 +7198,7 @@ class RdsServiceTest {assertEquals(DbInstanceStatus.FAILED, refreshed.getStatus());verify(proxyManager).stopProxy("rds-resource:" + refreshed.getDbInstanceArn());- var events = rdsService.describeEvents("dead-db", "db-instance", null, null, 60);+ List<RdsEvent> events = rdsService.describeEvents("dead-db", "db-instance", null, null, 60);assertEquals(1, events.size());assertEquals(List.of("availability"), events.getFirst().eventCategories());assertEquals(refreshed.getDbInstanceArn(), events.getFirst().sourceArn());diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningIntegrationTest.javaindex 13ea1696a0..b873d749bb 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningIntegrationTest.java@@ -6,6 +6,8 @@ import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;+import java.util.List;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;import static org.junit.jupiter.api.Assertions.*;@@ -384,7 +386,7 @@ class S3VersioningIntegrationTest {.statusCode(200);// Verify exactly 1 version exists- var versions = given()+ List<Object> versions = given().when().get("/" + resBucket + "?versions&prefix=" + key).then()diff --git a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.javaindex 3318406edd..c12c4e5ffa 100644--- a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.java@@ -1162,7 +1162,7 @@ class SchedulerIntegrationTest {// Every EcsParameters list field answers 400 SerializationException "Expected list or null"// on AWS when it holds a scalar, measured through the Scheduler API for all six.record ListField(String path, String body) { }- var fields = List.of(+ List<ListField> fields = List.of(new ListField("CapacityProviderStrategy", "\"CapacityProviderStrategy\": \"FARGATE\""),new ListField("PlacementConstraints", "\"PlacementConstraints\": \"distinctInstance\""),new ListField("PlacementStrategy", "\"PlacementStrategy\": \"spread\""),diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAwsSdkTaskIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAwsSdkTaskIntegrationTest.javaindex 8e6c58c6cf..0106563c17 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAwsSdkTaskIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAwsSdkTaskIntegrationTest.java@@ -69,7 +69,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(1)void startExecutionReturnsThePascalCaseArnAndAnIsoStartDate() throws Exception {- var smArn = createStateMachine("aws-sdk-start-execution", """+ String smArn = createStateMachine("aws-sdk-start-execution", """{"QueryLanguage": "JSONata","StartAt": "Start",@@ -84,7 +84,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}""".replace("CHILD_ARN", quickChildArn));- var result = mapper.readTree(succeedingOutputOf(smArn, "{}"));+ JsonNode result = mapper.readTree(succeedingOutputOf(smArn, "{}"));assertTrue(result.path("ExecutionArn").asText().contains(":execution:aws-sdk-task-child-quick:"),"unexpected ExecutionArn: " + result.path("ExecutionArn").asText());@@ -93,14 +93,14 @@ class StepFunctionsAwsSdkTaskIntegrationTest {assertEquals(2, result.size(), "StartExecution returns ExecutionArn and StartDate only");// The child really ran, with the Input the task passed it.- var child = describeExecution(result.path("ExecutionArn").asText());+ Response child = describeExecution(result.path("ExecutionArn").asText());assertEquals("{\"amount\":1200}", child.jsonPath().getString("input"));}@Test@Order(2)void startExecutionDoesNotWaitForTheChild() throws Exception {- var smArn = createStateMachine("aws-sdk-start-execution-no-wait", """+ String smArn = createStateMachine("aws-sdk-start-execution-no-wait", """{"QueryLanguage": "JSONata","StartAt": "Start",@@ -115,8 +115,8 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}""".replace("CHILD_ARN", slowChildArn));- var result = mapper.readTree(succeedingOutputOf(smArn, "{}"));- var child = describeExecution(result.path("ExecutionArn").asText());+ JsonNode result = mapper.readTree(succeedingOutputOf(smArn, "{}"));+ Response child = describeExecution(result.path("ExecutionArn").asText());assertEquals("RUNNING", child.jsonPath().getString("status"),"the parent finished before the 5s child, so the child is still running");}@@ -124,7 +124,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(3)void startExecutionOnAMissingStateMachineFailsWithTheSdkExceptionName() {- var smArn = createStateMachine("aws-sdk-start-execution-missing", """+ String smArn = createStateMachine("aws-sdk-start-execution-missing", """{"QueryLanguage": "JSONata","StartAt": "Start",@@ -141,7 +141,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}""");- var describe = waitForTerminalState(startExecution(smArn, "{}"));+ Response describe = waitForTerminalState(startExecution(smArn, "{}"));assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("Sfn.StateMachineDoesNotExistException", describe.jsonPath().getString("error"));}@@ -149,7 +149,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(4)void startExecutionReusingAnExecutionNameFailsWithTheSdkExceptionName() {- var smArn = createStateMachine("aws-sdk-start-execution-named", """+ String smArn = createStateMachine("aws-sdk-start-execution-named", """{"QueryLanguage": "JSONata","StartAt": "Start",@@ -167,7 +167,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {assertEquals("SUCCEEDED", waitForTerminalState(startExecution(smArn, "{}")).jsonPath().getString("status"));- var describe = waitForTerminalState(startExecution(smArn, "{}"));+ Response describe = waitForTerminalState(startExecution(smArn, "{}"));assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("Sfn.ExecutionAlreadyExistsException", describe.jsonPath().getString("error"));}@@ -177,10 +177,10 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(5)void sendTaskSuccessResolvesTheWaitingExecutionWithItsOutput() throws Exception {- var waitingExecArn = startExecution(createWaiterStateMachine("aws-sdk-send-success-waiter"), "{}");- var taskToken = receiveTaskToken();+ String waitingExecArn = startExecution(createWaiterStateMachine("aws-sdk-send-success-waiter"), "{}");+ String taskToken = receiveTaskToken();- var senderArn = createStateMachine("aws-sdk-send-success", """+ String senderArn = createStateMachine("aws-sdk-send-success", """{"QueryLanguage": "JSONata","StartAt": "Resume",@@ -201,7 +201,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {assertEquals("{}", succeedingOutputOf(senderArn, tokenInput(taskToken)),"SendTaskSuccess answers with an empty response");- var waiter = waitForTerminalState(waitingExecArn);+ Response waiter = waitForTerminalState(waitingExecArn);assertEquals("SUCCEEDED", waiter.jsonPath().getString("status"));assertTrue(mapper.readTree(waiter.jsonPath().getString("output")).path("approved").asBoolean());}@@ -209,10 +209,10 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(6)void sendTaskFailureFailsTheWaitingExecutionWithItsErrorAndCause() throws Exception {- var waitingExecArn = startExecution(createWaiterStateMachine("aws-sdk-send-failure-waiter"), "{}");- var taskToken = receiveTaskToken();+ String waitingExecArn = startExecution(createWaiterStateMachine("aws-sdk-send-failure-waiter"), "{}");+ String taskToken = receiveTaskToken();- var senderArn = createStateMachine("aws-sdk-send-failure", """+ String senderArn = createStateMachine("aws-sdk-send-failure", """{"QueryLanguage": "JSONata","StartAt": "Reject",@@ -233,7 +233,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {assertEquals("{}", succeedingOutputOf(senderArn, tokenInput(taskToken)));- var waiter = waitForTerminalState(waitingExecArn);+ Response waiter = waitForTerminalState(waitingExecArn);assertEquals("FAILED", waiter.jsonPath().getString("status"));assertEquals("PoolClosed", waiter.jsonPath().getString("error"));assertEquals("the pool is already closed", waiter.jsonPath().getString("cause"));@@ -242,7 +242,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(7)void sendTaskSuccessOnATokenNobodyIsWaitingForFailsTheTask() {- var smArn = createStateMachine("aws-sdk-send-success-bad-token", """+ String smArn = createStateMachine("aws-sdk-send-success-bad-token", """{"QueryLanguage": "JSONata","StartAt": "Resume",@@ -257,7 +257,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}""");- var describe = waitForTerminalState(startExecution(smArn, "{}"));+ Response describe = waitForTerminalState(startExecution(smArn, "{}"));assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("Sfn.InvalidTokenException", describe.jsonPath().getString("error"));assertEquals("Invalid Token: 'Invalid token'", describe.jsonPath().getString("cause"));@@ -266,7 +266,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(8)void sendTaskFailureOnATokenNobodyIsWaitingForFailsTheTask() {- var smArn = createStateMachine("aws-sdk-send-failure-bad-token", """+ String smArn = createStateMachine("aws-sdk-send-failure-bad-token", """{"QueryLanguage": "JSONata","StartAt": "Reject",@@ -281,7 +281,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}""");- var describe = waitForTerminalState(startExecution(smArn, "{}"));+ Response describe = waitForTerminalState(startExecution(smArn, "{}"));assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("Sfn.InvalidTokenException", describe.jsonPath().getString("error"));}@@ -293,7 +293,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {// ever waits on that token. The registration must not outlive the failure: the token is// recovered from the TaskScheduled event it wrote on its way to failing, and a second// execution's SendTaskSuccess on that same token must find nothing pending for it.- var leakArn = createStateMachine("aws-sdk-task-leaked-token", """+ String leakArn = createStateMachine("aws-sdk-task-leaked-token", """{"QueryLanguage": "JSONata","StartAt": "Leak",@@ -308,12 +308,12 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}""");- var leaked = waitForTerminalState(startExecution(leakArn, "{}"));+ Response leaked = waitForTerminalState(startExecution(leakArn, "{}"));assertEquals("FAILED", leaked.jsonPath().getString("status"));assertEquals("States.TaskFailed", leaked.jsonPath().getString("error"));- var taskToken = scheduledTaskToken(leaked.jsonPath().getString("executionArn"));+ String taskToken = scheduledTaskToken(leaked.jsonPath().getString("executionArn"));- var senderArn = createStateMachine("aws-sdk-send-success-leaked-token", """+ String senderArn = createStateMachine("aws-sdk-send-success-leaked-token", """{"QueryLanguage": "JSONata","StartAt": "Resume",@@ -328,7 +328,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}""");- var describe = waitForTerminalState(startExecution(senderArn, tokenInput(taskToken)));+ Response describe = waitForTerminalState(startExecution(senderArn, tokenInput(taskToken)));assertEquals("FAILED", describe.jsonPath().getString("status"),"Leak's token must be discarded once its resource invocation throws, not left pending");@@ -340,7 +340,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(10)void createScheduleReturnsTheScheduleArnAndTheScheduleIsReadable() throws Exception {- var result = mapper.readTree(succeedingOutputOf(+ JsonNode result = mapper.readTree(succeedingOutputOf(createStateMachine("aws-sdk-create-schedule", scheduleTask("createSchedule","payout-nightly", "rate(1 day)")), "{}"));@@ -356,7 +356,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(11)void updateScheduleKeepsTheArnAndChangesTheExpression() throws Exception {- var result = mapper.readTree(succeedingOutputOf(+ JsonNode result = mapper.readTree(succeedingOutputOf(createStateMachine("aws-sdk-update-schedule", scheduleTask("updateSchedule","payout-nightly", "rate(2 days)")), "{}"));@@ -370,7 +370,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(12)void createScheduleOnANameAlreadyTakenFailsWithConflict() {- var describe = waitForTerminalState(startExecution(+ Response describe = waitForTerminalState(startExecution(createStateMachine("aws-sdk-create-schedule-twice", scheduleTask("createSchedule","payout-nightly", "rate(1 day)")), "{}"));@@ -381,7 +381,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(13)void updateScheduleOnAScheduleThatDoesNotExistFailsWithResourceNotFound() {- var describe = waitForTerminalState(startExecution(+ Response describe = waitForTerminalState(startExecution(createStateMachine("aws-sdk-update-missing-schedule", scheduleTask("updateSchedule","no-such-schedule", "rate(1 day)")), "{}"));@@ -392,7 +392,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {@Test@Order(14)void createScheduleWithIncompleteEventBridgeParametersIsCatchableAsAValidationException() throws Exception {- var smArn = createStateMachine("aws-sdk-create-schedule-invalid-target", """+ String smArn = createStateMachine("aws-sdk-create-schedule-invalid-target", """{"QueryLanguage": "JSONata","StartAt": "Schedule",@@ -424,7 +424,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {.replace("TARGET_ARN", quickChildArn).replace("ROLE", ROLE_ARN));- var result = mapper.readTree(succeedingOutputOf(smArn, "{}"));+ JsonNode result = mapper.readTree(succeedingOutputOf(smArn, "{}"));assertEquals("Scheduler.ValidationException", result.path("caughtError").asText(),"a target the parser rejects must reach Catch as an SDK exception, not States.Runtime");}@@ -441,7 +441,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {"\"NetworkConfiguration\": {\"awsvpcConfiguration\": {\"Subnets\": [123]}}"},{"non-list-subnet","\"NetworkConfiguration\": {\"awsvpcConfiguration\": {\"Subnets\": \"subnet-a\"}}"}}) {- var smArn = createStateMachine("aws-sdk-create-schedule-" + shape[0], """+ String smArn = createStateMachine("aws-sdk-create-schedule-" + shape[0], """{"QueryLanguage": "JSONata","StartAt": "Schedule",@@ -478,7 +478,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {.replace("TARGET_ARN", quickChildArn).replace("ROLE", ROLE_ARN));- var result = mapper.readTree(succeedingOutputOf(smArn, "{}"));+ JsonNode result = mapper.readTree(succeedingOutputOf(smArn, "{}"));assertEquals("Scheduler.SerializationException", result.path("caughtError").asText(),shape[0] + " must reach Catch as an SDK exception, not States.Runtime");}@@ -1001,19 +1001,19 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}private String receiveTaskToken() throws Exception {- for (var i = 0; i < 50; i++) {- var resp = given()+ for (int i = 0; i < 50; i++) {+ Response resp = given().header("X-Amz-Target", "AmazonSQS.ReceiveMessage").contentType(SQS_CONTENT_TYPE).body("{\"QueueUrl\":\"%s\",\"MaxNumberOfMessages\":1,\"WaitTimeSeconds\":1}".formatted(callbackQueueUrl)).when().post("/");resp.then().statusCode(200);- var messages = mapper.readTree(resp.body().asString()).path("Messages");+ JsonNode messages = mapper.readTree(resp.body().asString()).path("Messages");if (messages.size() == 1) {- var message = messages.get(0);+ JsonNode message = messages.get(0);deleteMessage(message.path("ReceiptHandle").asText());- var token = mapper.readTree(message.path("Body").asText()).path("token").asText();+ String token = mapper.readTree(message.path("Body").asText()).path("token").asText();assertFalse(token.isBlank(), "the waiting task published a blank token");return token;}@@ -1038,14 +1038,14 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}private String succeedingOutputOf(String smArn, String input) {- var describe = waitForTerminalState(startExecution(smArn, input));+ Response describe = waitForTerminalState(startExecution(smArn, input));assertEquals("SUCCEEDED", describe.jsonPath().getString("status"),"cause: " + describe.jsonPath().getString("cause"));return describe.jsonPath().getString("output");}private static String createQueue(String name) {- var resp = given()+ Response resp = given().header("X-Amz-Target", "AmazonSQS.CreateQueue").contentType(SQS_CONTENT_TYPE).body("{\"QueueName\":\"%s\"}".formatted(name))@@ -1055,7 +1055,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}private static String createStateMachine(String name, String definition) {- var resp = given()+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.CreateStateMachine").contentType(SFN_CONTENT_TYPE).body("""@@ -1067,7 +1067,7 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}private static String startExecution(String smArn, String input) {- var resp = given()+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.StartExecution").contentType(SFN_CONTENT_TYPE).body("""@@ -1100,10 +1100,10 @@ class StepFunctionsAwsSdkTaskIntegrationTest {/** The token a Task registered for itself, recovered from its own TaskScheduled event. */private static String scheduledTaskToken(String execArn) throws Exception {- var events = mapper.readTree(getExecutionHistory(execArn).body().asString()).path("events");- for (var event : events) {+ JsonNode events = mapper.readTree(getExecutionHistory(execArn).body().asString()).path("events");+ for (JsonNode event : events) {if ("TaskScheduled".equals(event.path("type").asText())) {- var parameters = event.path("taskScheduledEventDetails").path("parameters").asText();+ String parameters = event.path("taskScheduledEventDetails").path("parameters").asText();return mapper.readTree(parameters).path("token").asText();}}@@ -1112,8 +1112,8 @@ class StepFunctionsAwsSdkTaskIntegrationTest {}private static Response waitForTerminalState(String execArn) {- for (var i = 0; i < 150; i++) {- var resp = describeExecution(execArn);+ for (int i = 0; i < 150; i++) {+ Response resp = describeExecution(execArn);if (!"RUNNING".equals(resp.jsonPath().getString("status"))) {return resp;}diff --git a/tools/checkstyle/suppressions.xml b/tools/checkstyle/suppressions.xmlindex f0e8dc3901..9a1388ec0e 100644--- a/tools/checkstyle/suppressions.xml+++ b/tools/checkstyle/suppressions.xml@@ -4,47 +4,26 @@"https://checkstyle.org/dtds/suppressions_1_2.dtd"><suppressions><!-- Files that still use var. Remove an entry once its file is clean. -->- <suppress id="NoVar" files="/com/floci/test/CloudFormationEventSourceMappingTest\.java$"/><suppress id="NoVar" files="/com/floci/test/ElastiCacheTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/SqsMd5Test\.java$"/>- <suppress id="NoVar" files="/com/floci/test/StsTest\.java$"/><suppress id="NoVar" files="/floci/core/common/IamEnforcementFilter\.java$"/>- <suppress id="NoVar" files="/floci/core/common/docker/ContainerLifecycleManager\.java$"/>- <suppress id="NoVar" files="/floci/core/common/docker/ContainerLogStreamer\.java$"/><suppress id="NoVar" files="/floci/services/apigateway/ApiGatewayService\.java$"/><suppress id="NoVar" files="/floci/services/bedrockruntime/backend/BedrockOpenAiTranslator\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationDeletionPolicyIntegrationTest\.java$"/><suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationIntegrationTest\.java$"/><suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationService\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsService\.java$"/><suppress id="NoVar" files="/floci/services/cognito/CognitoLambdaTriggersTest\.java$"/><suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbIntegrationTest\.java$"/><suppress id="NoVar" files="/floci/services/dynamodb/NativeDynamoDbJsonHandler\.java$"/><suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbService\.java$"/><suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbStreamServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbStreamsJsonHandler\.java$"/><suppress id="NoVar" files="/floci/services/ec2/Ec2ContainerManager\.java$"/><suppress id="NoVar" files="/floci/services/ec2/Ec2Service\.java$"/><suppress id="NoVar" files="/floci/services/eks/EksClusterManager\.java$"/><suppress id="NoVar" files="/floci/services/eks/EksServiceTest\.java$"/><suppress id="NoVar" files="/floci/services/eventbridge/EventBridgeInvoker\.java$"/><suppress id="NoVar" files="/floci/services/eventbridge/EventBridgeService\.java$"/>- <suppress id="NoVar" files="/floci/services/glue/schemaregistry/GlueSchemaRegistryService\.java$"/>- <suppress id="NoVar" files="/floci/services/glue/schemaregistry/GlueSchemaRegistryServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/glue/schemaregistry/SchemaCompatibilityChecker\.java$"/>- <suppress id="NoVar" files="/floci/services/glue/schemaregistry/SchemaCompatibilityCheckerTest\.java$"/><suppress id="NoVar" files="/floci/services/iam/StsQueryHandler\.java$"/><suppress id="NoVar" files="/floci/services/lambda/LambdaService\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/WarmPool\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/ContainerLauncher\.java$"/>- <suppress id="NoVar" files="/floci/services/mwaa/MwaaEnvironmentManager\.java$"/>- <suppress id="NoVar" files="/floci/services/rds/RdsService\.java$"/>- <suppress id="NoVar" files="/floci/services/rds/RdsServiceTest\.java$"/><suppress id="NoVar" files="/floci/services/s3/S3Controller\.java$"/><suppress id="NoVar" files="/floci/services/s3/S3Service\.java$"/><suppress id="NoVar" files="/floci/services/s3/S3ServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/s3/S3VersioningIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/scheduler/SchedulerIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ses/SesQueryHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsAwsSdkTaskIntegrationTest\.java$"/></suppressions>